Changeset 5f6929a

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.

Files:

• fedd/fedd_client.py (modified) (1 diff)
• fedd/federation/deter_impl.py (modified) (2 diffs)
• fedd/federation/experiment_control.py (modified) (9 diffs)
• fedd/federation/ns2topdl.py (moved) (moved from fedd/federation/split.py) (6 diffs)
• wsdl/fedd_internal.wsdl (modified) (4 diffs)
• wsdl/fedd_types.xsd (modified) (2 diffs)

fedd/fedd_client.py

@@ -1443 +1443 @@
         msg = {
                 'experimentdescription': { 'ns2description': exp_desc },
-                'master': opts.master,
-                'exportProject': { 'localname': opts.project },
+                'service': [ { 'name': 'project_export', 'fedAttr': [ 
+                    { 'attribute': 'testbed', 'value': opts.master },
+                    { 'attribute': 'project', 'value': opts.project },
+                    ],
+                    'visibility': 'export' }, ]
             }
 

fedd/federation/deter_impl.py

@@ -5 +5 @@
 import protogeni_access
 from experiment_control import experiment_control_local
-from split import split_local
+from ns2topdl import ns2topdl_local
 from util import read_simple_accessdb
 from fedid import fedid
@@ -101 +101 @@
                     self.get_handler = None
 
-            if config.has_section("splitter"):
-                self.splitter = split_local(config, self.auth)
-                self.soap_services.update(self.splitter.soap_services) 
-                self.xmlrpc_services.update(self.splitter.xmlrpc_services) 
+            if config.has_section("ns2topdl"):
+                self.ns2topdl = ns2topdl_local(config, self.auth)
+                self.soap_services.update(self.ns2topdl.soap_services) 
+                self.xmlrpc_services.update(self.ns2topdl.xmlrpc_services) 
 
 def new_feddservice(config):

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', 

fedd/federation/ns2topdl.py

@@ -20 +20 @@
 fl.addHandler(nullHandler())
 
-class split_local:
+class ns2topdl_local:
     def __init__(self, config=None, auth=None):
         """
         Intialize the various attributes, most from the config object
         """
