Changeset a3ad8bd

Timestamp:

Dec 4, 2009 2:21:11 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

c17efe6

Parents:

4ac0a41

Message:

checkpoint, adding new operation - prequel to splitting the create call to allow delegation

Files:

• fedd/fedd_client.py (modified) (6 diffs)
• fedd/federation/experiment_control.py (modified) (9 diffs)
• wsdl/fedd.wsdl (modified) (3 diffs)
• wsdl/fedd_types.xsd (modified) (2 diffs)

fedd/fedd_client.py

@@ -82 +82 @@
         self.add_option("--trace", action="store_const", dest="tracefile", 
                 const=sys.stderr, help="Print SOAP exchange to stderr")
+class fedd_new_opts(fedd_client_opts):
+    def __init__(self):
+        fedd_client_opts.__init__(self)
+        self.add_option("-e", "--experiment_cert", dest="out_certfile",
+                type="string", help="output certificate file")
+        self.add_option("-E", "--experiment_name", dest="exp_name",
+                type="string", help="Suggested experiment name")
 
 class fedd_create_opts(fedd_client_opts):
@@ -1314 +1321 @@
                 sys.exit("No log returned")
 
-class create(fedd_rpc):
+class new(fedd_rpc):
     def __init__(self): 
-        fedd_rpc.__init__(self, "Create")
+        fedd_rpc.__init__(self, "New")
     def __call__(self):
         access_keys = []
         # Process the options using the customized option parser defined above
-        parser = fedd_create_opts(access_keys, self.add_ssh_key,
-                self.add_x509_cert)
+        parser = fedd_new_opts()
 
         (opts, args) = parser.parse_args()
@@ -1329 +1335 @@
                 sys.exit("Cannot read trusted certificates (%s)" % opts.trusted)
 
-        if not opts.project :
-            parser.error('--project is required')
-
         if opts.debug > 0: opts.tracefile=sys.stderr
 
         (user, cert) = self.get_user_info(access_keys)
-
-        if opts.user: user = opts.user
 
         if opts.cert != None: cert = opts.cert
@@ -1345 +1346 @@
         if os.access(cert, os.R_OK):
             fid = fedid(file=cert)
-            if opts.use_fedid == True:
-                user = fid
         else:
             sys.exit("Cannot read certificate (%s)" % cert)
 
-        if opts.file:
-            exp_desc = ""
-            try:
-                f = open(opts.file, 'r')
-                for line in f:
-                    exp_desc += line
-                f.close()
-            except IOError:
-                sys.exit("Cannot read description file (%s)" %opts.file)
-        else:
-            sys.exit("Must specify an experiment description (--file)")
-
-        if not opts.master:
-            sys.exit("Must specify a master testbed (--master)")
-
         out_certfile = opts.out_certfile
 
-        msg = {
-                'experimentdescription': { 'ns2description': exp_desc },
-                'master': opts.master,
-                'exportProject': { 'localname': opts.project },
-                'user' : [ {\
-                        'userID': pack_id(user), \
-                        'access': [ { a.type: a.buf } for a in access_keys]\
-                        } ]
-                }
+        msg = { }
 
         if opts.exp_name:
@@ -1412 +1388 @@
             print "status: %s" % st
 
