Changeset fd07c48

Timestamp:

Jun 25, 2010 3:11:30 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

1027cf7

Parents:

e11f4e0

Message:

Add support for user-supplied testbed mappings

Location:

fedd

Files:

• fedd_create.py (modified) (3 diffs)
• federation/experiment_control.py (modified) (13 diffs)

fedd/fedd_create.py

@@ -28 +28 @@
                 type="string", default=[],
                 help="Service description name:exporters:importers:attrs")
+        self.add_option("--map", dest="map", action="append",
+                type="string", default=[],
+                help="Explicit map from testbed label to URI - " + \
+                        "deter:https://users.isi.deterlab/net:13232")
 
 def parse_service(svc):
@@ -102 +106 @@
         for l in lines if service_re.match(l)])
 
+# Create a testbed map if one is specified
+tbmap = { }
+for m in opts.map:
+    i = m.find(":")
+    if i != -1: tbmap[m[0:i]] = m[i+1:]
+    else: sys.exit("Bad mapping argument: %s" %m )
+
+
 if not svcs:
     print >>sys.stderr, "Warning:Neither master/project nor services requested"
@@ -147 +159 @@
     sys.exit("New did not return an experiment ID??")
 
+if tbmap:
+    msg['testbedmap'] = [ { 'testbed': t, 'uri': u } for t, u in tbmap.items() ]
+
 if opts.debug > 1: print >>sys.stderr, msg
 

fedd/federation/experiment_control.py

@@ -815 +815 @@
         else: return None
 
-    def get_access(self, tb, nodes, tbparam, access_user, masters):
+    def get_access(self, tb, nodes, tbparam, access_user, masters, tbmap):
         """
         Get access to testbed through fedd and set the parameters for that tb
@@ -835 +835 @@
                         "More than one project export is not supported")
 
-        uri = self.tbmap.get(testbed_base(tb), None)
+        uri = tbmap.get(testbed_base(tb), None)
         if not uri:
             raise service_error(service_error.server_config, 
@@ -971 +971 @@
                 self.log.error("Bad attribute in response: %s" % a)
 
-    def release_access(self, tb, aid, uri=None):
+    def release_access(self, tb, aid, tbmap=None, uri=None):
         """
         Release access to testbed through fedd
         """
 
-        if not uri:
-            uri = self.tbmap.get(tb, None)
+        if not uri and tbmap:
+            uri = tbmap.get(tb, None)
         if not uri:
             raise service_error(service_error.server_config, 
@@ -1115 +1115 @@
     def allocate_resources(self, allocated, masters, eid, expid, 
             tbparams, top, topo, tmpdir, alloc_log=None, log_collector=None, 
-            attrs=None, connInfo={}):
+            attrs=None, connInfo={}, tbmap=None):
 
         started = { }           # Testbeds where a sub-experiment started 
@@ -1122 +1122 @@
         # XXX
         fail_soft = False
+
+        if tbmap is None: tbmap = { }
 
         log = alloc_log or self.log
@@ -1134 +1136 @@
             tb_attrs = copy.copy(attrs)
             thread_pool.wait_for_slot()
-            uri = tbparams[tb].get('uri', \
-                    self.tbmap.get(testbed_base(tb), None))
+            uri = tbparams[tb].get('uri', tbmap.get(testbed_base(tb), None))
             base, suffix = split_testbed(tb)
             if suffix:
@@ -1214 +1215 @@
                 # release the allocations
                 for tb in tbparams.keys():
-                    self.release_access(tb, tbparams[tb]['allocID'],
-                            tbparams[tb].get('uri', None))
+                    self.release_access(tb, tbparams[tb]['allocID'], 
+                            tbmap=tbmap, uri=tbparams[tb].get('uri', None))
                 # Remove the placeholder
                 self.state_lock.acquire()
@@ -1406 +1407 @@
 
     def get_access_to_testbeds(self, testbeds, access_user, allocated, 
-            tbparams, masters):
+            tbparams, masters, tbmap):
         """
         Request access to the various testbeds required for this instantiation
@@ -1414 +1415 @@
         """
         for tb in testbeds:
-            self.get_access(tb, None, tbparams, access_user, masters)
+            self.get_access(tb, None, tbparams, access_user, masters, tbmap)
             allocated[tb] = 1
 
@@ -1610 +1611 @@
         self.check_experiment_access(fid, key)
 
+        # Install the testbed map entries supplied with the request into a copy
+        # of the testbed map.
+        tbmap = dict(self.tbmap)
+        for m in req.get('testbedmap', []):
+            if 'testbed' in m and 'uri' in m:
+                tbmap[m['testbed']] = m['uri']
+
         try:
             tmpdir = tempfile.mkdtemp(prefix="split-")
@@ -1755 +1763 @@
 
             self.get_access_to_testbeds(testbeds, access_user, allocated, 
-                    tbparams, masters)
+                    tbparams, masters, tbmap)
 
             self.split_topology(top, topo, testbeds)
@@ -1791 +1799 @@
                     self.auth.set_attribute(asignee, "%s/%s" % (configpath, f))
 
-            part = experiment_partition(self.auth, self.store_url, self.tbmap,
+            part = experiment_partition(self.auth, self.store_url, tbmap,
                     self.muxmax, self.direct_transit)
             part.add_portals(top, topo, eid, pmasters, tbparams, ip_allocator,
@@ -1893 +1901 @@
                 args=(allocated, masters, eid, expid, tbparams, 
                     top, topo, tmpdir, alloc_log, alloc_collector, attrs,
-                    connInfo),
+                    connInfo, tbmap),
                 name=eid)
         t.start()