diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-02-22 17:43:35 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-02-22 19:41:31 +0100 |
| commit | 9f7c63ffaf64b3ca81ae86a0b3477e5007916fcd (patch) | |
| tree | 71d1e082404d4356a1f3491482c03bbb6a6914a5 /functest/opnfv_tests/vnf/epc/juju_epc.py | |
| parent | d701e9737f83ff29faba830df426b5a75c9746b1 (diff) | |
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>
Diffstat (limited to 'functest/opnfv_tests/vnf/epc/juju_epc.py')
| -rw-r--r-- | functest/opnfv_tests/vnf/epc/juju_epc.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py index 68979186..3b62a9a1 100644 --- 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 @@ -89,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) @@ -123,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( @@ -228,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( |