Switch from CONST to CONF

It also removes constants.CONST and env.Environment which are now
useless.

Depends-On: I764a0a2a24447c941d1e726f3116593b29dd1c1e
Depends-On: I6cfa832466dcefd737314633d807512e46267a69
Change-Id: Ife41c59d9f2e6ec4e49df38af962039f99554bc5
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

1 files changed, 8 insertions, 9 deletions

diff --git a/functest/opnfv_tests/vnf/ims/orchestra_openims.py b/functest/opnfv_tests/vnf/ims/orchestra_openims.py
index c35ec8c1..a8a276ca 100644
--- a/functest/opnfv_tests/vnf/ims/orchestra_openims.py
+++ b/functest/opnfv_tests/vnf/ims/orchestra_openims.py
@@ -19,7 +19,7 @@ import yaml
 
 import functest.core.vnf as vnf
 import functest.utils.openstack_utils as os_utils
-from functest.utils.constants import CONST
+from functest.utils import config
 
 from org.openbaton.cli.errors.errors import NfvoException
 from org.openbaton.cli.agents.agents import MainAgent
@@ -151,14 +151,14 @@ class OpenImsVnf(vnf.VnfOnBoarding):
 
         self.case_dir = pkg_resources.resource_filename(
             'functest', 'opnfv_tests/vnf/ims/')
-        self.data_dir = getattr(CONST, 'dir_ims_data')
-        self.test_dir = getattr(CONST, 'dir_repo_vims_test')
+        self.data_dir = getattr(config.CONF, 'dir_ims_data')
+        self.test_dir = getattr(config.CONF, 'dir_repo_vims_test')
         self.created_resources = []
         self.logger.info("%s VNF onboarding test starting", self.case_name)
 
         try:
             self.config = getattr(
-                CONST, 'vnf_{}_config'.format(self.case_name))
+                config.CONF, 'vnf_{}_config'.format(self.case_name))
         except BaseException:
             raise Exception("Orchestra VNF config file not found")
         config_file = self.case_dir + self.config
@@ -206,11 +206,10 @@ class OpenImsVnf(vnf.VnfOnBoarding):
 
         self.logger.info("Additional pre-configuration steps")
         self.creds = {
-                "tenant": self.snaps_creds.project_name,
-                "username": self.snaps_creds.username,
-                "password": self.snaps_creds.password,
-                "auth_url": public_auth_url
-                }
+            "tenant": self.snaps_creds.project_name,
+            "username": self.snaps_creds.username,
+            "password": self.snaps_creds.password,
+            "auth_url": public_auth_url}
         self.prepare_images()
         self.prepare_flavor()
         self.prepare_security_groups()