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

SessionMgr? -> SessionManager?

Location:
TI12-security/trunk/python/ndg.security.test/ndg/security/test
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/authnservice/__init__.py

    r4158 r4384  
    11""" 
    22Include authentication service directory into distribution - contains  
    3 various test implementations of the authentication service used by SessionMgr 
     3various test implementations of the authentication service used by SessionManager 
    44 
    55NERC Data Grid Project 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/authnservice/test_authnservice.py

    r4369 r4384  
    2222    """ 
    2323    A simple test proxy client with the methods stubbed out to allow 
    24     for use in testing SessionMgr 
     24    for use in testing SessionManager 
    2525    - NB, the stubbed out methods here are overkill in terms of the  
    2626    AbstractAuthNService interface - they are included to dummy out the MyProxy 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionmanager/test_sessionmanager.py

    r4382 r4384  
    3333 
    3434 
    35 class SessionMgrTestCase(unittest.TestCase): 
    36     """Unit test case for ndg.security.server.sessionmanager.SessionMgr class. 
     35class SessionManagerTestCase(unittest.TestCase): 
     36    """Unit test case for ndg.security.server.sessionmanager.SessionManager class. 
    3737     
    3838    This class manages server side sessions""" 
     
    5959        # Omit traceFile keyword to leave out SOAP debug info 
    6060        self.propFilePath = xpdVars(self.cfg.get('setUp', 'propFilePath')) 
    61         self.sm = SessionMgr(propFilePath=self.propFilePath) 
     61        self.sm = SessionManager(propFilePath=self.propFilePath) 
    6262 
    6363    def _sessionMgrConnect(self): 
     
    6565        print "Connecting to session manager..." 
    6666        username = self.cfg.get('test1Connect', 'username') 
    67         if SessionMgrTestCase.test1Passphrase is None and \ 
     67        if SessionManagerTestCase.test1Passphrase is None and \ 
    6868           self.cfg.has_option('test1Connect', 'passphrase'): 
    69             SessionMgrTestCase.test1Passphrase = self.cfg.get('test1Connect',  
     69            SessionManagerTestCase.test1Passphrase = self.cfg.get('test1Connect',  
    7070                                                              'passphrase') 
    7171         
    72         if not SessionMgrTestCase.test1Passphrase: 
    73             SessionMgrTestCase.test1Passphrase = getpass.getpass(\ 
     72        if not SessionManagerTestCase.test1Passphrase: 
     73            SessionManagerTestCase.test1Passphrase = getpass.getpass(\ 
    7474                prompt="\ntest1Connect pass-phrase for user %s: " % username) 
    7575 
     
    7777        userCert, self.userPriKey, self.issuingCert, self.sessID = \ 
    7878            self.sm.connect(username=username,  
    79                             passphrase=SessionMgrTestCase.test1Passphrase) 
     79                            passphrase=SessionManagerTestCase.test1Passphrase) 
    8080        self.userCert = X509CertParse(userCert) 
    8181         
     
    9292         
    9393        username = self.cfg.get('test1Connect', 'username') 
    94         if SessionMgrTestCase.test1Passphrase is None and \ 
     94        if SessionManagerTestCase.test1Passphrase is None and \ 
    9595           self.cfg.has_option('test1Connect', 'passphrase'): 
    96             SessionMgrTestCase.test1Passphrase = self.cfg.get('test1Connect',  
     96            SessionManagerTestCase.test1Passphrase = self.cfg.get('test1Connect',  
    9797                                                              'passphrase') 
    9898         
    99         if not SessionMgrTestCase.test1Passphrase: 
    100             SessionMgrTestCase.test1Passphrase = getpass.getpass( 
     99        if not SessionManagerTestCase.test1Passphrase: 
     100            SessionManagerTestCase.test1Passphrase = getpass.getpass( 
    101101                prompt="\ntest1Connect pass-phrase for user %s: " % username) 
    102102 
     
    104104        userCert, userPriKey, issuingCert, sessID = self.sm.connect( 
    105105                            username=username,  
    106                             passphrase=SessionMgrTestCase.test1Passphrase) 
     106                            passphrase=SessionManagerTestCase.test1Passphrase) 
    107107        assert(userCert is None) 
    108108        assert(userPriKey is None) 
     
    115115         
    116116        username = self.cfg.get('test1Connect', 'username') 
    117         if SessionMgrTestCase.test1Passphrase is None and \ 
     117        if SessionManagerTestCase.test1Passphrase is None and \ 
    118118           self.cfg.has_option('test1Connect', 'passphrase'): 
    119             SessionMgrTestCase.test1Passphrase = self.cfg.get('test1Connect',  
     119            SessionManagerTestCase.test1Passphrase = self.cfg.get('test1Connect',  
    120120                                                              'passphrase') 
    121121         
    122         if not SessionMgrTestCase.test1Passphrase: 
    123             SessionMgrTestCase.test1Passphrase = getpass.getpass( 
     122        if not SessionManagerTestCase.test1Passphrase: 
     123            SessionManagerTestCase.test1Passphrase = getpass.getpass( 
    124124                prompt="\ntest1Connect pass-phrase for user %s: " % username) 
    125125 
     
    127127        userCert, self.userPriKey, self.issuingCert, self.sessID = \ 
    128128            self.sm.connect(username=username,  
    129                             passphrase=SessionMgrTestCase.test1Passphrase) 
     129                            passphrase=SessionManagerTestCase.test1Passphrase) 
    130130        self.userCert = X509CertParse(userCert) 
    131131         
     
    156156        username = self.cfg.get(section, 'username') 
    157157 
    158         if SessionMgrTestCase.test3Passphrase is None and \ 
     158        if SessionManagerTestCase.test3Passphrase is None and \ 
    159159           self.cfg.has_option(section, passphrase): 
    160             SessionMgrTestCase.test3Passphrase = self.cfg.get(section,  
     160            SessionManagerTestCase.test3Passphrase = self.cfg.get(section,  
    161161                                                              'passphrase') 
    162162         
    163         if not SessionMgrTestCase.test3Passphrase: 
    164             SessionMgrTestCase.test3Passphrase = getpass.getpass(prompt=\ 
     163        if not SessionManagerTestCase.test3Passphrase: 
     164            SessionManagerTestCase.test3Passphrase = getpass.getpass(prompt=\ 
    165165                                            "\ntest3ConnectNoCreateServerSess " 
    166166                                            "pass-phrase for user %s: " %  
     
    169169        self.userCert, self.userPriKey, self.issuingCert, sessID = \ 
    170170            self.sm.connect(username=username,  
    171                             passphrase=SessionMgrTestCase.test3Passphrase, 
     171                            passphrase=SessionManagerTestCase.test3Passphrase, 
    172172                            createServerSess=False) 
    173173         
     
    302302 
    303303#_____________________________________________________________________________        
    304 class SessionMgrTestSuite(unittest.TestSuite): 
     304class SessionManagerTestSuite(unittest.TestSuite): 
    305305     
    306306    def __init__(self): 
    307         print "SessionMgrTestSuite ..." 
    308         smTestCaseMap = map(SessionMgrTestCase, 
     307        print "SessionManagerTestSuite ..." 
     308        smTestCaseMap = map(SessionManagerTestCase, 
    309309                          ( 
    310310                            "test1Connect", 
     
    322322                                                     
    323323if __name__ == "__main__": 
    324 #    suite = SessionMgrTestSuite() 
     324#    suite = SessionManagerTestSuite() 
    325325#    unittest.TextTestRunner(verbosity=2).run(suite) 
    326326    unittest.main()         
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionmgrclient/SessionMgrClientTest.py

    r4129 r4384  
    1919from ConfigParser import SafeConfigParser 
    2020 
    21 from ndg.security.common.SessionMgr import SessionMgrClient, \ 
     21from ndg.security.common.sessionmanager import SessionManagerClient, \ 
    2222    AttributeRequestDenied 
    2323     
     
    3030 
    3131 
    32 class SessionMgrClientTestCase(unittest.TestCase): 
     32class SessionManagerClientTestCase(unittest.TestCase): 
    3333    pemPat = "-----BEGIN CERTIFICATE-----[^\-]*-----END CERTIFICATE-----" 
    3434         
     
    126126        # Initialise the Session Manager client connection 
    127127        # Omit traceFile keyword to leave out SOAP debug info 
    128         self.clnt = SessionMgrClient(uri=self.cfg['setUp']['smuri'], 
     128        self.clnt = SessionManagerClient(uri=self.cfg['setUp']['smuri'], 
    129129                        sslCACertList=sslCACertList, 
    130130                        sslPeerCertCN=self.cfg['setUp'].get('sslpeercertcn'), 
     
    365365             
    366366#_____________________________________________________________________________        
    367 class SessionMgrClientTestSuite(unittest.TestSuite): 
     367class SessionManagerClientTestSuite(unittest.TestSuite): 
    368368     
    369369    def __init__(self): 
    370         map = map(SessionMgrClientTestCase, 
     370        map = map(SessionManagerClientTestCase, 
    371371                  ( 
    372372                    "test1Connect", 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/utils/testConfigFileParsers.py

    r4377 r4384  
    88from ndg.security.common.utils.ConfigFileParsers import readProperties, readAndValidateProperties 
    99from ndg.security.server.attributeauthority import AttributeAuthority 
    10 from ndg.security.server.sessionmanager import SessionMgr 
     10from ndg.security.server.sessionmanager import SessionManager 
    1111from ConfigParser import MissingSectionHeaderError 
    1212 
     
    110110         
    111111 
    112     def testSessionMgrINIInput(self): 
     112    def testSessionManagerINIInput(self): 
    113113         
    114         cfg = readProperties(self.SESSION_MGR_INI_FILE, validKeys=SessionMgr._SessionMgr__validElem) 
     114        cfg = readProperties(self.SESSION_MGR_INI_FILE, validKeys=SessionManager._SessionManager__validElem) 
    115115        # do some basic checks of what is returned 
    116116        self.assertNotEqual(cfg, None) 
     
    122122 
    123123 
    124     def testSessionMgrXMLInput(self): 
     124    def testSessionManagerXMLInput(self): 
    125125         
    126         cfg = readProperties(self.SESSION_MGR_XML_FILE, validKeys=SessionMgr._SessionMgr__validElem) 
     126        cfg = readProperties(self.SESSION_MGR_XML_FILE, validKeys=SessionManager._SessionManager__validElem) 
    127127        # do some basic checks of what is returned 
    128128        self.assertNotEqual(cfg, None) 
Note: See TracChangeset for help on using the changeset viewer.