Ignore:
Timestamp:
25/01/07 11:23:41 (13 years ago)
Author:
pjkersha
Message:
  • Working Attribute Authority unit tests *

python/ndg.security.server/ndg/security/server/AttAuthority/server-config.tac:

  • removed debug statements
  • getTrustedHostInfo: added code to make HostInfo? types and carry out serialization.

python/www/html/attAuthority.wsdl,
python/ndg.security.server/ndg/security/server/AttAuthority/AttAuthority_services_serv
er.py,
python/ndg.security.common/ndg/security/common/AttAuthority/AttAuthority_services_types.py,
python/ndg.security.common/ndg/security/common/AttAuthority/AttAuthority_services.py:
fix to WSDL: give name attribute to HostInfo? ComplexType?. No need to declare element.

python/ndg.security.server/ndg/security/server/AttAuthority/init.py:

AttAuthorityNoMatchingRoleInTrustedHosts? for handling getTrustedHostInfo errors.

  • changed usr -> user

python/ndg.security.server/ndg/security/server/AttAuthority/Makefile: make substitution
text macros

python/conf/attAuthorityProperties.xml,
python/ndg.security.test/ndg/security/test/AttAuthority/siteAAttAuthorityProperties.xml,
python/ndg.security.test/ndg/security/test/AttAuthority/siteBAttAuthorityProperties.xml,
python/ndg.security.test/ndg/security/test/AttAuthority/siteAUserRoles.py,
python/ndg.security.test/ndg/security/test/AttAuthority/siteBUserRoles.py:
changed usr -> user

python/ndg.security.test/ndg/security/test/AttAuthority/AttAuthorityClientTest.py:

  • fixed bugs in test method names
  • get host info and get trusted host info now correctly print output.

python/ndg.security.test/ndg/security/test/AttAuthority/siteAMapConfig.xml:
added trusted host info to allow testing with getTrustedHostInfo.

python/ndg.security.test/ndg/security/test/AttAuthority/attAuthorityClientTest.cfg:
fix to test3GetTrustedHostInfo method name tag

python/ndg.security.common/ndg/security/common/AttAuthority/init.py: AA client code
Fixed set up of dictionary output from returned ZSI types.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/www/html/attAuthority.wsdl

    r2044 r2051  
    1111 
    1212  <wsdl:types> 
    13     <xsd:schema targetNamespace="urn:ndg:security"> 
     13    <xsd:schema> 
    1414     
    15       <xsd:element name="RoleList"> 
    16         <xsd:complexType> 
    17           <xsd:sequence> 
    18             <xsd:element name="localRole" type="xsd:string" minOccurs="1" maxOccurs="1"/> 
    19             <xsd:element name="remoteRole" type="xsd:string" minOccurs="1" maxOccurs="1"/> 
    20           </xsd:sequence> 
    21         </xsd:complexType> 
    22       </xsd:element> 
    23     
    24       <xsd:element name="HostInfo"> 
    25         <xsd:complexType> 
    26           <xsd:sequence> 
    27             <xsd:element name="hostname" type="xsd:string" minOccurs="1" maxOccurs="1"/> 
    28             <xsd:element name="aaURI" type="xsd:string" minOccurs="1" maxOccurs="1"/> 
    29             <xsd:element name="loginURI" type="xsd:string" minOccurs="1" maxOccurs="1"/> 
    30             <xsd:element name="roleList" type="tns:RoleList" minOccurs="1" maxOccurs="unbounded"/> 
    31           </xsd:sequence> 
    32         </xsd:complexType> 
    33       </xsd:element> 
     15      <xsd:complexType name="HostInfo"> 
     16        <xsd:sequence> 
     17          <xsd:element name="hostname" type="xsd:string" minOccurs="1" maxOccurs="1"/> 
     18          <xsd:element name="aaURI" type="xsd:string" minOccurs="1" maxOccurs="1"/> 
     19          <xsd:element name="loginURI" type="xsd:string" minOccurs="1" maxOccurs="1"/> 
     20          <xsd:element name="roleList" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> 
     21        </xsd:sequence> 
     22      </xsd:complexType> 
    3423       
    3524      <xsd:element name="getAttCert"> 
     
    7362 
    7463      <xsd:element name="getTrustedHostInfoResponse"> 
    75         <xsd:complexType/> 
    76 <!--     
    7764        <xsd:complexType> 
    7865          <xsd:sequence> 
     
    8067          </xsd:sequence> 
    8168        </xsd:complexType> 
    82 --> 
    8369      </xsd:element> 
    8470 
Note: See TracChangeset for help on using the changeset viewer.