Skip to content

Commit ef9e2a9

Browse files
Santhosh EdukullaSrikanteswaraRao Talluri
Santhosh Edukulla
authored and
SrikanteswaraRao Talluri
committed
Fixed issues in CLOUDSTACK-6489
Fixed issues for CLOUDSTACK-6489 Along with fixed few indent issues. Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com> Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
1 parent d1658c4 commit ef9e2a9

7 files changed

Lines changed: 66 additions & 42 deletions

File tree

‎test/integration/smoke/test_deploy_vm.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434

3535
from nose.plugins.attrib import attr
3636

37-
"virtual_machine3" : {
38-
"name" : "testvm3",
39-
"displayname" : "Test VM3",
40-
},
4137
class TestDeployVM(cloudstackTestCase):
4238
"""Test deploy a VM into a user account
4339
"""

‎test/integration/smoke/test_disk_offerings.py‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,6 @@
2727

2828
_multiprocess_shared_ = True
2929

30-
"sparse": {
31-
"name": "Sparse Type Disk offering",
32-
"displaytext": "Sparse Type Disk offering",
33-
"disksize": 1, # in GB
34-
"provisioningtype" : "sparse"
35-
},
36-
"fat": {
37-
"name": "Fat Type Disk offering",
38-
"displaytext": "Fat Type Disk offering",
39-
"disksize": 1, # in GB
40-
"provisioningtype" : "fat"
41-
}
4230
class TestCreateDiskOffering(cloudstackTestCase):
4331

4432
def setUp(self):

‎test/integration/smoke/test_volumes.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@
3535

3636
_multiprocess_shared_ = True
3737

38-
"sparse_disk_offering": {
39-
"displaytext": "Sparse",
40-
"name": "Sparse",
41-
"provisioningtype": "sparse",
42-
"disksize": 1
43-
},
4438
class TestCreateVolume(cloudstackTestCase):
4539

4640
@classmethod

‎tools/marvin/marvin/config/test_data.py‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,10 @@
205205
"name": "testvm2",
206206
"displayname": "Test VM2",
207207
},
208+
"virtual_machine3": {
209+
"name": "testvm3",
210+
"displayname": "Test VM3",
211+
},
208212
"server_without_disk": {
209213
"displayname": "Test VM-No Disk",
210214
"username": "root",
@@ -586,5 +590,25 @@
586590
"startip": "10.223.252.196",
587591
"endip": "10.223.252.197",
588592
"vlan": "1001"
593+
},
594+
"sparse": {
595+
"name": "Sparse Type Disk offering",
596+
"displaytext":
597+
"Sparse Type Disk offering",
598+
"disksize": 1, # in GB
599+
"provisioningtype": "sparse"
600+
},
601+
"fat": {
602+
"name": "Fat Type Disk offering",
603+
"displaytext":
604+
"Fat Type Disk offering",
605+
"disksize": 1, # in GB
606+
"provisioningtype": "fat"
607+
},
608+
"sparse_disk_offering": {
609+
"displaytext": "Sparse",
610+
"name": "Sparse",
611+
"provisioningtype": "sparse",
612+
"disksize": 1
589613
}
590614
}

