Changeset a11eda5

Timestamp:

Feb 29, 2012 5:06:03 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

2bb8b35

Parents:

fe6e0be

Message:

Add support for testbeds to indicate preference for outgoing portal
connections.

Files:

• fedd/fedd_create.py (modified) (2 diffs)
• fedd/federation/experiment_control.py (modified) (4 diffs)
• fedd/federation/experiment_partition.py (modified) (3 diffs)
• wsdl/fedd_types.xsd (modified) (2 diffs)

fedd/fedd_create.py

@@ -45 +45 @@
                 type="string", default=[],
                 help="Service description name:exporters:importers:attrs")
+        self.add_option('--active', action='append', default=[], type='string',
+                help='a testbed that prefers active protal nodes in the map')
         self.add_option("--map", dest="map", action="append",
                 type="string", default=[],
@@ -310 +312 @@
 
 if tbmap:
-    msg['testbedmap'] = [ { 'testbed': t, 'uri': u } for t, u in tbmap.items() ]
+    msg['testbedmap'] = [ 
+            { 
+                'testbed': t, 
+                'uri': u,
+                'active': t in opts.active,
+            } for t, u in tbmap.items()
+        ]
 
 if opts.debug > 1: print >>sys.stderr, msg

fedd/federation/experiment_control.py

@@ -385 +385 @@
         Read a simple colon separated list of mappings for the
         label-to-testbed-URL mappings.  Clears or creates self.tbmap.
+        also adds testbeds to active if they include , active after
+        their name.
         """
 
         self.tbmap = { }
+        self.tbactive = set()
         lineno =0
         try:
@@ -398 +401 @@
                 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 " +\
@@ -2132 +2141 @@
         # 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
@@ -2182 +2193 @@
 
             part = experiment_partition(self.auth, self.store_url, tbmap,
-                    self.muxmax, self.direct_transit)
+                    self.muxmax, self.direct_transit, tbactive)
             part.add_portals(top, topo, eid, pmasters, tbparams, ip_allocator,
                     connInfo, expid)

fedd/federation/experiment_partition.py

@@ -44 +44 @@
 class experiment_partition: 
     def __init__(self, auth=None, store_url=None, tbmap=None, muxmax=2, 
-            direct_transit=None):
+            direct_transit=None, tbactive=None):
         """
         Intialize the various attributes
@@ -56 +56 @@
         self.direct_transit = direct_transit or [ ]
         self.muxmax = muxmax
+        self.tbactive = tbactive
 
 
@@ -89 +90 @@
         ddomain = tbparams[dt].get_attribute('domain', '.example.com')
 
-        if (st in masters and dt not in masters) or \
+        if (st in self.tbactive and dt not in self.tbactive) or \
+                ( st not in self.tbactive and dt in self.tbactive ):
+            active = ("%s" % (st in self.tbactive))
+        elif (st in masters and dt not in masters) or \
                 ( st not in masters and dt in masters ):
             active = ("%s" % (st in masters))

wsdl/fedd_types.xsd

@@ -237 +237 @@
         systems the information to map the local name into a service
         location.
+
+        The optional active element is true when the testbed prefers active
+        portal nodes.
       </xsd:documentation>
     </xsd:annotation>
@@ -242 +245 @@
       <xsd:element name="testbed" type="xsd:string"/>
       <xsd:element name="uri" type="xsd:string"/>
+      <xsd:element name="active" type="xsd:boolean" 
+        minOccurs="0" maxOccurs="1"/>
     </xsd:sequence>
   </xsd:complexType>