Changeset 5334044 for fedd/federation/experiment_control.py

Timestamp:

May 27, 2010 2:25:36 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

1962a5b

Parents:

0de1b94

Message:

Add service to selectively hide hosts from other testbeds

File:

• fedd/federation/experiment_control.py (modified) (6 diffs)

fedd/federation/experiment_control.py

@@ -46 +46 @@
 # Right now, no support for composition.
 class federated_service:
-    def __init__(self, name, exporter=None, importers=[], params={ }, reqs=[]):
+    def __init__(self, name, exporter=None, importers=None, params=None, 
+            reqs=None, portal=None):
         self.name=name
         self.exporter=exporter
-        self.importers=importers
-        self.params = params
-        self.reqs = reqs
+        if importers is None: self.importers = []
+        else: self.importers=importers
+        if params is None: self.params = { }
+        else: self.params = params
+        if reqs is None: self.reqs = []
+        else: self.reqs = reqs
+
+        if portal is not None:
+            self.portal = portal
+        else:
+            self.portal = (name in federated_service.needs_portal)
 
     def __str__(self):
@@ -57 +66 @@
                 (self.name, self.exporter, self.importers, self.params,
                         [ (r['name'], r['visibility']) for r in self.reqs] )
+
+    needs_portal = ('SMB', 'seer', 'tmcd', 'project_export', 'seer_master')
 
 class experiment_control_local:
@@ -1689 +1700 @@
                         if a.attribute == 'testbed'])
 
+            tb_hosts = { }
+            for tb in testbeds:
+                tb_hosts[tb] = [ e.name for e in top.elements \
+                        if isinstance(e, topdl.Computer) and \
+                            e.get_attribute('testbed') and \
+                            e.get_attribute('testbed') == tb]
+
             masters = { }           # testbeds exporting services
+            pmasters = { }          # Testbeds exporting services that 
+                                    # need portals
             for s in tb_services:
-                # If this is a project_export request with the importall field
+                # If this is a service request with the importall field
                 # set, fill it out.
 
@@ -1711 +1731 @@
                                         a.get('value','')
 
-                        masters[tb].append(federated_service(name=s['name'],
+                        fser = federated_service(name=s['name'],
                                 exporter=tb, importers=s.get('import',[]),
-                                params=params, reqs=[]))
+                                params=params)
+                        if fser.name == 'hide_hosts' \
+                                and 'hosts' not in fser.params:
+                            fser.params['hosts'] = \
+                                    ",".join(tb_hosts.get(fser.exporter, []))
+                        masters[tb].append(fser)
+
+                        if fser.portal:
+                            if tb not in pmasters: pmasters[tb] = [ fser ]
+                            else: pmasters[tb].append(fser)
                     else:
                         self.log.error('Testbed service does not have name " + \
@@ -1722 +1751 @@
             topo ={ }               # Sub topologies
             connInfo = { }          # Connection information
+
             self.get_access_to_testbeds(testbeds, access_user, allocated, 
                     tbparams, masters)
@@ -1761 +1791 @@
             part = experiment_partition(self.auth, self.store_url, self.tbmap,
                     self.muxmax, self.direct_transit)
-            part.add_portals(top, topo, eid, masters, tbparams, ip_allocator,
+            part.add_portals(top, topo, eid, pmasters, tbparams, ip_allocator,
                     connInfo, expid)
             # Now get access to the dynamic testbeds (those added above)