From 8a2135e3faede9739eac3c728c90e7fc6578db38 Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Thu, 26 Jul 2012 19:57:53 +0530 Subject: [PATCH] VpcVirtualRouter is not enabled always. --- tools/marvin/marvin/deployDataCenter.py | 2 +- tools/marvin/marvin/marvinPlugin.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py index bd0217f8cab..4284d12a542 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) diff --git a/tools/marvin/marvin/marvinPlugin.py b/tools/marvin/marvin/marvinPlugin.py index ace6f6cb181..5e0c6dadb32 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)