Changeset 5f6929a for fedd/federation/experiment_control.py

Timestamp:

Apr 7, 2010 1:53:58 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

7fe81be

Parents:

3e3a5de

Message:

Two changes at once

Remove master and export project from the create request and rename the splitter external interface into a translation interface. The export_project pseudo service is staring.

Also start removeing some deprecated fields.

File:

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

fedd/federation/experiment_control.py

@@ -184 +184 @@
     call_StartSegment = service_caller('StartSegment')
     call_TerminateSegment = service_caller('TerminateSegment')
-    call_Ns2Split = service_caller('Ns2Split')
+    call_Ns2Topdl = service_caller('Ns2Topdl')
 
     def __init__(self, config=None, auth=None):
@@ -243 +243 @@
                 "synch_store")
         self.store_url = config.get("experiment_control", "store_url")
-        self.splitter_url = config.get("experiment_control", "splitter_uri")
+        self.splitter_url = config.get("experiment_control", "ns2topdl_uri")
         self.fedkit = parse_tarfile_list(\
                 config.get("experiment_control", "fedkit"))
@@ -268 +268 @@
         self.state_lock = Lock()
         self.tclsh = "/usr/local/bin/otclsh"
-        self.tcl_splitter = config.get("splitter", "tcl_splitter") or \
+        self.tcl_splitter = config.get("ns2topdl", "tcl_splitter") or \
                 config.get("experiment_control", "tcl_splitter",
                         "/usr/testbed/lib/ns2ir/parse.tcl")
@@ -797 +797 @@
         # Tweak search order so that if there are entries in access_user that 
         # have a project matching the export project, we try them first 
-        if export_project and export_project.has_key('localname'): 
-            pn = export_project['localname'] 
-                
-            access_sequence = [ (p, u) for p, u in access_user if p == pn] 
-            access_sequence.extend([(p, u) for p, u in access_user if p != pn]) 
+        if export_project: 
+            access_sequence = [ (p, u) for p, u in access_user \
+                    if p == export_project] 
+            access_sequence.extend([(p, u) for p, u in access_user \
+                    if p != export_project]) 
         else: 
             access_sequence = access_user 
@@ -825 +825 @@
                     }
 
+            # If there is a master, and this is it, ask it to export services
+            # XXX move this to export pseudo-service
             if tb == master:
-                # NB, the export_project parameter is a dict that includes
-                # the type
-                req['exportProject'] = export_project
                 req['service'] = [
                         { 'name': 'userconfig', 'visibility': 'export'},
@@ -922 +921 @@
         # better error coding
 
-    def remote_splitter(self, uri, desc, master):
+    def remote_ns2topdl(self, uri, desc):
 
         req = {
                 'description' : { 'ns2description': desc },
-                'master': master,
-                'include_fedkit': bool(self.fedkit),
-                'include_gatewaykit': bool(self.gatewaykit)
             }
 
-        r = self.call_Ns2Split(uri, req, self.cert_file, self.cert_pwd, 
+        r = self.call_Ns2Topdl(uri, req, self.cert_file, self.cert_pwd, 
                 self.trusted_certs)
 
-        if r.has_key('Ns2SplitResponseBody'):
-            r = r['Ns2SplitResponseBody']
+        if r.has_key('Ns2TopdlResponseBody'):
+            r = r['Ns2TopdlResponseBody']
             ed = r.get('experimentdescription', None)
             if ed.has_key('topdldescription'):
@@ -2007 +2003 @@
         return rv
 
+    def get_master_project(self, req):
+        master= None
+        export_project = None
+        for e in [ s for s in req.get('service', []) \
+                if s.get('name') == 'project_export']:
+            for a in e.get('fedAttr', []):
+                attr = a.get('attribute', None)
+                if attr == 'testbed':
+                    master = a.get('value', None)
+                elif attr == 'project':
+                    export_project = a.get('value', None)
+        
+        return (master, export_project)
+
+
 
     def create_experiment(self, req, fid):
@@ -2103 +2114 @@
                 raise service_error(service_error.server_config, 
                         "Bad key type (%s)" % self.ssh_type)
-
-            master = req.get('master', None)
+            master, export_project = self.get_master_project(req)
+            # XXX get these out when master and project are optional
             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")
-           
+            # XXX
+
             # Translate to topdl
             if self.splitter_url:
@@ -2117 +2128 @@
                 self.log.debug("Calling remote splitter at %s" % \
                         self.splitter_url)
-                top = self.remote_splitter(self.splitter_url,
-                        file_content, master)
+                top = self.remote_ns2topdl(self.splitter_url, file_content)
             else:
                 tclcmd = [self.tclsh, self.tcl_splitter, '-t', '-x',