Changeset eb117fe

Timestamp:

Aug 23, 2012 6:36:01 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

9d40cc9

Parents:

be1742d

Message:

Avoid portal name collision

File:

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

fedd/federation/experiment_partition.py

@@ -453 +453 @@
                         new_portal = True
                         portal_type = "experiment"
-                        myname = "%stunnel%d" % (dname.lower(),
+                        myname = "%s%stunnel%d" % (sname.lower(), dname.lower(),
                                 len(portals[st][dt]))
-                        desthost = "%stunnel%d" % (sname.lower(), 
-                                len(portals[st][dt]))
+                        desthost = "%s%stunnel%d" % (dname.lower(),
+                                sname.lower(), len(portals[st][dt]))
                     else:
                         new_i = topdl.Interface(
@@ -472 +472 @@
                     new_portal = True
                     portals[st][dt] = [ ]
-                    myname = "%stunnel%d" % (dname.lower(),
+                    myname = "%s%stunnel%d" % (sname.lower(), dname.lower(),
                             len(portals[st][dt]))
-                    desthost = "%stunnel%d" % (sname.lower(),
+                    desthost = "%s%stunnel%d" % (dname.lower(), sname.lower(),
                             len(portals[st][dt]))
 
@@ -500 +500 @@
         tsubstrate, segment_element = \
                 self.new_portal_substrate(st, dt, eid, tbparams, expid)
-        myname = "%stunnel" % dt
-        desthost = "%stunnel" % st
+        myname = "%s%stunnel" % (st, dt)
+        desthost = "%s%stunnel" % (dt, st)
 
         portal, info = self.new_portal_node(st, dt, tbparams, masters,
@@ -518 +518 @@
             substrate, tbparams, expid, tb_name):
         # Add to the master testbed
-        if testbed_suffix(dt): myname = "%stunnel" % "-".join(split_testbed(dt))
-        else: myname = "%stunnel" % dt
+        if testbed_suffix(dt): myname = "%s%stunnel" % \
+                ("-".join(split_testbed(dt)), st)
+        else: myname = "%s%stunnel" % (dt, st)
 
         desthost = "%s" % ip_addr(dip)