refactor snaps and example using new constants provider

JIRA: FUNCTEST-673

Change-Id: If20be3c614f729c17bf6484676de7889747a98c0
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>

4 files changed, 35 insertions, 28 deletions

diff --git a/functest/opnfv_tests/openstack/snaps/api_check.py b/functest/opnfv_tests/openstack/snaps/api_check.py
index 278892094..17d05b922 100644
--- a/functest/opnfv_tests/openstack/snaps/api_check.py
+++ b/functest/opnfv_tests/openstack/snaps/api_check.py
@@ -5,11 +5,13 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 
-import functest.utils.functest_utils as ft_utils
+import unittest
+
+from snaps import test_suite_builder
+
 from functest.core.pytest_suite_runner import PyTestSuiteRunner
 from functest.opnfv_tests.openstack.snaps import snaps_utils
-from snaps import test_suite_builder
-import unittest
+from functest.utils.constants import CONST
 
 
 class ApiCheck(PyTestSuiteRunner):
@@ -23,10 +25,10 @@ class ApiCheck(PyTestSuiteRunner):
 
         self.suite = unittest.TestSuite()
         self.case_name = "api_check"
-        creds_file = ft_utils.get_functest_config('general.openstack.creds')
-        use_key = ft_utils.get_functest_config('snaps.use_keystone')
         ext_net_name = snaps_utils.get_ext_net_name()
 
-        test_suite_builder.add_openstack_api_tests(self.suite, creds_file,
-                                                   ext_net_name,
-                                                   use_keystone=use_key)
+        test_suite_builder.add_openstack_api_tests(
+            self.suite,
+            CONST.openstack_creds,
+            ext_net_name,
+            use_keystone=CONST.snaps_use_keystone)
diff --git a/functest/opnfv_tests/openstack/snaps/connection_check.py b/functest/opnfv_tests/openstack/snaps/connection_check.py
index c2f5b1027..11f8ad074 100644
--- a/functest/opnfv_tests/openstack/snaps/connection_check.py
+++ b/functest/opnfv_tests/openstack/snaps/connection_check.py
@@ -5,11 +5,13 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 
-import functest.utils.functest_utils as ft_utils
+import unittest
+
+from snaps import test_suite_builder
+
 from functest.core.pytest_suite_runner import PyTestSuiteRunner
 from functest.opnfv_tests.openstack.snaps import snaps_utils
-from snaps import test_suite_builder
-import unittest
+from functest.utils.constants import CONST
 
 
 class ConnectionCheck(PyTestSuiteRunner):
@@ -23,10 +25,10 @@ class ConnectionCheck(PyTestSuiteRunner):
 
         self.suite = unittest.TestSuite()
         self.case_name = "connection_check"
-        creds_file = ft_utils.get_functest_config('general.openstack.creds')
-        use_key = ft_utils.get_functest_config('snaps.use_keystone')
         ext_net_name = snaps_utils.get_ext_net_name()
 
-        test_suite_builder.add_openstack_client_tests(self.suite, creds_file,
-                                                      ext_net_name,
-                                                      use_keystone=use_key)
+        test_suite_builder.add_openstack_client_tests(
+            self.suite,
+            CONST.openstack_creds,
+            ext_net_name,
+            use_keystone=CONST.snaps_use_keystone)
diff --git a/functest/opnfv_tests/openstack/snaps/smoke.py b/functest/opnfv_tests/openstack/snaps/smoke.py
index 691f81384..83eb6600c 100644
--- a/functest/opnfv_tests/openstack/snaps/smoke.py
+++ b/functest/opnfv_tests/openstack/snaps/smoke.py
@@ -5,12 +5,14 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 
-import functest.utils.functest_utils as ft_utils
+import os
+import unittest
+
+from snaps import test_suite_builder
+
 from functest.core.pytest_suite_runner import PyTestSuiteRunner
 from functest.opnfv_tests.openstack.snaps import snaps_utils
-from snaps import test_suite_builder
-import unittest
-import os
+from functest.utils.constants import CONST
 
 
 class SnapsSmoke(PyTestSuiteRunner):
@@ -24,18 +26,18 @@ class SnapsSmoke(PyTestSuiteRunner):
 
         self.suite = unittest.TestSuite()
         self.case_name = "snaps_smoke"
-        creds_file = ft_utils.get_functest_config('general.openstack.creds')
-        use_key = ft_utils.get_functest_config('snaps.use_keystone')
-        use_fip = ft_utils.get_functest_config('snaps.use_floating_ips')
+        use_fip = CONST.snaps_use_floating_ips
         ext_net_name = snaps_utils.get_ext_net_name()
 
         # Tests requiring floating IPs leverage files contained within the
         # SNAPS repository and are found relative to that path
         if use_fip:
-            snaps_dir = ft_utils.get_functest_config(
-                'general.dir.dir_repo_snaps') + '/snaps'
+            snaps_dir = CONST.dir_repo_snaps + '/snaps'
             os.chdir(snaps_dir)
 
         test_suite_builder.add_openstack_integration_tests(
-            self.suite, creds_file, ext_net_name, use_keystone=use_key,
+            self.suite,
+            CONST.openstack_creds,
+            ext_net_name,
+            use_keystone=CONST.snaps_use_keystone,
             use_floating_ips=use_fip)
diff --git a/functest/opnfv_tests/openstack/snaps/snaps_utils.py b/functest/opnfv_tests/openstack/snaps/snaps_utils.py
index a25ad3e0d..4ea1a04ad 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_utils.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_utils.py
@@ -5,17 +5,18 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 
-import functest.utils.functest_utils as ft_utils
 from snaps.openstack.tests import openstack_tests
 from snaps.openstack.utils import neutron_utils
 
+from functest.utils.constants import CONST
+
 
 def get_ext_net_name():
     """
     Returns the first external network name
     :return:
     """
-    os_env_file = ft_utils.get_functest_config('general.openstack.creds')
+    os_env_file = CONST.openstack_creds
     os_creds = openstack_tests.get_credentials(os_env_file=os_env_file)
     neutron = neutron_utils.neutron_client(os_creds)
     ext_nets = neutron_utils.get_external_networks(neutron)