Changeset 7fe81be

Timestamp:

Apr 7, 2010 2:37:59 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

73e7f5c

Parents:

5f6929a

Message:

tweaks

File:

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

fedd/federation/experiment_control.py

@@ -1307 +1307 @@
             allocated[tb] = 1
 
-    def split_topology(self, top, topo, testbeds, eid, master, tbparams):
+    def split_topology(self, top, topo, testbeds):
         """
         Create the sub-topologies that are needed for experiment instantiation.
@@ -1313 +1313 @@
         for tb in testbeds:
             topo[tb] = top.clone()
-            to_delete = [ ]
-            # XXX: copy in for loop to simplify
-            for e in topo[tb].elements:
+            # copy in for loop allows deletions from the original
+            for e in [ e for e in topo[tb].elements]:
                 etb = e.get_attribute('testbed')
-                if etb and etb != tb:
+                # NB: elements without a testbed attribute won't appear in any
+                # sub topologies.  
+                if not etb or etb != tb:
                     for i in e.interface:
                         for s in i.subs:
@@ -1325 +1326 @@
                                 raise service_error(service_error.internal,
                                         "Can't remove interface??")
-                    to_delete.append(e)
-            for e in to_delete:
-                topo[tb].elements.remove(e)
+                    topo[tb].elements.remove(e)
             topo[tb].make_indices()
 
@@ -1691 +1690 @@
                             master, eid, myname, desthost, portal_type,
                             infs, conn_type="ssh", conn_attrs=[], expid=expid)
-                    #if self.fedkit:
-                        #self.add_kit(portal, self.fedkit)
-                    #if self.gatewaykit: 
-                        #self.add_kit(portal, self.gatewaykit)
 
                     topo[st].elements.append(portal)
@@ -2158 +2153 @@
             self.get_access_to_testbeds(testbeds, access_user, 
                     export_project, master, allocated, tbparams, services)
-            self.split_topology(top, topo, testbeds, eid, master, tbparams)
+            self.split_topology(top, topo, testbeds)
 
             # Copy configuration files into the remote file store