Changeset 5576a47

Timestamp:

Nov 21, 2008 5:50:25 PM (16 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

Location:

fedd

Files:

• fedd_access.py (modified) (1 diff)
• fedd_client.py (modified) (3 diffs)
• fedd_experiment_control.py (modified) (6 diffs)
• fedd_types.xsd (modified) (2 diffs)

fedd/fedd_access.py

@@ -557 +557 @@
             restricted = None
             ap = None
+
+            # If this is a request to export a project and the access project
+            # is not the project to export, access denied.
+            if req.has_key('exportProject'):
+                ep = unpack_id(req['exportProject'])
+                if ep != found[0].name:
+                    raise service_error(service_error.access,
+                            "Cannot export %s" % ep)
 
             # Check for access to restricted nodes

fedd/fedd_client.py

@@ -109 +109 @@
         self.add_option("-f", "--file", dest="file", 
                 help="experiment description file")
+        self.add_option("-p", "--project", action="store", dest="project", 
+                type="string",
+                help="Project to export from master")
         if add_key_callback:
             self.add_option("-k", "--sshKey", action="callback", type="string", 
@@ -493 +496 @@
             parser.error("--trusted is required")
 
+        if not opts.project :
+            parser.error('--project is required')
+
         if opts.debug > 0: opts.tracefile=sys.stderr
 
@@ -531 +537 @@
                 'experimentdescription': { 'ns2description': exp_desc },
                 'master': opts.master,
+                'exportProject': { 'localname': opts.project },
                 'user' : [ {\
                         'userID': pack_id(user), \

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):

fedd/fedd_types.xsd

@@ -374 +374 @@
       <xsd:element name="serviceAccess" type="tns:accessType" minOccurs="1" 
         maxOccurs="unbounded"/>
+      <xsd:element name="exportProject" type="tns:IDType" 
+        minOccurs="0" maxOccurs="1"/>
       <xsd:element name="allocID" type="tns:IDType"/>
       <xsd:element name="when" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
@@ -441 +443 @@
         type="tns:experimentDescriptionType"/>
       <xsd:element name="master" type="xsd:string"/>
+      <xsd:element name='exportProject' type="tns:IDType"/>
       <xsd:element name="experimentID" type="tns:IDType" minOccurs="0" 
         maxOccurs="1"/>