Merge "Enable tempest offline by use_custom_images=True"
authorvalentin boucher <valentin.boucher@orange.com>
Tue, 6 Jun 2017 07:28:28 +0000 (07:28 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 6 Jun 2017 07:28:28 +0000 (07:28 +0000)
32 files changed:
docker/Dockerfile
docker/Dockerfile.aarch64
docs/com/pres/framework/framework.md
docs/testing/user/userguide/runfunctest.rst
functest/ci/prepare_env.py
functest/ci/run_tests.py
functest/ci/testcases.yaml
functest/ci/tier_builder.py
functest/ci/tier_handler.py
functest/core/testcase.py
functest/opnfv_tests/openstack/rally/rally.py
functest/opnfv_tests/openstack/refstack_client/refstack_client.py
functest/opnfv_tests/openstack/snaps/connection_check.py
functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
functest/opnfv_tests/openstack/tempest/tempest.py
functest/opnfv_tests/openstack/vping/vping_base.py
functest/opnfv_tests/sdn/odl/odl.py
functest/opnfv_tests/sdn/onos/teston/adapters/foundation.py
functest/tests/unit/ci/test_prepare_env.py
functest/tests/unit/ci/test_run_tests.py
functest/tests/unit/ci/test_tier_builder.py
functest/tests/unit/ci/test_tier_handler.py
functest/tests/unit/core/test_testcase.py
functest/tests/unit/openstack/snaps/__init__.py [new file with mode: 0644]
functest/tests/unit/openstack/snaps/test_snaps.py [new file with mode: 0644]
functest/tests/unit/utils/test_decorators.py
functest/tests/unit/utils/test_functest_utils.py
functest/utils/functest_utils.py
functest/utils/openstack_clean.py
functest/utils/openstack_snapshot.py
requirements.txt
tox.ini

index ef5967f..21ae334 100644 (file)
@@ -90,7 +90,6 @@ RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/promise ${REP
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/netready ${REPOS_DIR}/netready
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds ${REPOS_DIR}/fds
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sfc ${REPOS_DIR}/sfc
-RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/snaps ${REPOS_DIR}/snaps
 RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/securityscanning ${REPOS_DIR}/securityscanning
 RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/opera ${REPOS_DIR}/opera
 
@@ -140,9 +139,6 @@ RUN /bin/bash ${REPOS_DIR}/functest/docker/add_images.sh
 RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
 RUN curl -L https://get.rvm.io | bash -s stable
 
-# SNAPS integration
-RUN pip install -e ${REPOS_DIR}/snaps/
-
 # SFC integration
 RUN /bin/bash -c ". ${REPOS_DIR}/sfc/sfc/tests/functest/setup_scripts/tacker_client_install.sh"
 RUN cd ${REPOS_DIR}/sfc && pip install -e .
index e323cb1..7296461 100644 (file)
@@ -87,7 +87,6 @@ RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/parser ${REPO
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/doctor ${REPOS_DIR}/doctor
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/promise ${REPOS_DIR}/promise
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sfc ${REPOS_DIR}/sfc
-RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/snaps ${REPOS_DIR}/snaps
 RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/securityscanning ${REPOS_DIR}/securityscanning
 RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/opera ${REPOS_DIR}/opera
 
@@ -134,9 +133,6 @@ RUN /bin/bash ${REPOS_DIR}/functest/docker/add_images.sh
 RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
 RUN curl -L https://get.rvm.io | bash -s stable
 
-# SNAPS integration
-RUN pip install -e ${REPOS_DIR}/snaps/
-
 RUN pip install ${REPOS_DIR}/opera
 
 # SFC integration
index 1b07a8e..d6a01de 100644 (file)
@@ -59,12 +59,14 @@ base model for single test case
 
 ### methods
 
-| Method            | Purpose                                    |
-|-------------------|--------------------------------------------|
-| run(**kwargs)     | run the test case                          |
-| is_successful()   | interpret the results of the test case     |
-| get_duration()    | return the duration of the test case       |
-| push_to_db()      | push the results of the test case to the DB|
+| Method            | Purpose                      |
+|-------------------|------------------------------|
+| run(**kwargs)     | run the test case            |
+| is_successful()   | interpret the results        |
+| get_duration()    | return the duration          |
+| push_to_db()      | push the results to the DB   |
+| create_snapshot() | save the testing environment |
+| clean()           | clean the resources          |
 
 
 ### run(**kwargs)
@@ -136,7 +138,6 @@ case_name: first
 project_name: functest
 criteria: 100
 blocking: true
-clean_flag: false
 description: ''
 dependencies:
     installer: ''
@@ -204,7 +205,6 @@ case_name: second
 project_name: functest
 criteria: 100
 blocking: true
-clean_flag: false
 description: ''
 dependencies:
     installer: ''
@@ -238,7 +238,6 @@ case_name: third
 project_name: functest
 criteria: 100
 blocking: true
-clean_flag: false
 description: ''
 dependencies:
     installer: ''
@@ -294,7 +293,6 @@ case_name: fourth
 project_name: functest
 criteria: 100
 blocking: true
-clean_flag: false
 description: ''
 dependencies:
     installer: ''
index 07b5b8a..c155e60 100644 (file)
@@ -561,14 +561,9 @@ the Functest environment (i.e. CLI command 'functest env prepare') to snapshot
 all the OpenStack resources (images, networks, volumes, security groups, tenants,
 users) so that an eventual cleanup does not remove any of these defaults.
 
-It is also called before running a test except if it is disabled by configuration
-in the testcases.yaml file (clean_flag=false). This flag has been added as some
-upstream tests already include their own cleaning mechanism (e.g. Rally).
-
 The script **openstack_clean.py** which is located in
-*$REPOS_DIR/functest/functest/utils/* is normally called after a test execution. It is
-in charge of cleaning the OpenStack resources that are not specified in the
-defaults file generated previously which is stored in
+*$REPOS_DIR/functest/functest/utils/* is in charge of cleaning the OpenStack resources
+that are not specified in the defaults file generated previously which is stored in
 */home/opnfv/functest/conf/openstack_snapshot.yaml* in the Functest docker container.
 
 It is important to mention that if there are new OpenStack resources created
@@ -660,7 +655,6 @@ For a given test case we defined:
   * the name of the test case
   * the criteria (experimental): a criteria used to declare the test case as PASS or FAIL
   * blocking: if set to true, if the test is failed, the execution of the following tests is canceled
-  * clean_flag: shall the functect internal mechanism be invoked after the test
   * the description of the test case
   * the dependencies: a combination of 2 regex on the scenario and the installer name
   * run: In Danube we introduced the notion of abstract class in order to harmonize the way to run internal, feature or vnf tests
index 8e17a4f..e03bc65 100755 (executable)
@@ -234,12 +234,15 @@ def source_rc_file():
                 CONST.__setattr__('OS_PASSWORD', value)
 
 
-def patch_config_file():
+def update_config_file():
     patch_file(CONFIG_PATCH_PATH)
 
     if pod_arch and pod_arch in arch_filter:
         patch_file(CONFIG_AARCH64_PATCH_PATH)
 
+    if "TEST_DB_URL" in os.environ:
+        update_db_url()
+
 
 def patch_file(patch_file_path):
     logger.debug('Updating file: %s', patch_file_path)
@@ -257,7 +260,15 @@ def patch_file(patch_file_path):
         os.remove(CONFIG_FUNCTEST_PATH)
         with open(CONFIG_FUNCTEST_PATH, "w") as f:
             f.write(yaml.dump(new_functest_yaml, default_style='"'))
-        f.close()
+
+
+def update_db_url():
+    with open(CONFIG_FUNCTEST_PATH) as f:
+        functest_yaml = yaml.safe_load(f)
+
+    with open(CONFIG_FUNCTEST_PATH, "w") as f:
+        functest_yaml["results"]["test_db_url"] = os.environ.get('TEST_DB_URL')
+        f.write(yaml.dump(functest_yaml, default_style='"'))
 
 
 def verify_deployment():
@@ -381,7 +392,7 @@ def main(**kwargs):
             get_deployment_handler()
             create_directories()
             source_rc_file()
-            patch_config_file()
+            update_config_file()
             verify_deployment()
             install_rally()
             install_tempest()
index 9b64a0c..af45c32 100755 (executable)
@@ -22,8 +22,6 @@ import prettytable
 import functest.ci.tier_builder as tb
 import functest.core.testcase as testcase
 import functest.utils.functest_utils as ft_utils
-import functest.utils.openstack_clean as os_clean
-import functest.utils.openstack_snapshot as os_snapshot
 import functest.utils.openstack_utils as os_utils
 from functest.utils.constants import CONST
 
@@ -97,14 +95,6 @@ class Runner(object):
                 elif key == 'OS_PASSWORD':
                     CONST.__setattr__('OS_PASSWORD', value)
 
-    @staticmethod
-    def generate_os_snapshot():
-        os_snapshot.main()
-
-    @staticmethod
-    def cleanup():
-        os_clean.main()
-
     @staticmethod
     def get_run_dict(testname):
         try:
@@ -124,14 +114,11 @@ class Runner(object):
                 "The test case {} is not enabled".format(test.get_name()))
         logger.info("\n")  # blank line
         self.print_separator("=")
-        logger.info("Running test case '%s'..." % test.get_name())
+        logger.info("Running test case '%s'...", test.get_name())
         self.print_separator("=")
         logger.debug("\n%s" % test)
         self.source_rc_file()
 
-        if test.needs_clean() and self.clean_flag:
-            self.generate_os_snapshot()
-
         flags = " -t %s" % test.get_name()
         if self.report_flag:
             flags += " -r"
@@ -145,6 +132,9 @@ class Runner(object):
                 test_dict = ft_utils.get_dict_by_test(test.get_name())
                 test_case = cls(**test_dict)
                 self.executed_test_cases.append(test_case)
+                if self.clean_flag:
+                    if test_case.create_snapshot() != test_case.EX_OK:
+                        return result
                 try:
                     kwargs = run_dict['args']
                     result = test_case.run(**kwargs)
@@ -155,6 +145,8 @@ class Runner(object):
                         test_case.push_to_db()
                     result = test_case.is_successful()
                 logger.info("Test result:\n\n%s\n", test_case)
+                if self.clean_flag:
+                    test_case.clean()
             except ImportError:
                 logger.exception("Cannot import module {}".format(
                     run_dict['module']))
@@ -164,15 +156,7 @@ class Runner(object):
         else:
             raise Exception("Cannot import the class for the test case.")
 
-        if test.needs_clean() and self.clean_flag:
-            self.cleanup()
-        if result != testcase.TestCase.EX_OK:
-            logger.error("The test case '%s' failed. " % test.get_name())
-            self.overall_result = Result.EX_ERROR
-            if test.is_blocking():
-                raise BlockingTestFailed(
-                    "The test case {} failed and is blocking".format(
-                        test.get_name()))
+        return result
 
     def run_tier(self, tier):
         tier_name = tier.get_name()
@@ -187,7 +171,14 @@ class Runner(object):
         self.print_separator("#")
         logger.debug("\n%s" % tier)
         for test in tests:
-            self.run_test(test, tier_name)
+            result = self.run_test(test, tier_name)
+            if result != testcase.TestCase.EX_OK:
+                logger.error("The test case '%s' failed.", test.get_name())
+                self.overall_result = Result.EX_ERROR
+                if test.is_blocking():
+                    raise BlockingTestFailed(
+                        "The test case {} failed and is blocking".format(
+                            test.get_name()))
 
     def run_all(self, tiers):
         summary = ""
@@ -225,9 +216,14 @@ class Runner(object):
                 if _tiers.get_tier(kwargs['test']):
                     self.run_tier(_tiers.get_tier(kwargs['test']))
                 elif _tiers.get_test(kwargs['test']):
-                    self.run_test(_tiers.get_test(kwargs['test']),
-                                  _tiers.get_tier_name(kwargs['test']),
-                                  kwargs['test'])
+                    result = self.run_test(
+                        _tiers.get_test(kwargs['test']),
+                        _tiers.get_tier_name(kwargs['test']),
+                        kwargs['test'])
+                    if result != testcase.TestCase.EX_OK:
+                        logger.error("The test case '%s' failed.",
+                                     kwargs['test'])
+                        self.overall_result = Result.EX_ERROR
                 elif kwargs['test'] == "all":
                     self.run_all(_tiers)
                 else:
index 8222df1..7d51832 100644 (file)
@@ -12,7 +12,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: true
-                clean_flag: false
                 description: >-
                     This test case verifies the retrieval of OpenStack clients:
                     Keystone, Glance, Neutron and Nova and may perform some
@@ -31,7 +30,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: true
-                clean_flag: false
                 description: >-
                     This test case verifies the retrieval of OpenStack clients:
                     Keystone, Glance, Neutron and Nova and may perform some
@@ -50,7 +48,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: true
-                clean_flag: false
                 description: >-
                     This test case creates executes the SimpleHealthCheck
                     Python test class which creates an, image, flavor, network,
@@ -75,7 +72,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: true
-                clean_flag: true
                 description: >-
                     This test case verifies: 1) SSH to an instance using floating
                     IPs over the public network. 2) Connectivity between 2 instances
