Changeset b234bb9 for fedd/fedd_proj.py

Timestamp:

Aug 28, 2008 2:47:15 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:

2d5c8b6

Parents:

0d830de

Message:

Experiment creation integrated

File:

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

fedd/fedd_proj.py

@@ -20 +20 @@
 from fedd_util import *
 from fedd_allocate_project import *
+from fedd_create_experiment import *
 import parse_detail
 from service_error import *
@@ -31 +32 @@
     """
     # Attributes that can be parsed from the configuration file
-    bool_attrs = ("dynamic_projects", "project_priority")
+    bool_attrs = ("dynamic_projects", "project_priority", "create_debug")
     emulab_attrs = ("boss", "ops", "domain", "fileserver", "eventserver")
     id_attrs = ("testbed", "cert_file", "cert_pwd", "trusted_certs", "proxy",
             "proxy_cert_file", "proxy_cert_pwd", "proxy_trusted_certs",
             "dynamic_projects_url", "dynamic_projects_cert_file", 
-            "dynamic_projects_cert_pwd", "dynamic_projects_trusted_certs")
+            "dynamic_projects_cert_pwd", "dynamic_projects_trusted_certs",
+            "create_experiment_cert_file", "create_experiment_cert_pwd",
+            "create_experiment_trusted_certs", "federation_script_dir",
+            "ssh_pubkey_file")
 
     # Used by the SOAP caller
     soap_namespaces = ('http://www.isi.edu/faber/fedd.wsdl',
             'http://www.isi.edu/faber/fedd_internal.wsdl')
-    soap_methods = { 'RequestAccess': 'soap_RequestAccess' }
+    soap_methods = {\
+            'RequestAccess': 'soap_RequestAccess',\
+            'Create' : 'soap_Create',\
+            }
     xmlrpc_methods = { 'RequestAccess': 'xmlrpc_RequestAccess' }
 
@@ -85 +92 @@
         self.fedid_default = "user"
         self.restricted = []
-
-        # Delete these
-        self.wap = '/usr/testbed/sbin/wap'
-        self.newproj = '/usr/testbed/sbin/newproj'
-        self.mkproj = '/usr/testbed/sbin/mkproj'
-        self.grantnodetype = '/usr/testbed/sbin/grantnodetype'
+        self.create_debug = False
 
         # Read the configuration
@@ -120 +122 @@
                 self.dynamic_projects_trusted_certs,
                 self.dynamic_projects_cert_pwd)
+
+        # Initialize create experiment certs
+        if not self.create_experiment_cert_file:
+            self.create_experiment_cert_file = self.proxy_cert_file
+            self.create_experiment_cert_pwd = self.proxy_cert_pwd
+
+        if self.create_experiment_trusted_certs == None:
+            self.create_experiment_trusted_certs = self.proxy_trusted_certs
 
         if self.dynamic_projects_url == None:
@@ -130 +140 @@
                 fedd_allocate_project_remote(self.dynamic_projects, 
                         self.dynamic_projects_url, proj_certs)
+
+        create_kwargs = { }
+        if self.federation_script_dir:
+            create_kwargs['scripts_dir'] = self.federation_script_dir
+        if self.ssh_pubkey_file:
+            create_kwargs['ssh_pubkey_file'] = self.ssh_pubkey_file
+        if self.create_experiment_cert_file:
+            create_kwargs['cert_file'] = self.create_experiment_cert_file
+        if self.create_experiment_cert_pwd:
+            create_kwargs['cert_pwd'] = self.create_experiment_cert_pwd
+        if self.create_experiment_trusted_certs:
+            create_kwargs['trusted_certs'] = \
+                    self.create_experiment_trusted_certs
+
+        self.create_experiment = fedd_create_experiment_local(
+            tbmap = { 
+                'deter':'https://users.isi.deterlab.net:23235',
+                'emulab':'https://users.isi.deterlab.net:23236',
+                'ucb':'https://users.isi.deterlab.net:23237',
+                },
+            trace_file=sys.stderr,
+            debug=self.create_debug,
+            **create_kwargs
+        ) 
 
     def dump_state(self):
@@ -525 +559 @@
         return resp
 
+    def soap_Create(self, ps, fid):
+        req = ps.Parse(CreateRequestMessage.typecode)
+
+        msg = self.create_experiment.create_experiment(unpack_soap(req), fedid)
+
+        resp = CreateResponseMessage()
+        resp.set_element_CreateResponseBody(
+                pack_soap(resp, "CreateResponseBody", msg))
+
+        return resp
+
     def xmlrpc_RequestAccess(self, params, fid):
         msg = self.RequestAccess(params[0], fedid)