Changeset 7aec37d

Timestamp:

Aug 1, 2008 2:50:26 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:

e5a8b44

Parents:

808889e

Message:

split out internal interfaces

Location:

fedd

Files:

• Makefile (modified) (2 diffs)
• fedd.py (modified) (1 diff)
• fedd_allocate_project.py (modified) (3 diffs)
• fedd_bindings.wsdl (modified) (1 diff)
• fedd_internal.wsdl (added)
• fedd_internal_bindings.wsdl (added)
• fedd_internal_messages.wsdl (added)
• fedd_messages.wsdl (modified) (2 diffs)
• fedd_proj.py (modified) (2 diffs)

fedd/Makefile

@@ -1 +1 @@
 
-GENERATED_MODS=fedd_services.py fedd_services_types.py
-WSDL_FILES=fedd.wsdl fedd_bindings.wsdl fedd_messages.wsdl fedd_types.xsd
+GENERATED_MODS= fedd_services.py fedd_internal_services.py \
+                fedd_services_types.py
+WSDL_FILES= fedd.wsdl fedd_bindings.wsdl fedd_messages.wsdl fedd_types.xsd \
+            fedd_internal.wsdl fedd_internal_bindings.wsdl \
+            fedd_internal_messages.wsdl 
 
 all:    ${GENERATED_MODS}
@@ -8 +11 @@
 ${GENERATED_MODS}:      ${WSDL_FILES}
         /usr/local/bin/wsdl2py --file fedd.wsdl --complexType
+        /usr/local/bin/wsdl2py --file fedd_internal.wsdl --complexType \
+                --types=fedd_services_types
 
 clean:

fedd/fedd.py

@@ -55 +55 @@
         """Confirm that this class implements the namespace and SOAP method"""
         root = ps.body_root
-        if root.namespaceURI != self.server.impl.soap_namespace:
+        if root.namespaceURI not in self.server.impl.soap_namespaces:
             self.send_fault(Fault(Fault.Client, 
                 'Unknown namespace "%s"' % root.namespaceURI))

fedd/fedd_allocate_project.py

@@ -19 +19 @@
 
 from fedd_services import *
+from fedd_internal_services import *
 from fedd_util import *
 import parse_detail
@@ -195 +196 @@
         if certs != None and isinstance(certs, type(tuple())):
             self.cert_file, self.trusted_certs, self.cert_pwd = certs
-            # self.cert_file = certs[0]
-            # self.trusted_certs = certs[1]
-            # self.cert_pwd = certs[2]
-        else:
-            self.cert_file = None
-            self.trusted_certs = None
-            self.cert_pwd = None
+        else:
+            self.cert_file, self.trusted_certs, self.cert_pwd = \
+                    (None, None, None)
 
     def dynamic_project(self, req, fedid=None):
@@ -219 +216 @@
                     "Server certificates misconfigured")
 
-        loc = feddServiceLocator();
-        port = loc.getfeddPortType(self.url,
+        loc = feddInternalServiceLocator();
+        port = loc.getfeddInternalPortType(self.url,
                 transport=M2Crypto.httpslib.HTTPSConnection, 
                 transdict={ 'ssl_context' : ctx })

fedd/fedd_bindings.wsdl

@@ -37 +37 @@
         </fault>
       </operation>
-      <operation name="AllocateProject">
-        <documentation>
-          The bindings of this operation are straightforward SOAP RPC 1.1.
-        </documentation>
-        <soap:operation soapAction="AllocateProject"/> 
-        <input>
-          <soap:body use="encoded" parts="tns:AllocateProjectRequestBody"
-            namespace="http://www.isi.edu/faber/fedd.wsdl"
-            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-        </input>
-        <output>
-          <soap:body use="encoded" parts="tns:AllocateProjectResponseBody"
-            namespace="http://www.isi.edu/faber/fedd.wsdl"
-            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-        </output>
-        <fault>
-          <soap:fault use="encoded"  name="tns:AllocateProjectFault"
-            namespace="http://www.isi.edu/faber/fedd.wsdl"
-            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-        </fault>
-      </operation>
     </binding>
 

fedd/fedd_messages.wsdl

@@ -19 +19 @@
   </message>
 
-  <message name="AllocateProjectRequestMessage">
-    <part name="AllocateProjectRequestBody" type="xsd1:projectAllocType"/>
-  </message>
-
-  <message name="AllocateProjectResponseMessage">
-    <part name="AllocateProjectResponseBody" 
-      type="xsd1:projectAllocResponseType"/>
-  </message>
-
   <portType name="feddPortType">
     <operation name="RequestAccess">
@@ -38 +29 @@
         message="tns:FaultMessage"/>
     </operation>
-
-    <operation name="AllocateProject">
-      <input message="tns:AllocateProjectRequestMessage"/>
-      <output message="tns:AllocateProjectResponseMessage"/>
-      <fault name="AllocateProjectFault" 
-        message="tns:FaultMessage"/>
-    </operation>
   </portType>
 </definitions>

fedd/fedd_proj.py

@@ -39 +39 @@
 
     # Used by the SOAP caller
-    soap_namespace = 'http://www.isi.edu/faber/fedd.wsdl'
+    soap_namespaces = ('http://www.isi.edu/faber/fedd.wsdl',
+            'http://www.isi.edu/faber/fedd_internal.wsdl')
     soap_methods = { 'RequestAccess': 'soap_RequestAccess' }
     xmlrpc_methods = { 'RequestAccess': 'xmlrpc_RequestAccess' }
@@ -449 +450 @@
                                 
                     ap = self.allocate_project.dynamic_project(preq)
-                else: pass    # SSH key additions
+                else:
+                    # XXX ssh key additions
+                    ap = { 'project': \
+                            { 'name' : { 'username' : found[0] },\
+                              'user' : [ {\
+                                'userID': { 'username' : found[1] }, \
+                                'access': [ { 'sshPubkey': s } for s in ssh]}\
+                                ]\
+                            }\
+                    }
             else:
                 raise service_error(service_error.req,