@@ -92,7 +88,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: true
-                clean_flag: true
                 description: >-
                     This test case verifies:  1) Boot a VM with given userdata.
                     2) Connectivity between 2 instances over a private network.
@@ -108,7 +103,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: false
-                clean_flag: true
                 description: >-
                     This test case runs the smoke subset of the OpenStack
                     Tempest suite. The list of test cases is generated by
@@ -126,7 +120,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: false
-                clean_flag: false
                 description: >-
                     This test case runs a sub group of tests of the OpenStack
                     Rally suite in smoke mode.
@@ -142,7 +135,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: false
-                clean_flag: true
                 description: >-
                     This test case runs a sub group of tests of the OpenStack
                     Defcore testcases by using refstack client.
@@ -158,7 +150,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: true
-                clean_flag: false
                 description: >-
                     Test Suite for the OpenDaylight SDN Controller. It
                     integrates some test suites from upstream using
@@ -179,7 +170,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: false
-                clean_flag: false
                 description: >-
                     Test Suite for the OpenDaylight SDN Controller when
                     the NetVirt features are installed. It integrates
@@ -202,7 +192,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: false
-                clean_flag: false
                 description: >-
                     Test Suite for the OpenDaylight SDN Controller when GBP features are
                     installed. It integrates some test suites from upstream using
