Switch from CONST to CONF

[functest.git] / functest / opnfv_tests / vnf / epc / juju_epc.py

diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py
index dc92bc9..3b62a9a 100644 (file)
--- a/functest/opnfv_tests/vnf/epc/juju_epc.py
+++ b/functest/opnfv_tests/vnf/epc/juju_epc.py
@@ -22,7 +22,7 @@ import yaml
 
 from functest.core import vnf
 from functest.opnfv_tests.openstack.snaps import snaps_utils
-from functest.utils.constants import CONST
+from functest.utils import config
 
 from snaps.config.flavor import FlavorConfig
 from snaps.config.image import ImageConfig
@@ -79,8 +79,6 @@ class JujuEpc(vnf.VnfOnBoarding):
 
     __logger = logging.getLogger(__name__)
 
-    default_region_name = "RegionOne"
-
     def __init__(self, **kwargs):
         if "case_name" not in kwargs:
             kwargs["case_name"] = "juju_epc"
@@ -91,7 +89,7 @@ class JujuEpc(vnf.VnfOnBoarding):
             'functest', 'opnfv_tests/vnf/epc')
         try:
             self.config = getattr(
-                CONST, 'vnf_{}_config'.format(self.case_name))
+                config.CONF, 'vnf_{}_config'.format(self.case_name))
         except Exception:
             raise Exception("VNF config file not found")
         self.config_file = os.path.join(self.case_dir, self.config)
@@ -125,7 +123,7 @@ class JujuEpc(vnf.VnfOnBoarding):
         self.public_auth_url = None
 
         self.res_dir = os.path.join(
-            getattr(CONST, 'dir_results'), self.case_name)
+            getattr(config.CONF, 'dir_results'), self.case_name)
 
     def _bypass_juju_network_discovery_bug(self, name):
         user_creator = OpenStackUser(
@@ -142,8 +140,7 @@ class JujuEpc(vnf.VnfOnBoarding):
         clouds_yaml = os.path.join(self.res_dir, "clouds.yaml")
         cloud_data = {
             'url': self.public_auth_url,
-            'region': os.environ.get(
-                "OS_REGION_NAME", self.default_region_name)}
+            'region': self.snaps_creds.region_name}
         with open(clouds_yaml, 'w') as yfile:
             yfile.write(CLOUD_TEMPLATE.format(**cloud_data))
         if os.system(
@@ -189,17 +186,17 @@ class JujuEpc(vnf.VnfOnBoarding):
     def _add_custom_rule(self, sec_grp_name):
         """ To add custom rule for SCTP Traffic """
         sec_grp_rules = list()
-        security_group_init = OpenStackSecurityGroup(
+        sec_grp_rules.append(
+            SecurityGroupRuleConfig(
+                sec_grp_name=sec_grp_name, direction=Direction.ingress,
+                protocol=Protocol.sctp))
+        security_group = OpenStackSecurityGroup(
             self.snaps_creds,
             SecurityGroupConfig(
                 name=sec_grp_name,
                 rule_settings=sec_grp_rules))
-        security_group_init.initialize()
-        sctp_rule = SecurityGroupRuleConfig(
-            sec_grp_name=sec_grp_name, direction=Direction.ingress,
-            protocol=Protocol.sctp)
-        security_group_init.add_rule(sctp_rule)
-        self.created_object.append(security_group_init)
+        security_group.create()
+        self.created_object.append(security_group)
 
     def prepare(self):
         """Prepare testcase (Additional pre-configuration steps)."""
@@ -231,13 +228,13 @@ class JujuEpc(vnf.VnfOnBoarding):
         """
         self.__logger.info("Deployed Orchestrator")
         private_net_name = getattr(
-            CONST, 'vnf_{}_private_net_name'.format(self.case_name))
+            config.CONF, 'vnf_{}_private_net_name'.format(self.case_name))
         private_subnet_name = getattr(
-            CONST, 'vnf_{}_private_subnet_name'.format(self.case_name))
+            config.CONF, 'vnf_{}_private_subnet_name'.format(self.case_name))
         private_subnet_cidr = getattr(
-            CONST, 'vnf_{}_private_subnet_cidr'.format(self.case_name))
+            config.CONF, 'vnf_{}_private_subnet_cidr'.format(self.case_name))
         abot_router = getattr(
-            CONST, 'vnf_{}_external_router'.format(self.case_name))
+            config.CONF, 'vnf_{}_external_router'.format(self.case_name))
 
         self.__logger.info("Creating full network ...")
         subnet_settings = SubnetConfig(
@@ -278,9 +275,7 @@ class JujuEpc(vnf.VnfOnBoarding):
                 os.system(
                     'juju metadata generate-image -d ~ -i {} -s {} -r '
                     '{} -u {}'.format(
-                        image_id, image_name,
-                        os.environ.get(
-                            "OS_REGION_NAME", self.default_region_name),
+                        image_id, image_name, self.snaps_creds.region_name,
                         self.public_auth_url))
                 self.created_object.append(image_creator)
         self.__logger.info("Network ID  : %s", net_id)