‎tools/marvin/marvin/marvinInit.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ def __init__(self, config_file,
4343
deploy_dc_flag=None,
4444
test_mod_name="deploydc",
4545
zone=None,
46-
hypervisor_type=None):
46+
hypervisor_type=None,
47+
user_logfolder_path=None):
4748
self.__configFile = config_file
4849
self.__deployFlag = deploy_dc_flag
4950
self.__logFolderPath = None
@@ -55,6 +56,7 @@ def __init__(self, config_file,
5556
self.__zoneForTests = zone
5657
self.__parsedConfig = None
5758
self.__hypervisorType = hypervisor_type
59+
self.__userLogFolderPath = user_logfolder_path
5860

5961
def __parseConfig(self):
6062
'''
@@ -162,7 +164,8 @@ def __initLogging(self):
162164
if log_obj:
163165
ret = log_obj.\
164166
createLogs(self.__testModName,
165-
self.__parsedConfig.logger)
167+
self.__parsedConfig.logger,
168+
self.__userLogFolderPath)
166169
if ret != FAILED:
167170
self.__logFolderPath = log_obj.getLogFolderPath()
168171
self.__tcRunLogger = log_obj.getLogger()

‎tools/marvin/marvin/marvinLog.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,19 @@ def getLogFolderPath(self):
127127

128128
def createLogs(self,
129129
test_module_name=None,
130-
log_cfg=None):
130+
log_cfg=None,
131+
user_provided_logpath=None):
131132
'''
132133
@Name : createLogs
133134
@Desc : Gets the Logger with file paths initialized and created
134135
@Inputs :test_module_name: Test Module Name to use for logs while
135136
creating log folder path
136137
log_cfg: Log Configuration provided inside of
137138
Configuration
139+
user_provided_logpath:LogPath provided by user
140+
If user provided log path
141+
is available, then one in cfg
142+
will not be picked up.
138143
@Output : SUCCESS\FAILED
139144
'''
140145
try:
@@ -146,8 +151,9 @@ def createLogs(self,
146151
temp_path = str(test_module_name) + \
147152
"__" + str(temp_ts) + "_" + random_gen()
148153

149-
temp_dir = "MarvinLogs"
150-
if ((log_cfg is not None) and
154+
if user_provided_logpath:
155+
temp_dir = user_provided_logpath
156+
elif ((log_cfg is not None) and
151157
('LogFolderPath' in log_cfg.__dict__.keys()) and
152158
(log_cfg.__dict__.get('LogFolderPath') is not None)):
153159
temp_dir = \

‎tools/marvin/marvin/marvinPlugin.py‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ def __init__(self):
6464
self.__tcRunLogger = None
6565
self.__testModName = ''
6666
self.__hypervisorType = None
67+
'''
68+
The Log Path provided by user where all logs are routed to
69+
'''
70+
self.__userLogPath = None
6771
Plugin.__init__(self)
6872

6973
def configure(self, options, conf):
@@ -81,6 +85,7 @@ def configure(self, options, conf):
8185
self.__deployDcFlag = options.deployDc
8286
self.__zoneForTests = options.zone
8387
self.__hypervisorType = options.hypervisor_type
88+
self.__userLogPath = options.logFolder
8489
self.conf = conf
8590
if self.startMarvin() == FAILED:
8691
print "\nStarting Marvin Failed, exiting. Please Check"
@@ -112,6 +117,12 @@ def options(self, parser, env):
112117
dest="hypervisor_type",
113118
help="Runs all tests against the specified "
114119
"zone and hypervisor Type")
120+
parser.add_option("--log-folder-path", action="store",
121+
default=None,
122+
dest="logFolder",
123+
help="Collects all logs under the user specified"
124+
"folder"
125+
)
115126
Plugin.options(self, parser, env)
116127

117128
def wantClass(self, cls):
@@ -221,7 +232,8 @@ def startMarvin(self):
221232
self.__deployDcFlag,
222233
None,
223234
self.__zoneForTests,
224-
self.__hypervisorType)
235+
self.__hypervisorType,
236+
self.__userLogPath)
225237
if obj_marvininit and obj_marvininit.init() == SUCCESS:
226238
self.__testClient = obj_marvininit.getTestClient()
227239
self.__tcRunLogger = obj_marvininit.getLogger()
@@ -275,20 +287,21 @@ def _injectClients(self, test):
275287

276288
def finalize(self, result):
277289
try:
278-
src = self.__logFolderPath
279-
log_cfg = self.__parsedConfig.logger
280-
tmp = log_cfg.__dict__.get('LogFolderPath') + "/MarvinLogs"
281-
dst = tmp + "//" + random_gen()
282-
mod_name = "test_suite"
283-
if self.__testModName:
284-
mod_name = self.__testModName.split(".")
285-
if len(mod_name) > 2:
286-
mod_name = mod_name[-2]
287-
if mod_name:
288-
dst = tmp + "/" + mod_name + "_" + random_gen()
289-
cmd = "mv " + src + " " + dst
290-
os.system(cmd)
291-
print "===final results are now copied to: %s===" % str(dst)
290+
if not self.__userLogPath:
291+
src = self.__logFolderPath
292+
log_cfg = self.__parsedConfig.logger
293+
tmp = log_cfg.__dict__.get('LogFolderPath') + "/MarvinLogs"
294+
dst = tmp + "//" + random_gen()
295+
mod_name = "test_suite"
296+
if self.__testModName:
297+
mod_name = self.__testModName.split(".")
298+
if len(mod_name) > 2:
299+
mod_name = mod_name[-2]
300+
if mod_name:
301+
dst = tmp + "/" + mod_name + "_" + random_gen()
302+
cmd = "mv " + src + " " + dst
303+
os.system(cmd)
304+
print "===final results are now copied to: %s===" % str(dst)
292305
except Exception, e:
293306
print "=== Exception occurred under finalize :%s ===" % \
294307
str(GetDetailExceptionInfo(e))

0 commit comments

Comments
 (0)