Changeset ab847bc for fedd/federation/experiment_control.py

Timestamp:

Apr 28, 2010 4:09:53 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

12658df

Parents:

05fceef

Message:

New syntax for testbeds that includes a /instance rider. This allows users to
request multiple segments from a single testbed.

File:

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

fedd/federation/experiment_control.py

@@ -816 +816 @@
                         "More than one project export is not supported")
 
-        uri = self.tbmap.get(tb, None)
+        uri = self.tbmap.get(testbed_base(tb), None)
         if not uri:
             raise service_error(service_error.server_config, 
@@ -1120 +1120 @@
             # Create and start a thread to start the segment, and save it
             # to get the return value later
+            tb_attrs = copy.copy(attrs)
             thread_pool.wait_for_slot()
-            uri = tbparams[tb].get('uri', self.tbmap.get(tb, None))
+            uri = tbparams[tb].get('uri', \
+                    self.tbmap.get(testbed_base(tb), None))
+            base, suffix = split_testbed(tb)
+            if suffix:
+                tb_attrs.append({'attribute': 'experiment_name', 
+                    'value': "%s_%s" % (eid, suffix)})
+            else:
+                tb_attrs.append({'attribute': 'experiment_name', 'value': eid})
             if not uri:
                 raise service_error(service_error.internal, 
@@ -1141 +1149 @@
             t  = self.pooled_thread(\
                     target=s, name=tb,
-                    args=(uri, aid, topo[tb], masters, attrs, connInfo[tb]),
+                    args=(uri, aid, topo[tb], masters, tb_attrs, connInfo[tb]),
                     pdata=thread_pool, trace_file=self.trace_file)
             threads.append(t)
@@ -1723 +1731 @@
             try:
                 os.makedirs(configdir)
-            except IOError, e:
-                raise service_error(
+            except EnvironmentError, e:
+                raise service_error(service_error.internal,
                         "Cannot create config directory: %s" % e)
             try:
@@ -1752 +1760 @@
             part.add_portals(top, topo, eid, masters, tbparams, ip_allocator,
                     connInfo, expid)
-            # Now get access to the dynamic testbeds
-            for k, t in topo.items():
-                if not t.get_attribute('dynamic'):
-                    continue
-                tb = t.get_attribute('testbed')
-                if tb: 
-                    self.get_access(tb, None, tbparams, export_project, 
-                            access_user, masters)
-                    tbparams[k] = tbparams[tb]
-                    del tbparams[tb]
-                    allocated[k] = 1
-                    store_keys = t.get_attribute('store_keys')
-                    # Give the testbed access to keys it exports or imports
-                    if store_keys:
-                        for sk in store_keys.split(" "):
-                            self.auth.set_attribute(\
-                                    tbparams[k]['allocID']['fedid'], sk)
-                else:
-                    raise service_error(service_error.internal, 
-                            "Dynamic allocation from no testbed!?")
+            # Now get access to the dynamic testbeds (those added above)
+            for tb in [ t for t in topo if t not in allocated]:
+                self.get_access(tb, None, tbparams, access_user, masters)
+                allocated[tb] = 1
+                store_keys = topo[tb].get_attribute('store_keys')
+                # Give the testbed access to keys it exports or imports
+                if store_keys:
+                    for sk in store_keys.split(" "):
+                        self.auth.set_attribute(\
+                                tbparams[tb]['allocID']['fedid'], sk)
 
             self.wrangle_software(expid, top, topo, tbparams)
@@ -1848 +1846 @@
                             (self.repo_url, expid)
                 },
-                {
-                    'attribute': 'experiment_name',
-                    'value': eid,
-                },
             ]