-        self.debug = config.getboolean("splitter", "debug")
-        self.muxmax = config.getint("splitter", "muxmax", 3)
-        self.tclsh = config.get("splitter", "tclsh", 
+        self.debug = config.getboolean("ns2topdl", "debug")
+        self.muxmax = config.getint("ns2topdl", "muxmax", 3)
+        self.tclsh = config.get("ns2topdl", "tclsh", 
                 "/usr/local/bin/otclsh")
-        self.tcl_splitter = config.get("splitter", "tcl_splitter",
+        self.tcl_splitter = config.get("ns2topdl", "tcl_splitter",
                 "/usr/testbed/lib/ns2ir/parse.tcl")
-        access_db = config.get("splitter", "accessdb", None)
-        allow_any = config.getboolean("splitter", "allow_any", False)
+        access_db = config.get("ns2topdl", "accessdb", None)
+        allow_any = config.getboolean("ns2topdl", "allow_any", False)
 
-        self.log = logging.getLogger("fedd.splitter")
-        set_log_level(config, "splitter", self.log)
+        self.log = logging.getLogger("fedd.ns2topdl")
+        set_log_level(config, "ns2topdl", self.log)
         self.trace_file = sys.stderr
 
-        set_log_level(config, "splitter", self.log)
+        set_log_level(config, "ns2topdl", self.log)
 
         if auth:
@@ -44 +44 @@
         else:
             self.auth = authorizer()
-            self.log.warning("[splitter] No authorizer passed in, " +\
+            self.log.warning("[ns2topdl] No authorizer passed in, " +\
                     "using local one")
 
@@ -50 +50 @@
             raise service_error(service_error.internal, 
                     "Cannot specify both an access database and allow_any " +\
-                            "for splitter")
+                            "for ns2topdl")
         
         if access_db:
             try:
-                read_simple_accessdb(access_db, self.auth, 'split')
+                read_simple_accessdb(access_db, self.auth, 'ns2topdl')
             except IOError, e:
                 raise service_error(service_error.internal,
@@ -61 +61 @@
                 raise service_error(service_error.internal, "%s" % e)
         elif allow_any:
-            auth.set_global_attribute("split")
+            auth.set_global_attribute("ns2topdl")
 
 
         # Dispatch tables
         self.soap_services = {\
-                'Ns2Split': soap_handler("Ns2Split", self.run_splitter),
+                'Ns2Topdl': soap_handler("Ns2Topdl", self.run_ns2topdl),
         }
 
         self.xmlrpc_services = {\
-                'Ns2Split': xmlrpc_handler('Ns2Split', self.run_splitter),
+                'Ns2Topdl': xmlrpc_handler('Ns2Topdl', self.run_ns2topdl),
         }
 
-    def run_splitter(self, req, fid):
+    def run_ns2topdl(self, req, fid):
         """
-        The external interface to experiment creation called from the
-        dispatcher.
+        The external interface to tcl to topdl translation.
 
-        Creates a working directory, splits the incoming description using the
-        splitter script and parses out the avrious subsections using the
-        lcasses above.  Once each sub-experiment is created, use pooled threads
-        to instantiate them and start it all up.
+        Creates a working directory, translates the incoming description using
+        the tcl script.
         """
 
-        if not self.auth.check_attribute(fid, 'split'):
+        if not self.auth.check_attribute(fid, 'ns2topdl'):
             raise service_error(service_error.access, "Access Denied")
 
         try:
-            tmpdir = tempfile.mkdtemp(prefix="split-")
+            tmpdir = tempfile.mkdtemp(prefix="ns2topdl-")
         except IOError:
             raise service_error(service_error.internal, "Cannot create tmp dir")
@@ -96 +93 @@
         gid = "dummy"
         eid = "dummy"
+        master = "dummy"
 
-        req = req.get('Ns2SplitRequestBody', None)
+        req = req.get('Ns2TopdlRequestBody', None)
         if not req:
             raise service_error(service_error.req,
-                    "Bad request format (no Ns2SplitRequestBody)")
+                    "Bad request format (no Ns2TopdlRequestBody)")
         # The tcl parser needs to read a file so put the content into that file
         descr=req.get('description', None)
@@ -119 +117 @@
             raise service_error(service_error.req, "No description")
 
-        master = req.get('master', None)
-        if master == None:
-            raise service_error(service_error.req, "No master testbed label")
-        
-        include_fedkit = req.get('include_fedkit', None)
-        if include_fedkit == None:
-            raise service_error(service_error.req, 
-                    "No federation kit inclusion directive")
-        
         
         tclcmd = [self.tclsh, self.tcl_splitter, '-t', '-x', 
             str(self.muxmax), '-m', master]
-        if include_fedkit: tclcmd.append('-k')
         tclcmd.extend([pid, gid, eid, tclfile])
         self.log.debug("Calling splitter %s" % " ".join(tclcmd))

wsdl/fedd_internal.wsdl

@@ -46 +46 @@
   </message>
 
-  <message name="Ns2SplitRequestMessage">
-    <part name="Ns2SplitRequestBody" type="xsd1:ns2SplitRequestType"/>
-  </message>
-
-  <message name="Ns2SplitResponseMessage">
-    <part name="Ns2SplitResponseBody" type="xsd1:ns2SplitResponseType"/>
+  <message name="Ns2TopdlRequestMessage">
+    <part name="Ns2TopdlRequestBody" type="xsd1:ns2TopdlRequestType"/>
+  </message>
+
+  <message name="Ns2TopdlResponseMessage">
+    <part name="Ns2TopdlResponseBody" type="xsd1:ns2TopdlResponseType"/>
   </message>
 
@@ -86 +86 @@
       <fault name="ReleaseFault" message="tns:FaultMessage"/>
     </operation>
-    <operation name="Ns2Split">
+    <operation name="Ns2Topdl">
       <documentation>
         This allows a fedd that does not have direct access to the modified ns
@@ -92 +92 @@
         that functionality remotely.
       </documentation>
-      <input message="tns:Ns2SplitRequestMessage"/>
-      <output message="tns:Ns2SplitResponseMessage"/>
-      <fault name="Ns2SplitFault" message="tns:FaultMessage"/>
+      <input message="tns:Ns2TopdlRequestMessage"/>
+      <output message="tns:Ns2TopdlResponseMessage"/>
+      <fault name="Ns2TopdlFault" message="tns:FaultMessage"/>
     </operation>
   </portType>
@@ -169 +169 @@
         </fault>
       </operation>
-      <operation name="Ns2Split">
-        <documentation>
-          The bindings of this operation are straightforward SOAP RPC 1.1.
-        </documentation>
-        <soap:operation soapAction="Ns2Split"/> 
-        <input>
-          <soap:body use="encoded" parts="tns:Ns2SplitRequestBody"
-            namespace="http://www.isi.edu/faber/fedd_internal.wsdl"
-            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-        </input>
-        <output>
-          <soap:body use="encoded" parts="tns:Ns2SplitResponseBody"
-            namespace="http://www.isi.edu/faber/fedd_internal.wsdl"
-            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-        </output>
-        <fault name="Ns2SplitFault">
-          <soap:fault use="encoded"  name="tns:Ns2SplitFault"
+      <operation name="Ns2Topdl">
+        <documentation>
+          The bindings of this operation are straightforward SOAP RPC 1.1.
+        </documentation>
+        <soap:operation soapAction="Ns2Topdl"/> 
+        <input>
+          <soap:body use="encoded" parts="tns:Ns2TopdlRequestBody"
+            namespace="http://www.isi.edu/faber/fedd_internal.wsdl"
+            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+        </input>
+        <output>
+          <soap:body use="encoded" parts="tns:Ns2TopdlResponseBody"
+            namespace="http://www.isi.edu/faber/fedd_internal.wsdl"
+            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+        </output>
+        <fault name="Ns2TopdlFault">
+          <soap:fault use="encoded"  name="tns:Ns2TopdlFault"
             namespace="http://www.isi.edu/faber/fedd_internal.wsdl"
             encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>

wsdl/fedd_types.xsd

@@ -573 +573 @@
       <xsd:element name="experimentdescription" 
         type="tns:experimentDescriptionType"/>
+      <xsd:element name="service" type="tns:serviceInfoType" minOccurs="0"
+        maxOccurs="unbounded" />
       <!-- begin deprecated -->
-      <xsd:element name="master" type="xsd:string"/>
-      <xsd:element name='exportProject' type="tns:IDType"/>
+      <xsd:element name="master" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name='exportProject' type="tns:IDType" minOccurs="0" maxOccurs="1"/>
       <!-- end deprecated -->
       <xsd:element name="experimentID" type="tns:IDType"/>
@@ -824 +826 @@
   </xsd:complexType>
 
-  <xsd:complexType name="ns2SplitRequestType">
-    <xsd:annotation>
-      <xsd:documentation>
-        Request to run the CEDL splitter remotely.  This is primarily an
-        internal interface.
+  <xsd:complexType name="ns2TopdlRequestType">
+    <xsd:annotation>
+      <xsd:documentation>
+        Request to run the CEDL to topdl translator remotely.  This is
+        primarily an internal interface.
       </xsd:documentation>
     </xsd:annotation>
     <xsd:sequence>
       <xsd:element name="description" type="tns:experimentDescriptionType"/>
-      <xsd:element name="master" type="xsd:string"/>
-      <xsd:element name="include_fedkit" type="xsd:boolean"/>
-      <xsd:element name="include_gatewaykit" type="xsd:boolean"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ns2SplitResponseType">
-    <xsd:annotation>
-      <xsd:documentation>
-        Remote splitter output.  Also an internal interface
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="ns2TopdlResponseType">
+    <xsd:annotation>
+      <xsd:documentation>
+        Translator splitter output.  Also an internal interface
       </xsd:documentation>
     </xsd:annotation>