Changeset 4ffa6f8 for fedd/federation/experiment_control.py

Timestamp:

Jul 12, 2012 5:48:44 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

87b1a06

Parents:

4708875

Message:

Add support for nat_portal parameter. Remove old half-assed active
endpoints

File:

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

fedd/federation/experiment_control.py

@@ -327 +327 @@
 
         self.tbmap = { }
-        self.tbactive = set()
         lineno =0
         try:
@@ -338 +337 @@
                 try:
                     label, url = line.split(':', 1)
-                    if ',' in label:
-                        label, act = label.split(',', 1)
-                        active = (act.strip() == 'active')
-                    else:
-                        active = False
                     self.tbmap[label] = url
-                    if active: self.tbactive.add(label)
                 except ValueError, e:
                     self.log.warn("[read_mapdb] Ignored bad line (%d) in " +\
@@ -2169 +2162 @@
         # of the testbed map.
         tbmap = dict(self.tbmap)
-        tbactive = set(self.tbactive)
         for m in req.get('testbedmap', []):
             if 'testbed' in m and 'uri' in m:
                 tbmap[m['testbed']] = m['uri']
-                if 'active' in m and m['active']: tbactive.add(m['testbed'])
 
         # a place to work
@@ -2213 +2204 @@
             connInfo = { }          # Connection information
 
-            self.split_topology(top, topo, testbeds)
-
             self.get_access_to_testbeds(testbeds, fid, allocated, 
                     tbparams, masters, tbmap, expid, expcert_file)
+
+            # tbactive is the set of testbeds that have NATs in front of their
+            # portals. They need to initiate connections.
+            tbactive = set([k for k, v in tbparams.items() \
+                    if v.get_attribute('nat_portals')])
+
+            self.split_topology(top, topo, testbeds)
 
             attrs = self.generate_keys_and_hosts(tmpdir, expid, hosts, tbparams)