Changeset 5f96438 for fedd/federation/experiment_control.py

Timestamp:

Apr 7, 2010 11:14:49 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

c23684d

Parents:

73e7f5c

Message:

checkpoint for download - not tested

File:

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

fedd/federation/experiment_control.py

@@ -886 +886 @@
                 "uri": uri,
                 }
-        if 'service' in r: 
+        if 'service' in r:
+            for s in r['service']:
+                # Tag each service with the origin testbed
+                if s.has_key('fedAttr'):
+                    # The else connects with the for
+                    for a in s['fedAttr']:
+                        if a.get('attribute', None) == 'testbed'):
+                            break
+                    else:
+                        s['fedAttr'].append({'attribute': 'testbed',
+                            'value': tb})
+                else:
+                    s['fedAttr'] = [ {'attribute': 'testbed', 'value': tb} ]
             services.extend(r['service'])
 
@@ -1614 +1626 @@
             testbeds = set([ a.value for e in top.elements \
                     for a in e.attribute \
-                    if a.attribute == 'testbed'] )
+                        if a.attribute == 'testbed'])
 
             allocated = { }         # Testbeds we can access
@@ -1620 +1632 @@
             connInfo = { }          # Connection information
             services = [ ]
+            masters = { }           # testbeds exporting services
             self.get_access_to_testbeds(testbeds, access_user, 
                     export_project, master, allocated, tbparams, services)
+
+            # After this masters will hold a set of services exported by each
+            # testbed
+            for s in services:
+                i = s.get('visibility', 'import')
+                if i == 'export':
+                    for a in s.get('fedAttr', []):
+                        if a.get('attribute', '') == 'testbed':
+                            tb = a.get('value', None)
+                            if tb:
+                                if masters.has_key(tb): masters[tb].add(s.name)
+                                else: masters[tb] = set([s.name])
+                            else:
+                                log.error('Testbed attribute with no value?')
+
+
             self.split_topology(top, topo, testbeds)
 
@@ -1658 +1687 @@
             part = experiment_partition(self.auth, self.store_url, self.tbmap,
                     self.muxmax)
-            part.add_portals(top, topo, eid, master, tbparams, ip_allocator,
+            part.add_portals(top, topo, eid, masters, tbparams, ip_allocator,
                     connInfo, expid)
             # Now get access to the dynamic testbeds