Changeset fefa026

Timestamp:

May 26, 2010 3:18:16 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

c5869ef

Parents:

50ef6e4

Message:

weird bug in dragon allocation: move this code to debug

Location:

fedd/federation

Files:

• emulab_access.py (modified) (1 diff)
• experiment_partition.py (modified) (3 diffs)

fedd/federation/emulab_access.py

@@ -1231 +1231 @@
                 if isinstance(e, topdl.Computer):
                     if self.node_info.has_key(e.name):
-                        i = self.node_info[e.name]
-                        for ifname, vlan, type in i:
+                        info = self.node_info[e.name]
+                        for ifname, vlan, type in info:
                             for i in e.interface:
                                 if i.name == ifname:

fedd/federation/experiment_partition.py

@@ -211 +211 @@
         if sub.capacity is None:
             raise service_error(service_error.internal,
-                    "Cannot DRAGON split substrate w/o capacity")
+                    "Cannot direct split substrate w/o capacity")
         segs = [ ]
         name = join_testbed(tb_name, "%d" % idx)
@@ -303 +303 @@
         # Count the number of interfaces on this substrate in each testbed from
         # the global topology
-        count = { }
-        node = { }
-        for e in [ i.element for i in sub.interfaces ]:
-            tb = e.get_attribute('testbed')
-            count[tb] = count.get(tb, 0) + 1
-            node[tb] = i.get_attribute('ip4_address')
+        #count = { }
+        #node = { }
+        #for e in [ i.element for i in sub.interfaces ]:
+            #tb = e.get_attribute('testbed')
+            #count[tb] = count.get(tb, 0) + 1
+            #node[tb] = i.get_attribute('ip4_address')
 
 
@@ -537 +537 @@
                 e = i.element
                 tb = e.get_attribute('testbed')
-                if tb and not tbs.has_key(tb):
-                    for i in e.interface:
-                        if s in i.subs:
-                            tbs[tb]= i.get_attribute('ip4_address')
+                if tb and tb not in tbs:
+                    tbs[tb]= i.get_attribute('ip4_address')
             if len(tbs) < 2:
                 continue