From: Tim Irnich <tim.irnich@ericsson.com>
Date: Thu, 19 Oct 2017 08:14:00 +0000 (+0000)
Subject: Merge "Inheritance from Feature class"
X-Git-Tag: 6.0.0~40
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6f4fa990aec1d58d39930311640cd6f086e5b696;p=sdnvpn.git

Merge "Inheritance from Feature class"
---

6f4fa990aec1d58d39930311640cd6f086e5b696
diff --cc sdnvpn/test/functest/run_sdnvpn_tests.py
index 8e8cf81,f64ee18..cff6a27
--- a/sdnvpn/test/functest/run_sdnvpn_tests.py
+++ b/sdnvpn/test/functest/run_sdnvpn_tests.py
@@@ -82,16 -80,8 +80,14 @@@ class SdnvpnFunctest(base.Feature)
                      if status == "FAIL":
                          overall_status = "FAIL"
  
-         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')