Added test cases for running the Python Tests included with SNAPS.

JIRA: FUNCTEST-570

The three new tests are:
1. healthcheck/connecton_check - Retrieves different OpenStack clients and may exercise a query function
2. healthcheck/api_check - Exercises many of the OpenStack APIs by performing basic CRUD operations
3. smoke/snaps_smoke - Creates VMs and some optionally test SSH into floating IPs

Removed configured exernal network name and replaced it with a dynamic lookup.
Fixed typo in run_tests.py

Change-Id: Icb87a77c7cdd99dd9aa3a66bcc5a25b4b5935fef
Signed-off-by: spisarski <s.pisarski@cablelabs.com>

3 files changed, 62 insertions, 1 deletions

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index c75afdafe..0da2bb8f3 100755
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -26,6 +26,7 @@ general:
         dir_repo_ovno:      /home/opnfv/repos/ovno

         dir_repo_parser:    /home/opnfv/repos/parser

         dir_repo_domino:    /home/opnfv/repos/domino

+        dir_repo_snaps:     /home/opnfv/repos/snaps

         dir_functest:       /home/opnfv/functest

         dir_functest_test:  /home/opnfv/repos/functest/functest/opnfv_tests

         dir_results:        /home/opnfv/functest/results

@@ -64,6 +65,10 @@ healthcheck:
     disk_format: qcow2

     wait_time: 60

 

+snaps:

+    use_keystone: True

+    use_floating_ips: False

+

 vping:

     ping_timeout:   200

     vm_flavor: m1.tiny # adapt to your environment

diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py
index 7de1577d4..d2a64aea1 100644
--- a/functest/ci/run_tests.py
+++ b/functest/ci/run_tests.py
@@ -140,7 +140,7 @@ def run_test(test, tier_name):
             cls = getattr(module, run_dict['class'])
             test_case = cls()
             result = test_case.run()
-            if (result == testcase_base.TestCasesBase.EX_OK and
+            if (result == testcase_base.TestcaseBase.EX_OK and
                     GlobalVariables.REPORT_FLAG):
                 result = test_case.push_to_db()
         except ImportError:
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index d483e589e..56ca40176 100755
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -19,6 +19,42 @@ tiers:
                     installer: ''
                     scenario: '^((?!lxd).)*$'
 
+            -
+                name: connection_check
+                criteria: 'status == "PASS"'
+                blocking: true
+                description: >-
+                    This test case verifies the retrieval of OpenStack clients:
+                    Keystone, Glance, Neutron and Nova and may perform some
+                    simple queries. When the config value of
+                    snaps.use_keystone is True, functest must have access to
+                    the cloud's private network.
+
+                dependencies:
+                    installer: ''
+                    scenario: ''
+                run:
+                    module: 'functest.opnfv_tests.openstack.snaps.connection_check'
+                    class: 'ConnectionCheck'
+
+            -
+                name: api_check
+                criteria: 'status == "PASS"'
+                blocking: true
+                description: >-
+                    This test case verifies the retrieval of OpenStack clients:
+                    Keystone, Glance, Neutron and Nova and may perform some
+                    simple queries. When the config value of
+                    snaps.use_keystone is True, functest must have access to
+                    the cloud's private network.
+
+                dependencies:
+                    installer: ''
+                    scenario: ''
+                run:
+                    module: 'functest.opnfv_tests.openstack.snaps.api_check'
+                    class: 'ApiCheck'
+
     -
         name: smoke
         order: 1
@@ -106,6 +142,26 @@ tiers:
                     installer: ''
                     scenario: 'onos'
 
+            -
+                name: snaps_smoke
+                criteria: 'status == "PASS"'
+                blocking: true
+                description: >-
+                    This test case contains tests that setup and destroy
+                    environments with VMs with and without Floating IPs
+                    with a newly created user and project. Set the config
+                    value snaps.use_floating_ips (True|False) to toggle
+                    this functionality. When the config value of
+                    snaps.use_keystone is True, functest must have access to
+                    the cloud's private network.
+
+                dependencies:
+                    installer: ''
+                    scenario: ''
+                run:
+                    module: 'functest.opnfv_tests.openstack.snaps.smoke'
+                    class: 'SnapsSmoke'
+
     -
         name: features
         order: 2