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

Added extra parameter 'siteName' to Attribute Authority map configuration to enable display of a more user friendly listing in the WAYF.

  • re-ran all attribute authority related unit tests
  • TODO: modify and test SSO client WAYF interface to use new param
Location:
TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi/attributeauthority
Files:
2 edited

Legend:

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

    r4521 r4713  
    2020        <xsd:sequence> 
    2121          <xsd:element maxOccurs=\"1\" minOccurs=\"1\" name=\"hostname\" type=\"xsd:string\"/> 
     22          <xsd:element maxOccurs=\"1\" minOccurs=\"0\" name=\"siteName\" type=\"xsd:string\"/> 
    2223          <xsd:element maxOccurs=\"1\" minOccurs=\"1\" name=\"aaURI\" type=\"xsd:string\"/> 
    2324          <xsd:element maxOccurs=\"1\" minOccurs=\"1\" name=\"aaDN\" type=\"xsd:string\"/> 
     
    5657          <xsd:sequence> 
    5758            <xsd:element maxOccurs=\"1\" minOccurs=\"1\" name=\"hostname\" type=\"xsd:string\"/> 
     59            <xsd:element maxOccurs=\"1\" minOccurs=\"0\" name=\"siteName\" type=\"xsd:string\"/> 
    5860            <xsd:element maxOccurs=\"1\" minOccurs=\"1\" name=\"aaURI\" type=\"xsd:string\"/> 
    5961            <xsd:element maxOccurs=\"1\" minOccurs=\"1\" name=\"aaDN\" type=\"xsd:string\"/> 
     
    244246        # If we have an implementation object, copy the result  
    245247        if hasattr(self,'impl'): 
    246             # Should have a tuple of 6 args 
     248            # Should have a tuple of 7 args 
    247249            result._hostname = parameters[0] 
    248             result._aaURI = parameters[1] 
    249             result._aaDN = parameters[2] 
    250             result._loginURI = parameters[3] 
    251             result._loginServerDN = parameters[4] 
    252             result._loginRequestServerDN = parameters[5] 
     250            result._siteName = parameters[1] 
     251            result._aaURI = parameters[2] 
     252            result._aaDN = parameters[3] 
     253            result._loginURI = parameters[4] 
     254            result._loginServerDN = parameters[5] 
     255            result._loginRequestServerDN = parameters[6] 
    253256        return result 
    254257 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi/attributeauthority/__init__.py

    r4680 r4713  
    117117         
    118118        response.Hostname = self.aa.hostInfo.keys()[0] 
     119        response.SiteName = self.aa.hostInfo[response.Hostname]['siteName'] 
    119120        response.AaURI = self.aa.hostInfo[response.Hostname]['aaURI'] 
    120121        response.AaDN = self.aa.hostInfo[response.Hostname]['aaDN'] 
     
    152153        hosts[0].Hostname = self.aa.hostInfo.keys()[0] 
    153154         
    154         hosts[0].AaURI = \ 
    155             self.aa.hostInfo[hosts[0].Hostname]['aaURI'] 
    156         hosts[0].AaDN = \ 
    157             self.aa.hostInfo[hosts[0].Hostname]['aaDN'] 
    158  
     155        hosts[0].AaURI = self.aa.hostInfo[hosts[0].Hostname]['aaURI'] 
     156        hosts[0].SiteName = self.aa.hostInfo[hosts[0].Hostname]['siteName'] 
     157        hosts[0].AaDN = self.aa.hostInfo[hosts[0].Hostname]['aaDN'] 
    159158        hosts[0].LoginURI = self.aa.hostInfo[hosts[0].Hostname]['loginURI'] 
    160159        hosts[0].LoginServerDN = \ 
     
    168167             
    169168            host.Hostname = hostname 
     169            host.SiteName = hostInfo['siteName'] 
    170170            host.AaURI = hostInfo['aaURI'] 
    171171            host.AaDN = hostInfo['aaDN'] 
     
    204204             
    205205            trustedHost.Hostname = hostname 
     206            trustedHost.SiteName = hostInfo['siteName'] 
    206207            trustedHost.AaURI = hostInfo['aaURI'] 
    207208            trustedHost.AaDN = hostInfo['aaDN'] 
Note: See TracChangeset for help on using the changeset viewer.