Changeset 5576a47 for fedd/fedd_experiment_control.py

Timestamp:

Nov 21, 2008 5:50:25 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

0b123ff

Parents:

a94cb0a

Message:

project exporting in place

File:

• fedd/fedd_experiment_control.py (modified) (6 diffs)

fedd/fedd_experiment_control.py

@@ -781 +781 @@
         else: return None
 
-    def get_access(self, tb, nodes, user, tbparam):
+    def get_access(self, tb, nodes, user, tbparam, master, export_project):
         """
         Get access to testbed through fedd and set the parameters for that tb
@@ -811 +811 @@
                 'serviceAccess' : [ { 'sshPubkey' : self.ssh_pubkey } ]
             }
-        
+
+        if tb == master:
+            # NB, the export_project parameter is a dict that includes
+            # the type
+            req['exportProject'] = export_project
+
         # node resources if any
         if nodes != None and len(nodes) > 0:
@@ -1001 +1006 @@
             self.get_access = get_access
 
-        def __call__(self, line, user, tbparams):
+        def __call__(self, line, user, tbparams, master, export_project):
             # Testbed access parameters
             if not self.in_allbeds:
@@ -1015 +1020 @@
                     nodes = line.split('|')
                     tb = nodes.pop(0)
-                    self.get_access(tb, nodes, user, tbparams)
+                    self.get_access(tb, nodes, user, tbparams, master,
+                            export_project)
                 return True
 
@@ -1402 +1408 @@
 
         master = req.get('master', None)
-        if master == None:
+        if not master:
             raise service_error(service_error.req, "No master testbed label")
+        export_project = req.get('exportProject', None)
+        if not export_project:
+            raise service_error(service_error.req, "No export project")
         
         if self.splitter_url:
@@ -1445 +1454 @@
             if parse_current_testbed(line, master, allocated, tbparams):
                 continue
-            elif parse_allbeds(line, user, tbparams):
+            elif parse_allbeds(line, user, tbparams, master, export_project):
                 continue
             elif parse_gateways(line, allocated, tbparams):