Skip to content
Snippets Groups Projects
Commit 49959191 authored by sveseli's avatar sveseli
Browse files

fix service host/port issue for base cli class

parent 27aacb57
No related branches found
No related tags found
No related merge requests found
...@@ -32,8 +32,6 @@ class DmCli(object): ...@@ -32,8 +32,6 @@ class DmCli(object):
self.options = {} self.options = {}
self.args = [] self.args = []
self.validArgCount = validArgCount self.validArgCount = validArgCount
self.serviceHost = None
self.servicePort = None
self.optionGroupDict = {} self.optionGroupDict = {}
commonGroup = 'Common Options' commonGroup = 'Common Options'
...@@ -121,27 +119,9 @@ class DmCli(object): ...@@ -121,27 +119,9 @@ class DmCli(object):
if consoleLogLevel: if consoleLogLevel:
LoggingManager.getInstance().setConsoleLogLevel(consoleLogLevel) LoggingManager.getInstance().setConsoleLogLevel(consoleLogLevel)
# Service host, port, etc.
configManager = ConfigurationManager.getInstance()
self.serviceHost = self.options.serviceHost
configManager.setServiceHost(self.serviceHost)
self.servicePort = self.options.servicePort
configManager.setServicePort(self.servicePort)
self.serviceProtocol = self.options.serviceProtocol
configManager.setServiceProtocol(self.serviceProtocol)
# SSL options, comment out for now
#self.sslCaCertFile = self.options.sslCaCertFile
#if self.sslCaCertFile:
# configManager.setSslCaCertFile(self.sslCaCertFile)
#self.sslCertFile = self.options.sslCertFile
#if self.sslCertFile:
# configManager.setSslCertFile(self.sslCertFile)
#self.sslKeyFile = self.options.sslKeyFile
#if self.sslKeyFile:
# configManager.setSslKeyFile(self._sslKeyFile)
# Check session cache. # Check session cache.
configManager = ConfigurationManager.getInstance()
try: try:
self.checkSessionCache() self.checkSessionCache()
except Exception, ex: except Exception, ex:
......
...@@ -8,6 +8,8 @@ class DmRestCli(DmCli): ...@@ -8,6 +8,8 @@ class DmRestCli(DmCli):
def __init__(self, validArgCount=0): def __init__(self, validArgCount=0):
DmCli.__init__(self, validArgCount) DmCli.__init__(self, validArgCount)
self.serviceHost = None
self.servicePort = None
serviceGroup = 'Service Options' serviceGroup = 'Service Options'
self.addOptionGroup(serviceGroup, None) self.addOptionGroup(serviceGroup, None)
...@@ -30,3 +32,24 @@ class DmRestCli(DmCli): ...@@ -30,3 +32,24 @@ class DmRestCli(DmCli):
def getDefaultServiceProtocol(self): def getDefaultServiceProtocol(self):
return ConfigurationManager.getInstance().getWebServiceProtocol() return ConfigurationManager.getInstance().getWebServiceProtocol()
def parseArgs(self, usage=None):
DmCli.parseArgs(self, usage)
configManager = ConfigurationManager.getInstance()
self.serviceHost = self.options.serviceHost
configManager.setServiceHost(self.serviceHost)
self.servicePort = self.options.servicePort
configManager.setServicePort(self.servicePort)
self.serviceProtocol = self.options.serviceProtocol
configManager.setServiceProtocol(self.serviceProtocol)
# SSL options, comment out for now
#self.sslCaCertFile = self.options.sslCaCertFile
#if self.sslCaCertFile:
# configManager.setSslCaCertFile(self.sslCaCertFile)
#self.sslCertFile = self.options.sslCertFile
#if self.sslCertFile:
# configManager.setSslCertFile(self.sslCertFile)
#self.sslKeyFile = self.options.sslKeyFile
#if self.sslKeyFile:
# configManager.setSslKeyFile(self._sslKeyFile)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment