apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-5449: fixed pep8 errors

Browse Source 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
This commit is contained in:
SrikanteswaraRao Talluri 2013-12-12 17:06:31 +05:30
parent ca1e10398d
commit 8374ff591d
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/marvin/marvin/marvinInit.py
View File

@ -118,7 +118,8 @@ class MarvinInit:
log_config = self.__parsedConfig.logger log_config = self.__parsedConfig.logger
if log_config is not None: if log_config is not None:
if log_config.LogFolderPath is not None: if log_config.LogFolderPath is not None:
self.logFolderPath = log_config.LogFolderPath + '/' + temp_path self.logFolderPath = log_config.LogFolderPath + '/' \
+ temp_path
else: else:
self.logFolderPath = temp_path self.logFolderPath = temp_path
else: else:
@ -126,8 +127,9 @@ class MarvinInit:
else: else:
self.logFolderPath = self.__logFolderPath + '/' + temp_path self.logFolderPath = self.__logFolderPath + '/' + temp_path
if os.path.exists(self.logFolderPath): if os.path.exists(self.logFolderPath):
self.logFolderPath = self.logFolderPath \ self.logFolderPath += ''.join(random.choice(
+ ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(3)) string.ascii_uppercase +
string.digits for x in range(3)))
os.makedirs(self.logFolderPath) os.makedirs(self.logFolderPath)
''' '''
Log File Paths Log File Paths

21
tools/marvin/marvin/marvinPlugin.py
View File

@ -80,17 +80,22 @@ class MarvinPlugin(Plugin):
Register command line options Register command line options
""" """
parser.add_option("--marvin-config", action="store", parser.add_option("--marvin-config", action="store",
default=env.get('MARVIN_CONFIG', './datacenter.cfg'), default=env.get('MARVIN_CONFIG',
'./datacenter.cfg'),
dest="config_file", dest="config_file",
help="Marvin's configuration file where the " + help="Marvin's configuration file where the " +
"datacenter information is specified " + "datacenter information is specified" +
"[MARVIN_CONFIG]") " [MARVIN_CONFIG]")
parser.add_option("--load", action="store_true", default=False, parser.add_option("--load", action="store_true",
default=False,
dest="load", dest="load",
help="Only load the deployment configuration given") help="Only load the deployment configuration given")
parser.add_option("--log-folder-path", action="store", default=None, parser.add_option("--log-folder-path",
action="store",
default=None,
dest="log_folder_path", dest="log_folder_path",
help="Path to the folder where log files will be stored") help="Path to the folder "
"where log files will be stored")
Plugin.options(self, parser, env) Plugin.options(self, parser, env)
def wantClass(self, cls): def wantClass(self, cls):
@ -169,7 +174,9 @@ class MarvinPlugin(Plugin):
Creates a debugstream for tc debug log Creates a debugstream for tc debug log
''' '''
try: try:
obj_marvininit = MarvinInit(self.configFile, self.loadFlag, self.logFolderPath) obj_marvininit = MarvinInit(self.configFile,
self.loadFlag,
self.logFolderPath)
if obj_marvininit.init() == SUCCESS: if obj_marvininit.init() == SUCCESS:
self.testClient = obj_marvininit.getTestClient() self.testClient = obj_marvininit.getTestClient()
self.tcRunLogger = obj_marvininit.getLogger() self.tcRunLogger = obj_marvininit.getLogger()