Changeset f0b96ba

Timestamp:

Sep 27, 2013 4:39:15 PM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

75605c7

Parents:

19d2b72

Message:

Portal nodes in suffixed testbeds were confused

File:

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

fedd/federation/experiment_partition.py

@@ -500 +500 @@
         tsubstrate, segment_element = \
                 self.new_portal_substrate(st, dt, eid, tbparams, expid)
-        myname = "%s%stunnel" % (st, dt)
-        desthost = "%s%stunnel" % (dt, st)
+        if testbed_suffix(dt): dname = "-".join(split_testbed(dt))
+        else: dname = dt
+
+        if testbed_suffix(st): sname = "-".join(split_testbed(st))
+        else: sname = st
+
+        myname = "%s%stunnel" % (sname, dname)
+        desthost = "%s%stunnel" % (dname, sname)
 
         portal, info = self.new_portal_node(st, dt, tbparams, masters,
@@ -517 +523 @@
     def new_direct_portal(self, st, dt, masters, eid, myip, dip, idx, 
             substrate, tbparams, expid, tb_name):
+
+        if testbed_suffix(dt): dname = "-".join(split_testbed(dt))
+        else: dname = dt
+
+        if testbed_suffix(st): sname = "-".join(split_testbed(st))
+        else: sname = st
+
         # Add to the master testbed
-        if testbed_suffix(dt): myname = "%s%stunnel" % \
-                ("-".join(split_testbed(dt)), st)
-        else: myname = "%s%stunnel" % (dt, st)
+        myname = "%s%stunnel" % (dname, sname)
 
         desthost = "%s" % ip_addr(dip)
@@ -559 +570 @@
             # connection direct transits yet.
             if len(tbs) == 2 :
-                # NB: the else if on the for loop - if none of the direct
+                # NB: the else is on the for loop - if none of the direct
                 # transits is applicable, use the internet.
                 for d in self.direct_transit: