Changeset 2036


Ignore:
Timestamp:
24/01/07 10:06:56 (12 years ago)
Author:
pjkersha
Message:

python/ndg.security.server/ndg/security/server/AttAuthority/AttAuthority_services_server.py,
python/ndg.security.common/ndg/security/common/AttAuthority/AttAuthority_services_types.py,
python/ndg.security.common/ndg/security/common/AttAuthority/AttAuthority_services.py,
python/www/html/attAuthority.wsdl:
Changes to types for getTrustedHostInfoResponse but not fixed - response doesn't contain the HostInfo? type.

python/ndg.security.server/ndg/security/server/AttAuthority/README,
python/ndg.security.server/ndg/security/server/AttAuthority/Makefile,
python/ndg.security.common/ndg/security/common/AttAuthority/README,
python/ndg.security.common/ndg/security/common/AttAuthority/Makefile:
Added makefiles for build of client and server stubs. Server stub generation has post operation to modify
the stub for use with Twisted and correct NDG import.

Location:
TI12-security/trunk/python
Files:
2 added
2 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/AttAuthority/AttAuthority_services.py

    r2035 r2036  
    2929        # no ws-addressing 
    3030 
    31     # op: <ZSI.wstools.WSDLTools.Message instance at 0xb78ada0c> 
     31    # op: <ZSI.wstools.WSDLTools.Message instance at 0xb6cf396c> 
    3232    def getAttCert(self, userCert,userAttCert): 
    3333 
     
    4444        return attCert 
    4545 
    46     # op: <ZSI.wstools.WSDLTools.Message instance at 0xb78add4c> 
     46    # op: <ZSI.wstools.WSDLTools.Message instance at 0xb6cf3cac> 
    4747    def getHostInfo(self): 
    4848 
     
    5959        return hostname,aaURI,loginURI 
    6060 
    61     # op: <ZSI.wstools.WSDLTools.Message instance at 0xb78b474c> 
     61    # op: <ZSI.wstools.WSDLTools.Message instance at 0xb6cfa6ac> 
    6262    def getTrustedHostInfo(self, role): 
    6363 
     
    7272        return  
    7373 
    74     # op: <ZSI.wstools.WSDLTools.Message instance at 0xb78b48cc> 
     74    # op: <ZSI.wstools.WSDLTools.Message instance at 0xb6cfa82c> 
    7575    def getX509Cert(self): 
    7676 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/AttAuthority/AttAuthority_services_types.py

    r2035 r2036  
    1818    targetNamespace = "urn:ndg:security" 
    1919 
    20     class roleList_Dec(ZSI.TCcompound.ComplexType, ElementDeclaration): 
    21         literal = "roleList" 
    22         schema = "urn:ndg:security" 
    23         def __init__(self, **kw): 
    24             ns = ns0.roleList_Dec.schema 
     20    class RoleList_Dec(ZSI.TCcompound.ComplexType, ElementDeclaration): 
     21        literal = "RoleList" 
     22        schema = "urn:ndg:security" 
     23        def __init__(self, **kw): 
     24            ns = ns0.RoleList_Dec.schema 
    2525            TClist = [ZSI.TC.String(pname="localRole", aname="_localRole", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="remoteRole", aname="_remoteRole", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))] 
    26             kw["pname"] = ("urn:ndg:security","roleList") 
    27             kw["aname"] = "_roleList" 
     26            kw["pname"] = ("urn:ndg:security","RoleList") 
     27            kw["aname"] = "_RoleList" 
    2828            self.attribute_typecode_dict = {} 
    2929            ZSI.TCcompound.ComplexType.__init__(self,None,TClist,inorder=0,**kw) 
     
    3636                    self._remoteRole = None 
    3737                    return 
    38             Holder.__name__ = "roleList_Holder" 
    39             self.pyclass = Holder 
    40  
    41     class hostInfo_Dec(ZSI.TCcompound.ComplexType, ElementDeclaration): 
    42         literal = "hostInfo" 
    43         schema = "urn:ndg:security" 
    44         def __init__(self, **kw): 
    45             ns = ns0.hostInfo_Dec.schema 
    46             TClist = [ZSI.TC.String(pname="hostname", aname="_hostname", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="aaURI", aname="_aaURI", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="loginURI", aname="_loginURI", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("urn:ndg:security","roleList",lazy=False)(pname="roleList", aname="_roleList", minOccurs=1, maxOccurs="unbounded", nillable=False, typed=False, encoded=kw.get("encoded"))] 
    47             kw["pname"] = ("urn:ndg:security","hostInfo") 
    48             kw["aname"] = "_hostInfo" 
     38            Holder.__name__ = "RoleList_Holder" 
     39            self.pyclass = Holder 
     40 
     41    class HostInfo_Dec(ZSI.TCcompound.ComplexType, ElementDeclaration): 
     42        literal = "HostInfo" 
     43        schema = "urn:ndg:security" 
     44        def __init__(self, **kw): 
     45            ns = ns0.HostInfo_Dec.schema 
     46            TClist = [ZSI.TC.String(pname="hostname", aname="_hostname", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="aaURI", aname="_aaURI", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="loginURI", aname="_loginURI", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("urn:ndg:security","RoleList",lazy=False)(pname="roleList", aname="_roleList", minOccurs=1, maxOccurs="unbounded", nillable=False, typed=False, encoded=kw.get("encoded"))] 
     47            kw["pname"] = ("urn:ndg:security","HostInfo") 
     48            kw["aname"] = "_HostInfo" 
    4949            self.attribute_typecode_dict = {} 
    5050            ZSI.TCcompound.ComplexType.__init__(self,None,TClist,inorder=0,**kw) 
     
    5959                    self._roleList = [] 
    6060                    return 
    61             Holder.__name__ = "hostInfo_Holder" 
     61            Holder.__name__ = "HostInfo_Holder" 
    6262            self.pyclass = Holder 
    6363 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/AttAuthority/README

    r2017 r2036  
    44$ wsdl2py -be -f ../../../../../www/html/attAuthority.wsdl 
    55 
     6See Makefile 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/AttAuthority/AttAuthority_services_server.py

    r2035 r2036  
    55################################################## 
    66 
    7 from ndg.security.common.AttAuthority.AttAuthority_services import * 
     7from AttAuthority_services import * 
    88from ZSI.ServiceContainer import ServiceSOAPBinding 
    99 
     
    1717    <xsd:schema> 
    1818     
    19       <xsd:element name=\"roleList\"> 
     19      <xsd:element name=\"RoleList\"> 
    2020        <xsd:complexType> 
    2121          <xsd:sequence> 
     
    2626      </xsd:element> 
    2727    
    28       <xsd:element name=\"hostInfo\"> 
     28      <xsd:element name=\"HostInfo\"> 
    2929        <xsd:complexType> 
    3030              <xsd:sequence> 
     
    3232                <xsd:element maxOccurs=\"1\" minOccurs=\"1\" name=\"aaURI\" type=\"xsd:string\"/> 
    3333                <xsd:element maxOccurs=\"1\" minOccurs=\"1\" name=\"loginURI\" type=\"xsd:string\"/> 
    34                         <xsd:element maxOccurs=\"unbounded\" minOccurs=\"1\" name=\"roleList\" type=\"tns:roleList\"/> 
     34                        <xsd:element maxOccurs=\"unbounded\" minOccurs=\"1\" name=\"roleList\" type=\"tns:RoleList\"/> 
    3535              </xsd:sequence> 
    3636            </xsd:complexType> 
     
    7575        </xsd:complexType> 
    7676      </xsd:element> 
    77        
     77 
    7878      <xsd:element name=\"getTrustedHostInfoResponse\"> 
    79         <xsd:complexType/> 
     79        <xsd:complexType> 
     80          <xsd:element maxOccurs=\"unbounded\" minOccurs=\"0\" name=\"trustedHosts\" type=\"tns:HostInfo\"/> 
     81        </xsd:complexType> 
    8082      </xsd:element> 
    8183 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/AttAuthority/README

    r2017 r2036  
    33 
    44$ wsdl2dispatch -e -f ../../../../../www/html/attAuthority.wsdl 
     5 
     6See Makefile. 
    57 
    68AttAuthorityService soap_* methods modified to return request 
  • TI12-security/trunk/python/www/html/attAuthority.wsdl

    r2035 r2036  
    1414    <xsd:schema> 
    1515     
    16       <xsd:element name="roleList"> 
     16      <xsd:element name="RoleList"> 
    1717        <xsd:complexType> 
    1818          <xsd:sequence> 
     
    2323      </xsd:element> 
    2424    
    25       <xsd:element name="hostInfo"> 
     25      <xsd:element name="HostInfo"> 
    2626        <xsd:complexType> 
    2727              <xsd:sequence> 
     
    2929                <xsd:element name="aaURI" type="xsd:string" minOccurs="1" maxOccurs="1"/> 
    3030                <xsd:element name="loginURI" type="xsd:string" minOccurs="1" maxOccurs="1"/> 
    31                         <xsd:element name="roleList" type="tns:roleList" minOccurs="1" maxOccurs="unbounded"/> 
     31                        <xsd:element name="roleList" type="tns:RoleList" minOccurs="1" maxOccurs="unbounded"/> 
    3232              </xsd:sequence> 
    3333            </xsd:complexType> 
     
    7272        </xsd:complexType> 
    7373      </xsd:element> 
    74        
     74 
    7575      <xsd:element name="getTrustedHostInfoResponse"> 
    76         <xsd:complexType/> 
     76        <xsd:complexType> 
     77          <xsd:element name="trustedHosts" type="tns:HostInfo" minOccurs="0" maxOccurs="unbounded"/> 
     78        </xsd:complexType> 
    7779      </xsd:element> 
    7880 
Note: See TracChangeset for help on using the changeset viewer.