Ignore:
Timestamp:
29/10/08 11:49:44 (12 years ago)
Author:
pjkersha
Message:

Rerun Credential Wallet and AA client unittests with refactored WSDL stubs in place.

Location:
TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi/attributeauthority/__init__.py

    r4377 r4392  
    1616log = logging.getLogger(__name__) 
    1717 
    18 from ndg.security.common.zsi.attributeauthority.AttAuthority_services import \ 
     18from ndg.security.common.zsi.attributeauthority.AttributeAuthority_services import \ 
    1919    getAttCertInputMsg, getAttCertOutputMsg, \ 
    2020    getHostInfoInputMsg, getHostInfoOutputMsg, \ 
     
    2323    getX509CertInputMsg, getX509CertOutputMsg 
    2424     
    25 from ndg.security.server.zsi.attributeauthority.AttAuthority_services_server \ 
    26     import AttAuthorityService as _AttAuthorityService 
     25from ndg.security.server.zsi.attributeauthority.AttributeAuthority_services_server \ 
     26    import AttributeAuthorityService as _AttributeAuthorityService 
    2727 
    2828from ndg.security.server.attributeauthority import AttributeAuthority, \ 
     
    3333 
    3434 
    35 class AttributeAuthorityWS(_AttAuthorityService): 
     35class AttributeAuthorityWS(_AttributeAuthorityService): 
    3636    '''Attribute Authority ZSI SOAP Service Binding class''' 
    3737 
     
    5555        @type ps: ZSI ParsedSoap 
    5656        @param ps: client SOAP message 
    57         @rtype: ndg.security.common.zsi.attributeauthority.AttAuthority_services_types.getAttCertResponse_Holder 
     57        @rtype: ndg.security.common.zsi.attributeauthority.AttributeAuthority_services_types.getAttCertResponse_Holder 
    5858        @return: response''' 
    5959        if self.__debug: 
     
    6262         
    6363        request = ps.Parse(getAttCertInputMsg.typecode)     
    64         response = _AttAuthorityService.soap_getAttCert(self, ps) 
     64        response = _AttributeAuthorityService.soap_getAttCert(self, ps) 
    6565 
    6666        # Derive designated holder cert differently according to whether 
     
    102102            pdb.set_trace() 
    103103             
    104         response = _AttAuthorityService.soap_getHostInfo(self, ps) 
     104        response = _AttributeAuthorityService.soap_getHostInfo(self, ps) 
    105105         
    106106        response.Hostname = self.aa.hostInfo.keys()[0] 
     
    127127            pdb.set_trace() 
    128128             
    129         response = _AttAuthorityService.soap_getAllHostsInfo(self, ps) 
     129        response = _AttributeAuthorityService.soap_getAllHostsInfo(self, ps) 
    130130         
    131131 
     
    182182             
    183183        request = ps.Parse(getTrustedHostInfoInputMsg.typecode)     
    184         response = _AttAuthorityService.soap_getTrustedHostInfo(self, ps) 
     184        response = _AttributeAuthorityService.soap_getTrustedHostInfo(self, ps) 
    185185         
    186186        trustedHostInfo = self.aa.getTrustedHostInfo(role=request.Role) 
     
    217217            pdb.set_trace() 
    218218             
    219         response = _AttAuthorityService.soap_getX509Cert(self, ps) 
     219        response = _AttributeAuthorityService.soap_getX509Cert(self, ps) 
    220220         
    221221        x509Cert = X509CertRead(self.aa['signingCertFilePath']) 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi/twisted/attributeauthority/attAuthority.tac

    r4377 r4392  
    3737 
    3838from \ 
    39 ndg.security.server.zsi.twisted.attributeauthority.AttAuthority_services_server\ 
    40         import AttAuthorityService 
     39ndg.security.server.zsi.twisted.attributeauthority.SessionManager_services_server\ 
     40        import SessionManagerService 
    4141 
    4242from ndg.security.server.attributeauthority import AttributeAuthority, \ 
     
    8282                pdb.set_trace() 
    8383                 
    84         request, response = AttAuthorityService.soap_getAttCert(self, ps) 
     84        request, response = SessionManagerService.soap_getAttCert(self, ps) 
    8585 
    8686        # Derive designated holder cert differently according to whether 
     
    119119                pdb.set_trace() 
    120120                 
    121         request, response = AttAuthorityService.soap_getHostInfo(self, ps) 
     121        request, response = SessionManagerService.soap_getHostInfo(self, ps) 
    122122         
    123123        response.Hostname = srv.aa.hostInfo.keys()[0] 
     
    144144                pdb.set_trace() 
    145145                 
    146         request, response = AttAuthorityService.soap_getAllHostsInfo(self, ps) 
     146        request, response = SessionManagerService.soap_getAllHostsInfo(self, ps) 
    147147         
    148148 
     
    199199                 
    200200        request, response = \ 
    201                         AttAuthorityService.soap_getTrustedHostInfo(self, ps) 
     201                        SessionManagerService.soap_getTrustedHostInfo(self, ps) 
    202202         
    203203        trustedHostInfo = srv.aa.getTrustedHostInfo(role=request.Role) 
     
    234234                pdb.set_trace() 
    235235                 
    236         request, response = AttAuthorityService.soap_getX509Cert(self, ps) 
     236        request, response = AttributeAuthorityService.soap_getX509Cert(self, ps) 
    237237         
    238238        x509Cert = X509CertRead(srv.aa['signingCertFilePath']) 
Note: See TracChangeset for help on using the changeset viewer.