@@ -222,7 +211,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: true
-                clean_flag: true
                 description: >-
                     Test Suite for the ONOS SDN Controller. It integrates
                     some test suites from upstream using TestON as the test
@@ -239,7 +227,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: false
-                clean_flag: false
                 description: >-
                     This test case contains tests that setup and destroy
                     environments with VMs with and without Floating IPs
@@ -269,7 +256,6 @@ tiers:
                 project_name: promise
                 criteria: 100
                 blocking: false
-                clean_flag: true
                 description: >-
                     Test suite from Promise project.
                 dependencies:
@@ -287,7 +273,6 @@ tiers:
                 project_name: doctor
                 criteria: 100
                 blocking: false
-                clean_flag: true
                 description: >-
                     Test suite from Doctor project.
                 dependencies:
@@ -304,7 +289,6 @@ tiers:
                 project_name: sdnvpn
                 criteria: 100
                 blocking: false
-                clean_flag: true
                 description: >-
                     Test suite from SDNVPN project.
                 dependencies:
@@ -322,7 +306,6 @@ tiers:
                 project_name: securityscanning
                 criteria: 100
                 blocking: false
-                clean_flag: true
                 description: >-
                     Simple Security Scan
                 dependencies:
@@ -340,7 +323,6 @@ tiers:
                 project_name: copper
                 criteria: 100
                 blocking: false
-                clean_flag: true
                 description: >-
                     Test suite for policy management based on OpenStack Congress
                 dependencies:
@@ -358,7 +340,6 @@ tiers:
                 project_name: multisite
                 criteria: 100
                 blocking: false
-                clean_flag: false
                 description: >-
                     Test suite from kingbird
                 dependencies:
@@ -374,7 +355,6 @@ tiers:
                 project_name: sfc
                 criteria: 100
                 blocking: false
-                clean_flag: true
                 description: >-
                     Test suite for odl-sfc to test two chains and two SFs
                 dependencies:
@@ -392,7 +372,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: true
-                clean_flag: true
                 description: >-
                     Test Suite for onos-sfc to test sfc function.
                 dependencies:
@@ -408,7 +387,6 @@ tiers:
                 project_name: parser
                 criteria: 100
                 blocking: false
-                clean_flag: true
                 description: >-
                     Test suite from Parser project.
                 dependencies:
@@ -426,7 +404,6 @@ tiers:
                 project_name: domino
                 criteria: 100
                 blocking: false
-                clean_flag: true
                 description: >-
                     Test suite from Domino project.
                 dependencies:
@@ -444,7 +421,6 @@ tiers:
                 project_name: netready
                 criteria: 100
                 blocking: false
-                clean_flag: true
                 description: >-
                     Test suite from Netready project.
                 dependencies:
@@ -462,7 +438,6 @@ tiers:
                 project_name: barometer
                 criteria: 100
                 blocking: false
-                clean_flag: true
                 description: >-
                     Test suite for the Barometer project. Separate tests verify the
                     proper configuration and functionality of the following
@@ -487,7 +462,6 @@ tiers:
                 project_name: functest
                 criteria: 80
                 blocking: false
-                clean_flag: true
                 description: >-
                     The list of test cases is generated by
                     Tempest automatically and depends on the parameters of
@@ -504,7 +478,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: false
-                clean_flag: true
                 description: >-
                     The test case allows running a customized list of tempest
                     test cases defined in a file under
@@ -523,7 +496,6 @@ tiers:
                 project_name: functest
                 criteria: 90
                 blocking: false
-                clean_flag: false
                 description: >-
                     This test case runs the full suite of scenarios of the OpenStack
                     Rally suite using several threads and iterations.
@@ -546,7 +518,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: false
-                clean_flag: true
                 description: >-
                     This test case deploys an OpenSource vIMS solution from Clearwater
                     using the Cloudify orchestrator. It also runs some signaling traffic.
@@ -563,7 +534,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: false
-                clean_flag: true
                 description: >-
                    Test suite from Parser project.
                 dependencies:
@@ -579,7 +549,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: false
-                clean_flag: true
                 description: >-
                     VNF deployment with OpenBaton (Orchestra)
                 dependencies:
@@ -595,7 +564,6 @@ tiers:
                 project_name: opera
                 criteria: 100
                 blocking: false
-                clean_flag: true
                 description: >-
                     VNF deployment with OPEN-O
                 dependencies:
@@ -611,7 +579,6 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: false
-                clean_flag: true
                 description: >-
                     This test case is vRouter testing.
                 dependencies:
index d03cd90..f803846 100644 (file)
@@ -52,7 +52,6 @@ class TierBuilder(object):
                                        dependency=dep,
                                        criteria=dic_testcase['criteria'],
                                        blocking=dic_testcase['blocking'],
-                                       clean_flag=dic_testcase['clean_flag'],
                                        description=dic_testcase['description'])
                 if (testcase.is_compatible(self.ci_installer,
                                            self.ci_scenario) and
index 36ce245..4f2f14e 100644 (file)
@@ -109,14 +109,12 @@ class TestCase(object):
                  dependency,
                  criteria,
                  blocking,
-                 clean_flag,
                  description=""):
         self.name = name
         self.enabled = enabled
         self.dependency = dependency
         self.criteria = criteria
         self.blocking = blocking
-        self.clean_flag = clean_flag
         self.description = description
 
     @staticmethod
@@ -149,9 +147,6 @@ class TestCase(object):
     def is_blocking(self):
         return self.blocking
 
-    def needs_clean(self):
-        return self.clean_flag
-
     def __str__(self):
         lines = split_text(self.description, LINE_LENGTH - 6)
 
index 4316152..a7dc47c 100644 (file)
@@ -15,6 +15,8 @@ import os
 import prettytable
 
 import functest.utils.functest_utils as ft_utils
+import functest.utils.openstack_clean as os_clean
+import functest.utils.openstack_snapshot as os_snapshot
 
 __author__ = "Cedric Ollivier <cedric.ollivier@orange.com>"
 
@@ -176,3 +178,51 @@ class TestCase(object):
         except Exception:  # pylint: disable=broad-except
             self.__logger.exception("The results cannot be pushed to DB")
             return TestCase.EX_PUSH_TO_DB_ERROR