+
+class create(fedd_rpc):
+    def __init__(self): 
+        fedd_rpc.__init__(self, "Create")
+    def __call__(self):
+        access_keys = []
+        # Process the options using the customized option parser defined above
+        parser = fedd_create_opts(access_keys, self.add_ssh_key,
+                self.add_x509_cert)
+
+        (opts, args) = parser.parse_args()
+
+        if opts.trusted:
+            if ( not os.access(opts.trusted, os.R_OK) ) :
+                sys.exit("Cannot read trusted certificates (%s)" % opts.trusted)
+
+        if not opts.project :
+            parser.error('--project is required')
+
+        if opts.debug > 0: opts.tracefile=sys.stderr
+
+        (user, cert) = self.get_user_info(access_keys)
+
+        if opts.user: user = opts.user
+
+        if opts.cert != None: cert = opts.cert
+
+        if cert == None:
+            sys.exit("No certificate given (--cert) or found")
+
+        if os.access(cert, os.R_OK):
+            fid = fedid(file=cert)
+            if opts.use_fedid == True:
+                user = fid
+        else:
+            sys.exit("Cannot read certificate (%s)" % cert)
+
+        if opts.file:
+            exp_desc = ""
+            try:
+                f = open(opts.file, 'r')
+                for line in f:
+                    exp_desc += line
+                f.close()
+            except IOError:
+                sys.exit("Cannot read description file (%s)" %opts.file)
+        else:
+            sys.exit("Must specify an experiment description (--file)")
+
+        if not opts.master:
+            sys.exit("Must specify a master testbed (--master)")
+
+        out_certfile = opts.out_certfile
+
+        msg = {
+                'experimentdescription': { 'ns2description': exp_desc },
+                'master': opts.master,
+                'exportProject': { 'localname': opts.project },
+                'user' : [ {\
+                        'userID': pack_id(user), \
+                        'access': [ { a.type: a.buf } for a in access_keys]\
+                        } ]
+                }
+
+        if opts.exp_name:
+            msg['experimentID'] = { 'localname': opts.exp_name }
+
+        if opts.debug > 1: print >>sys.stderr, msg
+
+        try:
+            resp_dict = self.do_rpc(msg, 
+                    opts.url, opts.transport, cert, opts.trusted, 
+                    serialize_only=opts.serialize_only,
+                    tracefile=opts.tracefile)
+        except self.RPCException, e:
+            exit_with_fault(\
+                    {'desc': e.desc, 'errstr': e.errstr, 'code': e.code})
+        except RuntimeError, e:
+            sys.exit("Error processing RPC: %s" % e)
+
+        if opts.debug > 1: print >>sys.stderr, resp_dict
+
+        ea = resp_dict.get('experimentAccess', None)
+        if out_certfile and ea and ea.has_key('X509'):
+            try:
+                f = open(out_certfile, "w")
+                print >>f, ea['X509']
+                f.close()
+            except IOError:
+                sys.exit('Could not write to %s' %  out_certfile)
+        eid = resp_dict.get('experimentID', None)
+        if eid:
+            for id in eid:
+                for k in id.keys():
+                    print "%s: %s" % (k, id[k])
+        st = resp_dict.get('experimentStatus', None)
+        if st:
+            print "status: %s" % st
+
 class split(fedd_rpc):
     def __init__(self): 
