Changeset f4f4117 for fedd/fedd_experiment_control.py

Timestamp:

Oct 20, 2008 5:17:31 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:

fa19281

Parents:

72ed6e4

Message:

add remote splitter interface

File:

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

fedd/fedd_experiment_control.py

@@ -192 +192 @@
             self.scripts_dir = config.get("experiment_control",
                     "federation_script_dir")
+            self.splitter_url = config.get("experiment_control", "splitter_url")
         else:
             self.debug = False
             self.state_filename = None
             self.scripts_dir = "/users/faber/testbed/federation"
+            self.splitter_url = None
 
         # XXX
@@ -908 +910 @@
                 if key:
                     tbparam[tb][key]= a['value']
+
+    def remote_splitter(self, uri, desc, master):
+
+        req = {
+                'description' : { 'ns2description': desc },
+                'master': master,
+            }
+
+        # No retry loop here.  Proxy servers must correctly authenticate
+        # themselves without help
+        try:
+            ctx = fedd_ssl_context(self.cert_file, 
+                    self.trusted_certs, password=self.cert_pwd)
+        except SSL.SSLError:
+            raise service_error(service_error.server_config, 
+                    "Server certificates misconfigured")
+
+        loc = feddInternalServiceLocator();
+        port = loc.getfeddInternalPortType(uri,
+                transport=M2Crypto.httpslib.HTTPSConnection, 
+                transdict={ 'ssl_context' : ctx })
+
+        # Reconstruct the full request message
+        msg = Ns2SplitRequestMessage()
+        msg.set_element_Ns2SplitRequestBody(
+                pack_soap(msg, "Ns2SplitRequestBody", req))
+
+        try:
+            resp = port.Ns2Split(msg)
+        except ZSI.ParseException, e:
+            raise service_error(service_error.req,
+                    "Bad format message (XMLRPC??): %s" %
+                    str(e))
+        r = unpack_soap(resp)
+        if r.has_key('Ns2SplitResponseBody'):
+            r = r['Ns2SplitResponseBody']
+            if r.has_key('output'):
+                return r['output'].splitlines()
+            else:
+                raise service_error(service_error.proxy, 
+                        "Bad splitter response (no output)")
+        else:
+            raise service_error(service_error.proxy, "Bad splitter response")
         
     class current_testbed:
@@ -1408 +1453 @@
             raise service_error(service_error.req, "No master testbed label")
         
-        
-        tclcmd = [self.tclsh, self.tcl_splitter, '-s', '-x', 
-            str(self.muxmax), '-m', master, pid, gid, eid, tclfile]
-        tclparser = Popen(tclcmd, stdout=PIPE)
+        if self.splitter_url:
+            split_data = self.remote_splitter(self.splitter_url, file_content,
+                    master)
+        else:
+            tclcmd = [self.tclsh, self.tcl_splitter, '-s', '-x', 
+                str(self.muxmax), '-m', master, pid, gid, eid, tclfile]
+            tclparser = Popen(tclcmd, stdout=PIPE)
+            split_data = tclparser.stdout
 
         allocated = { }     # Testbeds we can access
@@ -1432 +1481 @@
 
         # Worling on the split data
-        for line in tclparser.stdout:
+        for line in split_data:
             line = line.rstrip()
             if parse_current_testbed(line, master, allocated, tbparams):