+
+    def create_snapshot(self):  # pylint: disable=no-self-use
+        """Save the testing environment before running test.
+
+        It can be overriden if resources must be listed running the
+        test case.
+
+        Returns:
+            TestCase.EX_OK
+        """
+        return TestCase.EX_OK
+
+    def clean(self):
+        """Clean the resources.
+
+        It can be overriden if resources must be deleted after
+        running the test case.
+        """
+
+
+class OSGCTestCase(TestCase):
+    """Model for single test case which requires an OpenStack Garbage
+    Collector."""
+
+    __logger = logging.getLogger(__name__)
+
+    def create_snapshot(self):
+        """Create a snapshot listing the OpenStack resources.
+
+        Returns:
+            TestCase.EX_OK if os_snapshot.main() returns 0.
+            TestCase.EX_RUN_ERROR otherwise.
+        """
+        try:
+            assert os_snapshot.main() == 0
+            self.__logger.info("OpenStack resources snapshot created")
+            return TestCase.EX_OK
+        except Exception:  # pylint: disable=broad-except
+            self.__logger.exception("Cannot create the snapshot")
+            return TestCase.EX_RUN_ERROR
+
+    def clean(self):
+        """Clean the OpenStack resources."""
+        try:
+            assert os_clean.main() == 0
+            self.__logger.info("OpenStack resources cleaned")
+        except Exception:  # pylint: disable=broad-except
+            self.__logger.exception("Cannot clean the OpenStack resources")
index e362fd4..2ae6817 100644 (file)
@@ -27,7 +27,7 @@ import functest.utils.openstack_utils as os_utils
 logger = logging.getLogger(__name__)
 
 
-class RallyBase(testcase.TestCase):
+class RallyBase(testcase.OSGCTestCase):
     TESTS = ['authenticate', 'glance', 'cinder', 'heat', 'keystone',
              'neutron', 'nova', 'quotas', 'requests', 'vm', 'all']
     GLANCE_IMAGE_NAME = CONST.__getattribute__('openstack_image_name')
index 5f1f3a1..b2a2153 100755 (executable)
@@ -27,7 +27,7 @@ from tempest_conf import TempestConf
 logger = logging.getLogger(__name__)
 
 
-class RefstackClient(testcase.TestCase):
+class RefstackClient(testcase.OSGCTestCase):
 
     def __init__(self, **kwargs):
         if "case_name" not in kwargs:
index f2753ae..494f74b 100644 (file)
@@ -1,4 +1,5 @@
-# Copyright (c) 2015 All rights reserved
+# Copyright (c) 2017 Cable Television Laboratories, Inc. and others.
+#
 # This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -26,8 +27,15 @@ class ConnectionCheck(SnapsTestRunner):
 
         self.suite = unittest.TestSuite()
 
+    def run(self, **kwargs):
+        """
+        Builds the test suite then calls super.run()
+        :param kwargs: the arguments to pass on
+        :return:
+        """
         test_suite_builder.add_openstack_client_tests(
             suite=self.suite,
             os_creds=self.os_creds,
             ext_net_name=self.ext_net_name,
             use_keystone=self.use_keystone)
+        return super(self.__class__, self).run()
index 2b98a20..e8a4215 100644 (file)
@@ -1,4 +1,5 @@
-# Copyright (c) 2015 All rights reserved
+# Copyright (c) 2017 Cable Television Laboratories, Inc. and others.
+#
 # This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -24,16 +25,23 @@ class SnapsTestRunner(unit.Suite):
         super(SnapsTestRunner, self).__init__(**kwargs)
         self.logger = logging.getLogger(__name__)
 
-        self.os_creds = openstack_tests.get_credentials(
-            os_env_file=CONST.__getattribute__('openstack_creds'),
-            proxy_settings_str=None, ssh_proxy_cmd=None)
+        if 'os_creds' in kwargs:
+            self.os_creds = kwargs['os_creds']
+        else:
+            self.os_creds = openstack_tests.get_credentials(
+                os_env_file=CONST.__getattribute__('openstack_creds'),
+                proxy_settings_str=None, ssh_proxy_cmd=None)
+
+        if 'ext_net_name' in kwargs:
+            self.ext_net_name = kwargs['ext_net_name']
+        else:
+            self.ext_net_name = snaps_utils.get_ext_net_name(self.os_creds)
 
-        self.ext_net_name = snaps_utils.get_ext_net_name(self.os_creds)
         self.use_fip = CONST.__getattribute__('snaps_use_floating_ips')
         self.use_keystone = CONST.__getattribute__('snaps_use_keystone')
         scenario = functest_utils.get_scenario()
 
-        self.flavor_metadata = create_flavor.MEM_PAGE_SIZE_ANY
+        self.flavor_metadata = None
         if 'ovs' in scenario or 'fdio' in scenario:
             self.flavor_metadata = create_flavor.MEM_PAGE_SIZE_LARGE
 
index 65d9f1f..cb8e9b4 100644 (file)
@@ -28,7 +28,7 @@ import functest.utils.functest_utils as ft_utils
 logger = logging.getLogger(__name__)
 
 
-class TempestCommon(testcase.TestCase):
+class TempestCommon(testcase.OSGCTestCase):
 
     def __init__(self, **kwargs):
         super(TempestCommon, self).__init__(**kwargs)
index 4390a99..856d5f2 100644 (file)
@@ -13,7 +13,7 @@ import os
 import time
 import uuid
 
-from functest.core.testcase import TestCase
+from functest.core import testcase
 from functest.utils import functest_utils
 from functest.utils.constants import CONST
 
@@ -24,7 +24,7 @@ from snaps.openstack.tests import openstack_tests
 from snaps.openstack.utils import deploy_utils, nova_utils
 
 
-class VPingBase(TestCase):
+class VPingBase(testcase.OSGCTestCase):
 
     """
     Base class for vPing tests that check connectivity between two VMs shared
@@ -79,7 +79,7 @@ class VPingBase(TestCase):
 
         scenario = functest_utils.get_scenario()
 
-        self.flavor_metadata = create_flavor.MEM_PAGE_SIZE_ANY
+        self.flavor_metadata = None
         if 'ovs' in scenario or 'fdio' in scenario:
             self.flavor_metadata = create_flavor.MEM_PAGE_SIZE_LARGE
 
@@ -152,12 +152,12 @@ class VPingBase(TestCase):
         else:
             raise Exception('VMs never became active')
 
-        if result == TestCase.EX_RUN_ERROR:
-            return TestCase.EX_RUN_ERROR
+        if result == testcase.TestCase.EX_RUN_ERROR:
+            return testcase.TestCase.EX_RUN_ERROR
 
         self.stop_time = time.time()
         self.result = 100
-        return TestCase.EX_OK
+        return testcase.TestCase.EX_OK
 
     def _cleanup(self):
         """
index b2b0b77..fb5dcbc 100755 (executable)
@@ -34,6 +34,7 @@ from six import StringIO
 from six.moves import urllib
 
 from functest.core import testcase
+from functest.utils import constants
 import functest.utils.openstack_utils as op_utils
 
 __author__ = "Cedric Ollivier <cedric.ollivier@orange.com>"
@@ -65,14 +66,15 @@ class ODLResultVisitor(robot.api.ResultVisitor):
 class ODLTests(testcase.TestCase):
     """ODL test runner."""
 
-    repos = "/home/opnfv/repos/"
-    odl_test_repo = os.path.join(repos, "odl_test")
+    odl_test_repo = os.path.join(
+        constants.CONST.__getattribute__('dir_repos'), 'odl_test')
     neutron_suite_dir = os.path.join(odl_test_repo,
                                      "csit/suites/openstack/neutron")
     basic_suite_dir = os.path.join(odl_test_repo,
                                    "csit/suites/integration/basic")
     default_suites = [basic_suite_dir, neutron_suite_dir]
