diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-04-11 12:25:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-11 12:25:32 +0000 |
| commit | 1ea1acc52de313eebb4cecd250f6a2b93fd628f5 (patch) | |
| tree | c7c571909f4149cddc1a59b593c3968b0330e6dd | |
| parent | 8c9c39b911a15c8468983cbeee2a6f46abb75dd8 (diff) | |
| parent | 9a4400b3b91bb74f2ab8d6b1b66e1309a5bd1c15 (diff) | |
Merge "Remove obsolete apex processing in juju_epc" into stable/fraser
| -rw-r--r-- | functest/opnfv_tests/vnf/epc/juju_epc.py | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py index 0f1ef48f8..d8e24cb18 100644 --- a/functest/opnfv_tests/vnf/epc/juju_epc.py +++ b/functest/opnfv_tests/vnf/epc/juju_epc.py @@ -143,16 +143,9 @@ class JujuEpc(vnf.VnfOnBoarding): def _register_cloud(self): self.__logger.info("Creating Cloud for Abot-epc .....") clouds_yaml = os.path.join(self.res_dir, "clouds.yaml") - # It allows gating APEX and ensures this testcase is working till - # https://jira.opnfv.org/browse/APEX-570 is fixed in APEX. - # It must be removed as soon as possible to disable per installer - # processing in Functest. - region = self.snaps_creds.region_name - if not region and env.get('INSTALLER_TYPE') == 'apex': - region = "regionOne" cloud_data = { 'url': self.public_auth_url, - 'region': region} + 'region': self.snaps_creds.region_name} with open(clouds_yaml, 'w') as yfile: yfile.write(CLOUD_TEMPLATE.format(**cloud_data)) cmd = ['juju', 'add-cloud', 'abot-epc', '-f', clouds_yaml, '--replace'] @@ -291,16 +284,10 @@ class JujuEpc(vnf.VnfOnBoarding): name=image_name, image_user='cloud', img_format='qcow2', image_file=image_file)) image_id = image_creator.create().id - # It allows gating APEX and ensures this testcase is working - # till https://jira.opnfv.org/browse/APEX-570 is fixed in APEX. - # It must be removed as soon as possible to disable per - # installer processing in Functest. - region = self.snaps_creds.region_name - if not region and env.get('INSTALLER_TYPE') == 'apex': - region = "regionOne" - cmd = ['juju', 'metadata', 'generate-image', '-d', '~', '-i', - image_id, '-s', image_name, '-r', region, '-u', - self.public_auth_url] + cmd = ['juju', 'metadata', 'generate-image', '-d', '~', + '-i', image_id, '-s', image_name, + '-r', self.snaps_creds.region_name, + '-u', self.public_auth_url] output = subprocess.check_output(cmd) self.__logger.info("%s\n%s", " ".join(cmd), output) self.created_object.append(image_creator) |