aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--functest/opnfv_tests/openstack/tempest/conf_utils.py7
-rw-r--r--functest/opnfv_tests/vnf/epc/juju_epc.py9
2 files changed, 9 insertions, 7 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index b3d0d0139..95777ea90 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -233,12 +233,7 @@ def configure_tempest_update_params(tempest_conf_file, res_dir,
rconfig = ConfigParser.RawConfigParser()
rconfig.read(tempest_conf_file)
rconfig.set('compute', 'fixed_network_name', network_name)
- if CI_INSTALLER_TYPE == 'fuel':
- # backward compatibility till Fuel jobs set the right env var
- rconfig.set('compute', 'volume_device_name', 'vdc')
- else:
- rconfig.set(
- 'compute', 'volume_device_name', env.get('VOLUME_DEVICE_NAME'))
+ rconfig.set('compute', 'volume_device_name', env.get('VOLUME_DEVICE_NAME'))
if image_id is not None:
rconfig.set('compute', 'image_ref', image_id)
if IMAGE_ID_ALT is not None:
diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py
index 0239e11d9..39678916d 100644
--- a/functest/opnfv_tests/vnf/epc/juju_epc.py
+++ b/functest/opnfv_tests/vnf/epc/juju_epc.py
@@ -284,10 +284,17 @@ 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"
os.system(
'juju metadata generate-image -d ~ -i {} -s {} -r '
'{} -u {}'.format(
- image_id, image_name, self.snaps_creds.region_name,
+ image_id, image_name, region,
self.public_auth_url))
self.created_object.append(image_creator)
self.__logger.info("Network ID : %s", net_id)