-    res_dir = '/home/opnfv/functest/results/odl/'
+    res_dir = os.path.join(
+        constants.CONST.__getattribute__('dir_results'), 'odl')
     __logger = logging.getLogger(__name__)
 
     @classmethod
index f9eee7a..aed98ee 100644 (file)
@@ -18,7 +18,6 @@ import re
 import time
 
 from functest.utils.constants import CONST
-import functest.utils.functest_utils as ft_utils
 
 
 class Foundation(object):
@@ -55,7 +54,7 @@ class Foundation(object):
         """
         Get Default Parameters value
         """
-        self.Result_DB = ft_utils.get_db_url()
+        self.Result_DB = CONST.__getattribute__("results_test_db_url")
         self.masterusername = CONST.__getattribute__('ONOS_onosbench_username')
         self.masterpassword = CONST.__getattribute__('ONOS_onosbench_password')
         self.agentusername = CONST.__getattribute__('ONOS_onoscli_username')
index 513e723..85d1918 100644 (file)
@@ -20,6 +20,7 @@ class PrepareEnvTesting(unittest.TestCase):
 
     def setUp(self):
         self.prepare_envparser = prepare_env.PrepareEnvParser()
+        self.db_url_env = 'http://foo/testdb'
 
     @mock.patch('functest.ci.prepare_env.logger.info')
     def test_print_separator(self, mock_logger_info):
@@ -297,6 +298,22 @@ class PrepareEnvTesting(unittest.TestCase):
             prepare_env.patch_file('test_file')
             self.assertTrue(m.called)
 
+    @mock.patch('functest.ci.prepare_env.ft_utils.get_functest_yaml',
+                return_value={'tkey1': 'tvalue1'})
+    @mock.patch('functest.ci.prepare_env.yaml.safe_load',
+                return_value={'test_scenario': {'tkey': 'tvalue'}})
+    @mock.patch('functest.ci.prepare_env.update_db_url')
+    def test_update_db_url(self, mock_db_url, mock_safe_load,
+                           mock_get_functest_yaml):
+        CONST.__setattr__('DEPLOY_SCENARIO', 'default_scenario')
+        with mock.patch("__builtin__.open", mock.mock_open()), \
+            mock.patch('functest.ci.prepare_env.yaml.dump'), \
+                mock.patch.dict('functest.ci.prepare_env.os.environ',
+                                {'TEST_DB_URL': self.db_url_env},
+                                clear=True):
+            prepare_env.update_config_file()
+            self.assertTrue(mock_db_url.called)
+
     @mock.patch('functest.ci.prepare_env.logger.info')
     def test_verify_deployment_error(self, mock_logger_error):
         mock_popen = mock.Mock()
@@ -418,14 +435,14 @@ class PrepareEnvTesting(unittest.TestCase):
     @mock.patch('functest.ci.prepare_env.install_tempest')
     @mock.patch('functest.ci.prepare_env.install_rally')
     @mock.patch('functest.ci.prepare_env.verify_deployment')
-    @mock.patch('functest.ci.prepare_env.patch_config_file')
+    @mock.patch('functest.ci.prepare_env.update_config_file')
     @mock.patch('functest.ci.prepare_env.source_rc_file')
     @mock.patch('functest.ci.prepare_env.create_directories')
     @mock.patch('functest.ci.prepare_env.get_deployment_handler')
     @mock.patch('functest.ci.prepare_env.check_env_variables')
     @mock.patch('functest.ci.prepare_env.logger.info')
     def test_main_start(self, mock_logger_info, mock_env_var, mock_dep_handler,
-                        mock_create_dir, mock_source_rc, mock_patch_config,
+                        mock_create_dir, mock_source_rc, mock_update_config,
                         mock_verify_depl, mock_install_rally,
                         mock_install_temp, mock_create_flavor,
                         mock_check_env, mock_print_info):
@@ -438,7 +455,7 @@ class PrepareEnvTesting(unittest.TestCase):
             self.assertTrue(mock_dep_handler.called)
             self.assertTrue(mock_create_dir.called)
             self.assertTrue(mock_source_rc.called)
-            self.assertTrue(mock_patch_config.called)
+            self.assertTrue(mock_update_config.called)
             self.assertTrue(mock_verify_depl.called)
             self.assertTrue(mock_install_rally.called)
             self.assertTrue(mock_install_temp.called)
index 88e5d2b..fb8cb39 100644 (file)
@@ -38,8 +38,12 @@ class RunTestsTesting(unittest.TestCase):
                       'OS_PASSWORD': 'test_password'}
         self.test = {'test_name': 'test_name'}
         self.tier = mock.Mock()
+        test1 = mock.Mock()
+        test1.get_name.return_value = 'test1'
+        test2 = mock.Mock()
+        test2.get_name.return_value = 'test2'
         attrs = {'get_name.return_value': 'test_tier',
-                 'get_tests.return_value': ['test1', 'test2'],
+                 'get_tests.return_value': [test1, test2],
                  'get_ci_loop.return_value': 'test_ci_loop',
                  'get_test_names.return_value': ['test1', 'test2']}
         self.tier.configure_mock(**attrs)
@@ -70,16 +74,6 @@ class RunTestsTesting(unittest.TestCase):
                         return_value=self.creds):
             self.runner.source_rc_file()
 
-    @mock.patch('functest.ci.run_tests.os_snapshot.main')
-    def test_generate_os_snapshot(self, mock_os_snap):
-        self.runner.generate_os_snapshot()
-        self.assertTrue(mock_os_snap.called)
-
-    @mock.patch('functest.ci.run_tests.os_clean.main')
-    def test_cleanup(self, mock_os_clean):
-        self.runner.cleanup()
-        self.assertTrue(mock_os_clean.called)
-
     def test_get_run_dict_if_defined_default(self):
         mock_obj = mock.Mock()
         with mock.patch('functest.ci.run_tests.'
@@ -137,8 +131,6 @@ class RunTestsTesting(unittest.TestCase):
 
     @mock.patch('functest.ci.run_tests.Runner.print_separator')
     @mock.patch('functest.ci.run_tests.Runner.source_rc_file')
-    @mock.patch('functest.ci.run_tests.Runner.generate_os_snapshot')
-    @mock.patch('functest.ci.run_tests.Runner.cleanup')
     @mock.patch('importlib.import_module', name="module",
                 return_value=mock.Mock(test_class=mock.Mock(
                     side_effect=FakeModule)))
@@ -161,10 +153,10 @@ class RunTestsTesting(unittest.TestCase):
     def test_run_tier_default(self, mock_logger_info):
         with mock.patch('functest.ci.run_tests.Runner.print_separator'), \
                 mock.patch(
-                    'functest.ci.run_tests.Runner.run_test') as mock_method:
+                    'functest.ci.run_tests.Runner.run_test',
+                    return_value=TestCase.EX_OK) as mock_method:
             self.runner.run_tier(self.tier)
-            mock_method.assert_any_call('test1', 'test_tier')
-            mock_method.assert_any_call('test2', 'test_tier')
+            mock_method.assert_any_call(mock.ANY, 'test_tier')
             self.assertTrue(mock_logger_info.called)
 
     @mock.patch('functest.ci.run_tests.logger.info')
