Remove obsolete apex processing in juju_epc

It has been useless since [1] was merged

[1] https://jira.opnfv.org/browse/APEX-570

Change-Id: Id89b75d8cad9e180a02189450e13fa1e61b1239c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 941838f1b7e574e738b359ee3bb542d04eb97176)

diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py
index 0f1ef48..d8e24cb 100644 (file)
--- 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)