etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VpcVirtualRouter is not enabled always.

This commit is contained in:
Prasanna Santhanam 2012-07-26 19:57:53 +05:30 committed by Prasanna Santhanam
parent 046f2d786f
commit 8a2135e3fa
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/marvin/marvin/deployDataCenter.py
View File

@ -216,7 +216,7 @@ class deployDataCenters():
pnetprov.name = "VpcVirtualRouter"
pnetprovres = self.apiClient.listNetworkServiceProviders(pnetprov)
if len(pnetprovres) > 0:
if pnetprovres and len(pnetprovres) > 0:
vpcvrprov = listVirtualRouterElements.listVirtualRouterElementsCmd()
vpcvrprov.nspid = pnetprovres[0].id
vpcvrprovresponse = self.apiClient.listVirtualRouterElements(vpcvrprov)

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

@ -61,7 +61,6 @@ class MarvinPlugin(Plugin):
cfg = nose.config.Config()
cfg.logStream = self.result_stream
cfg.debugLog = self.debug_stream
cfg.workingDir = options.test_dir
self.testrunner = nose.core.TextTestRunner(stream=self.result_stream, descriptions=True, verbosity=2, config=config)