@@ -237,7 +229,8 @@ class RunTestsTesting(unittest.TestCase):
         with mock.patch('functest.ci.run_tests.tb.TierBuilder',
                         return_value=mock_obj), \
             mock.patch('functest.ci.run_tests.Runner.source_rc_file'), \
-                mock.patch('functest.ci.run_tests.Runner.run_test') as m:
+                mock.patch('functest.ci.run_tests.Runner.run_test',
+                           return_value=TestCase.EX_OK) as m:
             self.assertEqual(self.runner.main(**kwargs),
                              run_tests.Result.EX_OK)
             self.assertTrue(m.called)
index 989c087..ab75e15 100644 (file)
@@ -24,7 +24,6 @@ class TierBuilderTesting(unittest.TestCase):
                          'case_name': 'test_name',
                          'criteria': 'test_criteria',
                          'blocking': 'test_blocking',
-                         'clean_flag': 'test_clean_flag',
                          'description': 'test_desc'}
 
         self.dic_tier = {'name': 'test_tier',
index c93fffd..1909ac2 100644 (file)
@@ -34,7 +34,6 @@ class TierHandlerTesting(unittest.TestCase):
                                               self.mock_depend,
                                               'test_criteria',
                                               'test_blocking',
-                                              'test_clean_flag',
                                               description='test_desc')
 
         self.dependency = tier_handler.Dependency('test_installer',
index ef0983c..0a6f0c9 100644 (file)
@@ -221,6 +221,55 @@ class TestCaseTesting(unittest.TestCase):
         self.assertIn(duration, message)
         self.assertIn('FAIL', message)
 
+    def test_create_snapshot(self):
+        self.assertEqual(self.test.create_snapshot(),
+                         testcase.TestCase.EX_OK)
+
+    def test_clean(self):
+        self.assertEqual(self.test.clean(), None)
+
+
+class OSGCTestCaseTesting(unittest.TestCase):
+    """The class testing OSGCTestCase."""
+    # pylint: disable=missing-docstring
+
+    def setUp(self):
+        self.test = testcase.OSGCTestCase()
+
+    @mock.patch('functest.utils.openstack_snapshot.main',
+                side_effect=Exception)
+    def test_create_snapshot_exc(self, mock_method=None):
+        self.assertEqual(self.test.create_snapshot(),
+                         testcase.TestCase.EX_RUN_ERROR)
+        mock_method.assert_called_once_with()
+
+    @mock.patch('functest.utils.openstack_snapshot.main', return_value=-1)
+    def test_create_snapshot_ko(self, mock_method=None):
+        self.assertEqual(self.test.create_snapshot(),
+                         testcase.TestCase.EX_RUN_ERROR)
+        mock_method.assert_called_once_with()
+
+    @mock.patch('functest.utils.openstack_snapshot.main', return_value=0)
+    def test_create_snapshot_env(self, mock_method=None):
+        self.assertEqual(self.test.create_snapshot(),
+                         testcase.TestCase.EX_OK)
+        mock_method.assert_called_once_with()
+
+    @mock.patch('functest.utils.openstack_clean.main', side_effect=Exception)
+    def test_clean_exc(self, mock_method=None):
+        self.assertEqual(self.test.clean(), None)
+        mock_method.assert_called_once_with()
+
+    @mock.patch('functest.utils.openstack_clean.main', return_value=-1)
+    def test_clean_ko(self, mock_method=None):
+        self.assertEqual(self.test.clean(), None)
+        mock_method.assert_called_once_with()
+
+    @mock.patch('functest.utils.openstack_clean.main', return_value=0)
+    def test_clean(self, mock_method=None):
+        self.assertEqual(self.test.clean(), None)
+        mock_method.assert_called_once_with()
+
 
 if __name__ == "__main__":
     logging.disable(logging.CRITICAL)
diff --git a/functest/tests/unit/openstack/snaps/__init__.py b/functest/tests/unit/openstack/snaps/__init__.py
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/functest/tests/unit/openstack/snaps/test_snaps.py b/functest/tests/unit/openstack/snaps/test_snaps.py
new file mode 100644 (file)
index 0000000..9cfcc0a
--- /dev/null
@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2017 Cable Television Laboratories, Inc. and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+
+import mock
+import unittest
+
+from snaps.openstack.os_credentials import OSCreds
+
+from functest.core.testcase import TestCase
+from functest.opnfv_tests.openstack.snaps import connection_check
+
+
+class ConnectionCheckTesting(unittest.TestCase):
+    """
+    Ensures the VPingUserdata class can run in Functest. This test does not
+    actually connect with an OpenStack pod.
+    """
+
+    def setUp(self):
+        self.os_creds = OSCreds(
+            username='user', password='pass',
+            auth_url='http://foo.com:5000/v3', project_name='bar')
+
+        self.connection_check = connection_check.ConnectionCheck(
+            os_creds=self.os_creds, ext_net_name='foo')
+
+    @mock.patch('functest.opnfv_tests.openstack.snaps.connection_check.'
+                'ConnectionCheck')
+    @mock.patch('snaps.test_suite_builder.add_openstack_client_tests')
+    def test_run_success(self, mock_test, add_os_client_tests):
+        result = mock.MagicMock(name='unittest.TextTestResult')
+        result.testsRun = 100
+        result.failures = []
+        result.errors = []
+        with mock.patch('unittest.TextTestRunner.run', return_value=result):
+            self.assertEquals(TestCase.EX_OK, self.connection_check.run())
+            self.assertEquals(TestCase.EX_OK,
+                              self.connection_check.is_successful())
+
+    @mock.patch('functest.opnfv_tests.openstack.snaps.connection_check.'
+                'ConnectionCheck')
+    @mock.patch('snaps.test_suite_builder.add_openstack_client_tests')
+    def test_run_1_of_100_failures(self, mock_test, add_os_client_tests):
+        result = mock.MagicMock(name='unittest.TextTestResult')
+        result.testsRun = 100
+        result.failures = ['foo']
+        result.errors = []
+        with mock.patch('unittest.TextTestRunner.run', return_value=result):
+            self.assertEquals(TestCase.EX_OK, self.connection_check.run())
+            self.assertEquals(TestCase.EX_TESTCASE_FAILED,
+                              self.connection_check.is_successful())
+
+    @mock.patch('functest.opnfv_tests.openstack.snaps.connection_check.'
+                'ConnectionCheck')
+    @mock.patch('snaps.test_suite_builder.add_openstack_client_tests')
+    def test_run_1_of_100_failures_within_criteria(self, mock_test,
+                                                   add_os_client_tests):
+        self.connection_check.criteria = 90
+        result = mock.MagicMock(name='unittest.TextTestResult')
+        result.testsRun = 100
+        result.failures = ['foo']
+        result.errors = []
+        with mock.patch('unittest.TextTestRunner.run', return_value=result):
+            self.assertEquals(TestCase.EX_OK, self.connection_check.run())
+            self.assertEquals(TestCase.EX_OK,
+                              self.connection_check.is_successful())
index 44448f2..82291fa 100644 (file)
@@ -20,6 +20,7 @@ import mock
 
 from functest.utils import decorators
 from functest.utils import functest_utils
+from functest.utils.constants import CONST
 
 __author__ = "Cedric Ollivier <cedric.ollivier@orange.com>"
 
@@ -65,34 +66,29 @@ class DecoratorsTesting(unittest.TestCase):
                 'details': {}, 'criteria': self._result}
         return json.dumps(data, sort_keys=True)
 
