summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeriyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>2017-10-18 12:22:11 +0200
committerPeriyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>2017-10-18 12:22:11 +0200
commit308dc9989bce115b615fa13ff1dc44080e3a731e (patch)
tree3f412614241e06bc8c487dc0c019cd825b7aebd8
parent778d4874047341c2b6af5c91c7553cc15e1cdaaf (diff)
Gather logs only if fuel or apex installer
Change-Id: I11988ad86a916d1d7251aacf951c6362fda961ba Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
-rw-r--r--sdnvpn/lib/utils.py4
-rw-r--r--sdnvpn/test/functest/run_sdnvpn_tests.py8
2 files changed, 10 insertions, 2 deletions
diff --git a/sdnvpn/lib/utils.py b/sdnvpn/lib/utils.py
index ad0714e..d968010 100644
--- a/sdnvpn/lib/utils.py
+++ b/sdnvpn/lib/utils.py
@@ -213,7 +213,9 @@ def get_installerHandler():
installer_ip = get_installer_ip()
if installer_type not in ["fuel", "apex"]:
- raise ValueError("%s is not supported" % installer_type)
+ logger.warn("installer type %s is neither fuel nor apex."
+ "returning None for installer handler" % installer_type)
+ return None
else:
if installer_type in ["apex"]:
developHandler = DeploymentFactory.get_handler(
diff --git a/sdnvpn/test/functest/run_sdnvpn_tests.py b/sdnvpn/test/functest/run_sdnvpn_tests.py
index 52a6994..8e8cf81 100644
--- a/sdnvpn/test/functest/run_sdnvpn_tests.py
+++ b/sdnvpn/test/functest/run_sdnvpn_tests.py
@@ -85,7 +85,13 @@ class SdnvpnFunctest(testcase.TestCase):
self.stop_time = time.time()
try:
- gather_logs('overall')
+ installer_type = str(os.environ['INSTALLER_TYPE'].lower())
+ if installer_type in ["fuel", "apex"]:
+ gather_logs('overall')
+ else:
+ self.__logger.info("Skipping log gathering because installer"
+ "type %s is neither fuel nor apex" %
+ installer_type)
except Exception as ex:
self.__logger.error(('Something went wrong in the Log gathering.'
'Ex: %s, Trace: %s')