Changeset f3803ea

Timestamp:

May 3, 2010 2:58:57 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

d20823f

Parents:

8e54792

Message:

missed some spots getting subtestbeds right

File:

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

fedd/federation/experiment_partition.py

@@ -191 +191 @@
                 id= tbparams[dt]['allocID'],
                 type='emulab',
-                uri = self.tbmap.get(dt, None),
+                uri = self.tbmap.get(testbed_base(dt), None),
                 interface=[ 
                     topdl.Interface(
@@ -223 +223 @@
                     id = tbparams[tb]['allocID'],
                     type='emulab',
-                    uri = self.tbmap.get(tb, None),
+                    uri = self.tbmap.get(testbed_base(tb), None),
                     interface=[ 
                         topdl.Interface(
@@ -420 +420 @@
 
                 new_portal = False
+                dname = "_".join(split_testbed(dt))
+                sname = "_".join(split_testbed(st))
                 if portals[st].has_key(dt):
                     # There's a portal set up to go to this destination.
@@ -434 +436 @@
                         new_portal = True
                         portal_type = "experiment"
-                        myname = "%stunnel%d" % (dt, len(portals[st][dt]))
-                        desthost = "%stunnel%d" % (st.lower(), 
+                        myname = "%stunnel%d" % (dname.lower(),
+                                len(portals[st][dt]))
+                        desthost = "%stunnel%d" % (sname.lower(), 
                                 len(portals[st][dt]))
                     else:
@@ -452 +455 @@
                     new_portal = True
                     portals[st][dt] = [ ]
-                    myname = "%stunnel%d" % (dt, len(portals[st][dt]))
-                    desthost = "%stunnel%d" % (st.lower(), len(portals[st][dt]))
+                    myname = "%stunnel%d" % (dname.lower(),
+                            len(portals[st][dt]))
+                    desthost = "%stunnel%d" % (sname.lower(),
+                            len(portals[st][dt]))
 
                     if dt in masters or st in masters: portal_type = "both"
@@ -531 +536 @@
                 continue
 
+            base_tbs = set([testbed_base(t) for t in tbs])
+
             # DRAGON will not create multi-site vlans yet
-            if len(tbs) == 2 and \
+            if len(tbs) == 2 and len(base_tbs) == 2 and \
                     all([tbparams[x].has_key('dragon') for x in tbs]):
                 self.create_dragon_substrate(s, topo, tbs, tbparams,