-    @mock.patch('{}.get_db_url'.format(functest_utils.__name__),
-                return_value='http://127.0.0.1')
     @mock.patch('{}.get_version'.format(functest_utils.__name__),
                 return_value=VERSION)
     @mock.patch('requests.post')
     def test_http_shema(self, *args):
+        CONST.__setattr__('results_test_db_url', 'http://127.0.0.1')
         self.assertTrue(functest_utils.push_results_to_db(
             self._project_name, self._case_name, self._start_time,
             self._stop_time, self._result, {}))
         args[1].assert_called_once_with()
-        args[2].assert_called_once_with()
         args[0].assert_called_once_with(
             'http://127.0.0.1', data=self._get_json(),
             headers={'Content-Type': 'application/json'})
 
-    @mock.patch('{}.get_db_url'.format(functest_utils.__name__),
-                return_value="/dev/null")
-    def test_wrong_shema(self, mock_method=None):
+    def test_wrong_shema(self):
+        CONST.__setattr__('results_test_db_url', '/dev/null')
         self.assertFalse(functest_utils.push_results_to_db(
             self._project_name, self._case_name, self._start_time,
             self._stop_time, self._result, {}))
-        mock_method.assert_called_once_with()
 
     @mock.patch('{}.get_version'.format(functest_utils.__name__),
                 return_value=VERSION)
-    @mock.patch('{}.get_db_url'.format(functest_utils.__name__),
-                return_value=URL)
     def _test_dump(self, *args):
