diff --git a/src/python/dm/common/api/dmRestApi.py b/src/python/dm/common/api/dmRestApi.py index 0c8e18c67fc7dcd9d7b66432dbf019294b4fc6ed..aa0cbc4ee5d10cf47ab45a29152299db537b21f1 100755 --- a/src/python/dm/common/api/dmRestApi.py +++ b/src/python/dm/common/api/dmRestApi.py @@ -15,13 +15,6 @@ class DmRestApi(DmApi): def __init__(self, username=None, password=None, host=None, port=None, protocol=None): DmApi.__init__(self) self.configurationManager = ConfigurationManager.getInstance() - if username == None and password == None: - username = self.configurationManager.getServiceUsername() - password = self.configurationManager.getServicePassword() - if host == None: - host = self.configurationManager.getServiceHost() - if port == None: - port = self.configurationManager.getServicePort() if protocol == None: protocol = self.configurationManager.getServiceProtocol() self.username = username @@ -94,10 +87,10 @@ class DmRestApi(DmApi): """ Send authorized session request. """ sm = self.getSessionManager() if not sm.hasSession(): - if self.username == None: - raise AuthorizationError('Username not supplied.') - if self.password == None: - raise AuthorizationError('Password not supplied.') + #if self.username == None: + # raise AuthorizationError('Username not supplied.') + #if self.password == None: + # raise AuthorizationError('Password not supplied.') wsUrl = self.__getWebServiceUrl(url) # establishSession() sets the 'wsUrl' so the explicit call # to setHost() is not required