diff options
| author |   Tim Irnich <tim.irnich@ericsson.com> | 2017-10-18 16:28:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-18 16:28:28 +0000 |
| commit | cd6a598f8e0c18820783d0b0e9d3135fa833d826 (patch) | |
| tree | 77babe72f4be44ab6f17fc7c2fc6c9f2cfa023b0 | |
| parent | 66f4fcfc64ed884b5adb2e78447b44ec0639fc6c (diff) | |
| parent | 308dc9989bce115b615fa13ff1dc44080e3a731e (diff) | |
Merge "Gather logs only if fuel or apex installer"
| -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 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') |