+        CONST.__setattr__('results_test_db_url', URL)
         with mock.patch.object(decorators, 'open', mock.mock_open(),
                                create=True) as mock_open:
             self.assertTrue(functest_utils.push_results_to_db(
@@ -104,7 +100,6 @@ class DecoratorsTesting(unittest.TestCase):
         self.assertIn('POST', call_args[0])
         self.assertIn(self._get_json(), call_args[0])
         args[0].assert_called_once_with()
-        args[1].assert_called_once_with()
 
     @mock.patch('os.makedirs')
     def test_default_dump(self, mock_method=None):
@@ -116,16 +111,14 @@ class DecoratorsTesting(unittest.TestCase):
         self._test_dump()
         mock_method.assert_called_once_with(DIR)
 
-    @mock.patch('{}.get_db_url'.format(functest_utils.__name__),
-                return_value=URL)
     @mock.patch('os.makedirs', side_effect=OSError)
     def test_makedirs_exc(self, *args):
+        CONST.__setattr__('results_test_db_url', URL)
         self.assertFalse(
             functest_utils.push_results_to_db(
                 self._project_name, self._case_name, self._start_time,
                 self._stop_time, self._result, {}))
         args[0].assert_called_once_with(DIR)
-        args[1].assert_called_once_with()
 
 
 if __name__ == "__main__":
index 12604c1..d84a320 100644 (file)
@@ -19,6 +19,7 @@ from six.moves import urllib
 
 from functest.tests.unit import test_utils
 from functest.utils import functest_utils
+from functest.utils.constants import CONST
 
 
 class FunctestUtilsTesting(unittest.TestCase):
@@ -58,6 +59,7 @@ class FunctestUtilsTesting(unittest.TestCase):
         self.config_yaml = os.path.normpath(os.path.join(os.path.dirname(
             os.path.abspath(__file__)), '../../../ci/config_functest.yaml'))
         self.db_url_env = 'http://foo/testdb'
+        self.testcases_yaml = "test_testcases_yaml"
         self.file_yaml = {'general': {'openstack': {'image_name':
                                                     'test_image_name'}}}
 
@@ -208,23 +210,9 @@ class FunctestUtilsTesting(unittest.TestCase):
             self.assertEqual(functest_utils.get_build_tag(),
                              self.build_tag)
 
-    def test_get_db_url_env_var(self):
-        with mock.patch.dict(os.environ,
-                             {'TEST_DB_URL': self.db_url_env,
-                              'CONFIG_FUNCTEST_YAML':
-                              "./functest/ci/config_functest.yaml"},
-                             clear=True):
-            self.assertEqual(functest_utils.get_db_url(),
-                             self.db_url_env)
-
-    @mock.patch('functest.utils.functest_utils.get_functest_config')
-    def test_get_db_url_default(self, mock_get_functest_config):
-        mock_get_functest_config.return_value = self.db_url
-        self.assertEqual(functest_utils.get_db_url(), self.db_url)
-        mock_get_functest_config.assert_called_once_with('results.test_db_url')
-
     @mock.patch('functest.utils.functest_utils.logger.info')
     def test_logger_test_results(self, mock_logger_info):
+        CONST.__setattr__('results_test_db_url', self.db_url)
         with mock.patch('functest.utils.functest_utils.get_pod_name',
                         return_value=self.node_name), \
                 mock.patch('functest.utils.functest_utils.get_scenario',
@@ -232,9 +220,7 @@ class FunctestUtilsTesting(unittest.TestCase):
                 mock.patch('functest.utils.functest_utils.get_version',
                            return_value=self.version), \
                 mock.patch('functest.utils.functest_utils.get_build_tag',
-                           return_value=self.build_tag), \
-                mock.patch('functest.utils.functest_utils.get_db_url',
-                           return_value=self.db_url):
+                           return_value=self.build_tag):
             functest_utils.logger_test_results(self.project, self.case_name,
                                                self.status, self.details)
             mock_logger_info.assert_called_once_with(
@@ -251,7 +237,7 @@ class FunctestUtilsTesting(unittest.TestCase):
                 "details:\t%(d)s\n"
                 % {'p': self.project,
                     'n': self.case_name,
-                    'db': self.db_url,
+                    'db': CONST.__getattribute__('results_test_db_url'),
                     'pod': self.node_name,
                     'v': self.version,
                     's': self.scenario,
@@ -269,11 +255,10 @@ class FunctestUtilsTesting(unittest.TestCase):
 
     def _test_push_results_to_db_missing_env(self, env_var):
         dic = self._get_env_dict(env_var)
-        with mock.patch('functest.utils.functest_utils.get_db_url',
-                        return_value=self.db_url), \
-                mock.patch.dict(os.environ,
-                                dic,
-                                clear=True), \
+        CONST.__setattr__('results_test_db_url', self.db_url)
+        with mock.patch.dict(os.environ,
+                             dic,
+                             clear=True), \
                 mock.patch('functest.utils.functest_utils.logger.error') \
                 as mock_logger_error:
             functest_utils.push_results_to_db(self.project, self.case_name,
@@ -297,11 +282,10 @@ class FunctestUtilsTesting(unittest.TestCase):
 
     def test_push_results_to_db_request_post_failed(self):
         dic = self._get_env_dict(None)
-        with mock.patch('functest.utils.functest_utils.get_db_url',
-                        return_value=self.db_url), \
-                mock.patch.dict(os.environ,
-                                dic,
-                                clear=True), \
+        CONST.__setattr__('results_test_db_url', self.db_url)
+        with mock.patch.dict(os.environ,
+                             dic,
+                             clear=True), \
                 mock.patch('functest.utils.functest_utils.logger.error') \
                 as mock_logger_error, \
                 mock.patch('functest.utils.functest_utils.requests.post',
@@ -320,11 +304,10 @@ class FunctestUtilsTesting(unittest.TestCase):
 
     def test_push_results_to_db_request_post_exception(self):
         dic = self._get_env_dict(None)
-        with mock.patch('functest.utils.functest_utils.get_db_url',
-                        return_value=self.db_url), \
-                mock.patch.dict(os.environ,
-                                dic,
-                                clear=True), \
+        CONST.__setattr__('results_test_db_url', self.db_url)
+        with mock.patch.dict(os.environ,
+                             dic,
+                             clear=True), \
                 mock.patch('functest.utils.functest_utils.logger.error') \
                 as mock_logger_error, \
                 mock.patch('functest.utils.functest_utils.requests.post',
@@ -338,11 +321,10 @@ class FunctestUtilsTesting(unittest.TestCase):
 
     def test_push_results_to_db_default(self):
         dic = self._get_env_dict(None)
-        with mock.patch('functest.utils.functest_utils.get_db_url',
-                        return_value=self.db_url), \
-                mock.patch.dict(os.environ,
-                                dic,
-                                clear=True), \
+        CONST.__setattr__('results_test_db_url', self.db_url)
+        with mock.patch.dict(os.environ,
+                             dic,
+                             clear=True), \
                 mock.patch('functest.utils.functest_utils.requests.post'):
             self.assertTrue(functest_utils.
                             push_results_to_db(self.project, self.case_name,
@@ -562,11 +544,13 @@ class FunctestUtilsTesting(unittest.TestCase):
 
     # TODO: merge_dicts
 
-    def test_get_testcases_file_dir(self):
+    @mock.patch('functest.utils.functest_utils.get_functest_config')
+    def test_get_testcases_file_dir(self, mock_get_functest_config):
+        mock_get_functest_config.return_value = self.testcases_yaml
         resp = functest_utils.get_testcases_file_dir()
-        self.assertEqual(resp,
-                         "/home/opnfv/repos/functest/"
-                         "functest/ci/testcases.yaml")
+        self.assertEqual(resp, self.testcases_yaml)
+        mock_get_functest_config.assert_called_once_with(
+            'general.functest.testcases_yaml')
 
     def test_get_functest_yaml(self):
         with mock.patch('six.moves.builtins.open', mock.mock_open()), \
index dc20eea..995d94f 100644 (file)
@@ -26,6 +26,7 @@ from git import Repo
 
 from functest.utils import constants
 from functest.utils import decorators
+from functest.utils.constants import CONST
 
 logger = logging.getLogger(__name__)
 
@@ -149,24 +150,15 @@ def get_build_tag():
     return build_tag
 
 
-def get_db_url():
+def logger_test_results(project, case_name, status, details):
     """
-    Returns DB URL
+    Format test case results for the logger
     """
-    # TODO use CONST mechanism
-    try:
-        # if TEST_DB_URL declared in env variable, use it!
-        db_url = os.environ['TEST_DB_URL']
-    except KeyError:
-        db_url = get_functest_config('results.test_db_url')
-    return db_url
-
-
-def logger_test_results(project, case_name, status, details):
     pod_name = get_pod_name()
     scenario = get_scenario()
     version = get_version()
     build_tag = get_build_tag()
+    db_url = CONST.__getattribute__("results_test_db_url")
 
     logger.info(
         "\n"
@@ -182,7 +174,7 @@ def logger_test_results(project, case_name, status, details):
         "details:\t%(d)s\n"
         % {'p': project,
             'n': case_name,
-            'db': get_db_url(),
+            'db': db_url,
             'pod': pod_name,
             'v': version,
             's': scenario,
@@ -198,7 +190,7 @@ def push_results_to_db(project, case_name,
     POST results to the Result target DB
     """
     # Retrieve params from CI and conf
-    url = get_db_url()
+    url = CONST.__getattribute__("results_test_db_url")
 
     try:
         installer = os.environ['INSTALLER_TYPE']
index 29106d9..cdd9185 100755 (executable)
@@ -22,9 +22,9 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 
-import time
-
 import logging
+import sys
+import time
 import yaml
 
 import functest.utils.openstack_utils as os_utils
@@ -392,7 +392,7 @@ def main():
     except Exception:
         logger.info("The file %s does not exist. The OpenStack snapshot must"
                     " be created first. Aborting cleanup." % OS_SNAPSHOT_FILE)
-        exit(0)
+        return 0
 
     default_images = snapshot_yaml.get('images')
     default_instances = snapshot_yaml.get('instances')
@@ -407,7 +407,7 @@ def main():
     if not os_utils.check_credentials():
         logger.error("Please source the openrc credentials and run "
                      "the script again.")
-        exit(-1)
+        return -1
 
     remove_instances(nova_client, default_instances)
     separator()
@@ -429,4 +429,4 @@ def main():
 
 if __name__ == '__main__':
     logging.basicConfig()
-    main()
+    sys.exit(main())
index 952fb7b..8f1d3b9 100755 (executable)
@@ -22,6 +22,7 @@
 
 import logging
 import yaml
+import sys
 
 import functest.utils.openstack_utils as os_utils
 from functest.utils.constants import CONST
@@ -139,7 +140,7 @@ def main():
     if not os_utils.check_credentials():
         logger.error("Please source the openrc credentials and run the" +
                      "script again.")
-        exit(-1)
+        return -1
 
     snapshot = {}
     snapshot.update(get_instances(nova_client))
@@ -163,4 +164,4 @@ def main():
 
 if __name__ == '__main__':
     logging.basicConfig()
-    main()
+    sys.exit(main())
index 059775d..ef6b2f1 100644 (file)
@@ -39,3 +39,4 @@ PrettyTable>=0.7.1,<0.8 # BSD
 six>=1.9.0 # MIT
 git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules
 git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests
+git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps
diff --git a/tox.ini b/tox.ini
index a944464..6c2734d 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -29,9 +29,22 @@ basepython = python2.7
 deps =
   {[testenv]deps}
 whitelist_externals = bash
-commands = bash -c "\
-  pylint -f parseable --disable=locally-disabled functest | \
-  tee pylint.out | sed -ne '/Raw metrics/,//p'"
+modules =
+  functest.core.feature
+  functest.core.testcase
+  functest.core.unit
+  functest.opnfv_tests.sdn.odl
+  functest.tests.unit.core.test_feature
+  functest.tests.unit.core.test_testcase
+  functest.tests.unit.core.test_unit
+  functest.tests.unit.odl
+  functest.tests.unit.utils.test_decorators
+  functest.utils.decorators
+commands =
+  bash -c "\
+    pylint -f parseable --disable=locally-disabled functest | \
+    tee pylint.out | sed -ne '/Raw metrics/,//p'"
+  pylint --disable=locally-disabled --reports=n {[testenv:pylint]modules}
 
 [testenv:py35]
 dirs =