diff options
author | Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com> | 2017-10-18 12:22:11 +0200 |
---|---|---|
committer | Jose Lausuch <jalausuch@suse.com> | 2017-10-30 14:39:09 +0000 |
commit | 55ed0c7bf86effb047d7d64a33cac8dd9d8490ab (patch) | |
tree | 053846772e048daa9e6148c6e0f4880f7ef86e3f | |
parent | e9ade965ab40c3321b4aab03104e7e211af73d0a (diff) |
Gather logs only if fuel or apex installer
Change-Id: I11988ad86a916d1d7251aacf951c6362fda961ba
Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
(cherry picked from commit 308dc9989bce115b615fa13ff1dc44080e3a731e)
-rw-r--r-- | sdnvpn/lib/utils.py | 4 | ||||
-rw-r--r-- | sdnvpn/test/functest/run_sdnvpn_tests.py | 8 |
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 140256d..6fa577f 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') |