@@ -1749 +1824 @@
 
 cmds = {\
+        'new': new(),\
         'create': create(),\
         'split': split(),\

fedd/federation/experiment_control.py

@@ -332 +332 @@
         # Dispatch tables
         self.soap_services = {\
+                'New': soap_handler('New', self.new_experiment),
                 'Create': soap_handler('Create', self.create_experiment),
                 'Vtopo': soap_handler('Vtopo', self.get_vtopo),
@@ -342 +343 @@
 
         self.xmlrpc_services = {\
+                'New': xmlrpc_handler('New', self.new_experiment),
                 'Create': xmlrpc_handler('Create', self.create_experiment),
                 'Vtopo': xmlrpc_handler('Vtopo', self.get_vtopo),
@@ -498 +500 @@
         for fid in self.accessdb.keys():
             self.auth.set_attribute(fid, 'create')
+            self.auth.set_attribute(fid, 'new')
 
     def read_mapdb(self, file):
@@ -868 +871 @@
             }
 
-        
     def release_access(self, tb, aid, uri=None):
         """
@@ -1214 +1216 @@
 
 
-    def create_experiment_state(self, fid, req, expid, expcert):
+    def create_experiment_state(self, fid, req, expid, expcert, 
+            state='starting'):
         """
         Create the initial entry in the experiment's state.  The expid and
@@ -1221 +1224 @@
         includes a suggested local name that is used if possible.  If the local
         name is already taken by an experiment owned by this user that has
-        failed, it is overwriutten.  Otherwise new letters are added until a
+        failed, it is overwritten.  Otherwise new letters are added until a
         valid localname is found.  The generated local name is returned.
         """
@@ -1250 +1253 @@
                     'experimentID' : \
                             [ { 'localname' : eid }, {'fedid': expid } ],
-                    'experimentStatus': 'starting',
+                    'experimentStatus': state,
                     'experimentAccess': { 'X509' : expcert },
                     'owner': fid,
@@ -1271 +1274 @@
                     'experimentID' : \
                             [ { 'localname' : eid }, {'fedid': expid } ],
-                    'experimentStatus': 'starting',
+                    'experimentStatus': state,
                     'experimentAccess': { 'X509' : expcert },
                     'owner': fid,
@@ -1858 +1861 @@
 
 
+    def new_experiment(self, req, fid):
+        """
+        The external interface to empty initial experiment creation called from
+        the dispatcher.
+
+        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.
+        """
+        if not self.auth.check_attribute(fid, 'new'):
+            raise service_error(service_error.access, "New access denied")
+
+        try:
+            tmpdir = tempfile.mkdtemp(prefix="split-")
+        except IOError:
+            raise service_error(service_error.internal, "Cannot create tmp dir")
+
+        try:
+            access_user = self.accessdb[fid]
+        except KeyError:
+            raise service_error(service_error.internal,
+                    "Access map and authorizer out of sync in " + \
+                            "create_experiment for fedid %s"  % fid)
+
+        pid = "dummy"
+        gid = "dummy"
+
+        req = req.get('NewRequestBody', None)
+        if not req:
+            raise service_error(service_error.req,
+                    "Bad request format (no NewRequestBody)")
+
+        # Generate an ID for the experiment (slice) and a certificate that the
+        # allocator can use to prove they own it.  We'll ship it back through
+        # the encrypted connection.
+        (expid, expcert) = generate_fedid("test", dir=tmpdir, log=self.log)
+
+        #now we're done with the tmpdir, and it should be empty
+        if self.cleanup:
+            self.log.debug("[new_experiment]: removing %s" % tmpdir)
+            os.rmdir(tmpdir)
+        else:
+            self.log.debug("[new_experiment]: not removing %s" % tmpdir)
+
+        eid = self.create_experiment_state(fid, req, expid, expcert, 
+                state='empty')
+
+        # Let users touch the state
+        self.auth.set_attribute(fid, expid)
+        self.auth.set_attribute(expid, expid)
+        # Override fedids can manipulate state as well
+        for o in self.overrides:
+            self.auth.set_attribute(o, expid)
+
+        rv = {
+                'experimentID': [
+                    {'localname' : eid }, { 'fedid': copy.copy(expid) }
+                ],
+                'experimentStatus': 'empty',
+                'experimentAccess': { 'X509' : expcert }
+            }
+
+        return rv
+
+
     def create_experiment(self, req, fid):
         """

wsdl/fedd.wsdl

@@ -32 +32 @@
     <part name="ReleaseAccessResponseBody" type="xsd1:releaseResponseType"/>
   </message>
+
+  <message name="NewRequestMessage">
+    <part name="NewRequestBody" type="xsd1:newRequestType"/>
+  </message>
+
+  <message name="NewResponseMessage">
+    <part name="NewResponseBody" type="xsd1:newResponseType"/>
+  </message>
+
+
   <message name="CreateRequestMessage">
     <part name="CreateRequestBody" type="xsd1:createRequestType"/>
@@ -126 +136 @@
       <fault name="ReleaseAccessFeddFault" message="tns:FaultMessage"/>
     </operation>
+    <operation name="New">
+      <documentation>
+        A request to create a federated experiment in an empty state so
+        resources can be attached and attributes delegated.  On success the
+        identity of the new experiment is returned.
+      </documentation>
+      <input message="tns:NewRequestMessage"/>
+      <output message="tns:NewResponseMessage"/>
+      <fault name="NewFeddFault" message="tns:FaultMessage"/>
+    </operation>
     <operation name="Create">
       <documentation>
@@ -257 +277 @@
         </fault>
       </operation>
+      <operation name="New">
+        <documentation>
+          The bindings of this operation are straightforward SOAP RPC 1.1.
+        </documentation>
+        <soap:operation soapAction="New"/> 
+        <input>
+          <soap:body use="literal" parts="tns:NewRequestBody"
+            namespace="http://www.isi.edu/faber/fedd.wsdl"
+            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+        </input>
+        <output>
+          <soap:body use="literal" parts="tns:NewResponseBody"
+            namespace="http://www.isi.edu/faber/fedd.wsdl"
+            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+        </output>
+        <fault name="NewFeddFault">
+          <soap:fault use="literal"  name="tns:FeddFault"
+            namespace="http://www.isi.edu/faber/fedd.wsdl"
+            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+        </fault>
+      </operation>
       <operation name="Create">
         <documentation>

wsdl/fedd_types.xsd

@@ -63 +63 @@
     </xsd:annotation>
     <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="empty"/>
       <xsd:enumeration value="active"/>
       <xsd:enumeration value="starting"/>
@@ -350 +351 @@
       <xsd:element name="topdldescription" type="topdl:topologyType"/>
     </xsd:choice>
+  </xsd:complexType>
+
+  <xsd:complexType name="newRequestType">
+    <xsd:annotation>
+      <xsd:documentation>
+        Request for an experiment to which credentials can be delegated and
+        resources attached.  A local name may be included as a human readable
+        accessor, local to this experiment controller.  It is a suggestion and
+        may be modified.  experimentID can only be a local name.
+
+        Credentials are seed credentials to begin the proof.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="experimentID" type="tns:IDType" minOccurs="0" 
+        maxOccurs="1"/>
+      <xsd:element name="credential" type="xsd:base64Binary" minOccurs="0" 
+        maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="newResponseType">
+    <xsd:annotation>
+      <xsd:documentation>
+        Result of a new experiment creation.  A successful sreation will have
+        an experimentState of "empty", 2 experimentIDs, one a fedid and one a
+        local name, and an experimentAccess that allows the creator to act as
+        the experiment.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="experimentID" type="tns:IDType" minOccurs="0" 
+        maxOccurs="unbounded"/>
+      <xsd:element name="experimentStatus" type="tns:statusType"/>
+      <xsd:element name="experimentAccess" type="tns:accessType"/>
+    </xsd:sequence>
   </xsd:complexType>