Merge "Integrating PyTest contained in SNAPS as a replacement to the old bash healthcheck."

2 files changed, 50 insertions, 0 deletions

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 7a3dc229f..fc3bd6b7a 100755
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -19,6 +19,22 @@ tiers:
                     installer: ''
                     scenario: '^((?!lxd).)*$'
             -
+                name: snaps_health_check
+                criteria: 'status == "PASS"'
+                blocking: false
+                description: >-
+                    This test case creates executes the SimpleHealthCheck
+                    Python test class which creates an, image, flavor, network,
+                    and Cirros VM instance and observes the console output to
+                    validate the single port obtains the correct IP address.
+
+                dependencies:
+                    installer: ''
+                    scenario: '^((?!lxd).)*$'
+                run:
+                    module: 'functest.opnfv_tests.openstack.snaps.health_check'
+                    class: 'HealthCheck'
+            -
                 name: connection_check
                 criteria: 'status == "PASS"'
                 blocking: true
diff --git a/functest/opnfv_tests/openstack/snaps/health_check.py b/functest/opnfv_tests/openstack/snaps/health_check.py
new file mode 100644
index 000000000..993c1000c
--- /dev/null
+++ b/functest/opnfv_tests/openstack/snaps/health_check.py
@@ -0,0 +1,34 @@
+# Copyright (c) 2015 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 unittest
+
+from snaps.openstack.tests.os_source_file_test import OSIntegrationTestCase
+from snaps.openstack.tests.create_instance_tests import SimpleHealthCheck
+
+from functest.core.pytest_suite_runner import PyTestSuiteRunner
+from functest.opnfv_tests.openstack.snaps import snaps_utils
+from functest.utils.constants import CONST
+
+
+class HealthCheck(PyTestSuiteRunner):
+    """
+    This test executes the SNAPS Python Test case SimpleHealthCheck which
+    creates a VM with a single port with an IPv4 address that is assigned by
+    DHCP. This test then validates the expected IP with the actual
+    """
+    def __init__(self):
+        super(HealthCheck, self).__init__()
+
+        self.suite = unittest.TestSuite()
+        self.case_name = "snaps_health_check"
+        ext_net_name = snaps_utils.get_ext_net_name()
+
+        self.suite.addTest(
+            OSIntegrationTestCase.parameterize(
+                SimpleHealthCheck, CONST.openstack_creds, ext_net_name,
+                use_keystone=CONST.snaps_use_keystone))