diff --git a/src/python/dm/common/cli/dmRestCli.py b/src/python/dm/common/cli/dmRestCli.py index 0107fdac4d5bd9bf97fb7b013f57141689f97506..1bdbfb227ebb5b272d5824c8f2b2cf340c72ca73 100755 --- a/src/python/dm/common/cli/dmRestCli.py +++ b/src/python/dm/common/cli/dmRestCli.py @@ -1,6 +1,7 @@ #!/usr/bin/env python from dm.common.cli.dmCli import DmCli +from dm.common.utility.configurationManager import ConfigurationManager class DmRestCli(DmCli): """ Base dm REST cli class. """ @@ -8,3 +9,6 @@ class DmRestCli(DmCli): def __init__(self, validArgCount=0): DmCli.__init__(self, validArgCount) + def getDefaultServiceProtocol(self): + return ConfigurationManager.getInstance().getWebServiceProtocol() + diff --git a/src/python/dm/common/utility/configurationManager.py b/src/python/dm/common/utility/configurationManager.py index 156b73afc3b686c9440bbb85698e44b7d700375c..96819e84eab0c02c803392e18c3ea198c3c4f2d4 100755 --- a/src/python/dm/common/utility/configurationManager.py +++ b/src/python/dm/common/utility/configurationManager.py @@ -40,6 +40,7 @@ DEFAULT_DM_SERVICE_PORT = 22236 # 222DM DEFAULT_DM_SERVICE_HOST = '0.0.0.0' DEFAULT_DM_SERVICE_PROTOCOL = dmServiceConstants.DM_SERVICE_PROTOCOL_HTTP +DEFAULT_DM_WEB_SERVICE_PROTOCOL = DEFAULT_DM_SERVICE_PROTOCOL DEFAULT_DM_DS_WEB_SERVICE_PORT = 22236 # 222DM DEFAULT_DM_DS_WEB_SERVICE_HOST = '127.0.0.1' DEFAULT_DM_DAQ_WEB_SERVICE_PORT = 33336 # 333DM @@ -125,6 +126,7 @@ class ConfigurationManager(UserDict.UserDict): self['defaultServiceHost'] = DEFAULT_DM_SERVICE_HOST self['defaultServiceProtocol'] = DEFAULT_DM_SERVICE_PROTOCOL + self['defaultWebServiceProtocol'] = DEFAULT_DM_WEB_SERVICE_PROTOCOL self['defaultDaqWebServicePort'] = DEFAULT_DM_DAQ_WEB_SERVICE_PORT self['defaultDaqWebServiceHost'] = DEFAULT_DM_DAQ_WEB_SERVICE_HOST self['defaultDsWebServicePort'] = DEFAULT_DM_DS_WEB_SERVICE_PORT @@ -158,6 +160,7 @@ class ConfigurationManager(UserDict.UserDict): self.__setFromEnvVar('servicePort', 'DM_SERVICE_PORT') self.__setFromEnvVar('serviceProtocol', 'DM_SERVICE_PROTOCOL') + self.__setFromEnvVar('webServiceProtocol', 'DM_WEB_SERVICE_PROTOCOL') self.__setFromEnvVar('daqWebServiceHost', 'DM_DAQ_WEB_SERVICE_HOST') self.__setFromEnvVar('daqWebServicePort', 'DM_DAQ_WEB_SERVICE_PORT') self.__setFromEnvVar('dsWebServiceHost', 'DM_DS_WEB_SERVICE_HOST') @@ -513,6 +516,18 @@ class ConfigurationManager(UserDict.UserDict): def hasServiceHost(self): return self.has_key('serviceHost') + def getDefaultWebServiceProtocol(self): + return self['defaultWebServiceProtocol'] + + def setWebServiceProtocol(self, webServiceProtocol): + self['webServiceProtocol'] = webServiceProtocol + + def getWebServiceProtocol(self, default='__dm_default__'): + return self.__getKeyValue('webServiceProtocol', default) + + def hasWebServiceProtocol(self): + return self.has_key('webServiceProtocol') + def getDefaultDaqWebServicePort(self): return self['defaultDaqWebServicePort']