You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2012/07/30 12:07:19 UTC
[1/16] git commit: VpcVirtualRouter is not enabled always.
Updated Branches:
refs/heads/master 7026822e2 -> 8a2135e3f
VpcVirtualRouter is not enabled always.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8a2135e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8a2135e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8a2135e3
Branch: refs/heads/master
Commit: 8a2135e3faede9739eac3c728c90e7fc6578db38
Parents: 046f2d7
Author: Prasanna Santhanam <Pr...@citrix.com>
Authored: Thu Jul 26 19:57:53 2012 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon Jul 30 15:32:38 2012 +0530
----------------------------------------------------------------------
tools/marvin/marvin/deployDataCenter.py | 2 +-
tools/marvin/marvin/marvinPlugin.py | 1 -
2 files changed, 1 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8a2135e3/tools/marvin/marvin/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index bd0217f..4284d12 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -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)
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8a2135e3/tools/marvin/marvin/marvinPlugin.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/marvinPlugin.py b/tools/marvin/marvin/marvinPlugin.py
index ace6f6c..5e0c6da 100644
--- a/tools/marvin/marvin/marvinPlugin.py
+++ b/tools/marvin/marvin/marvinPlugin.py
@@ -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)