X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=functest%2Fopnfv_tests%2Fopenstack%2Ftempest%2Fconf_utils.py;h=338fa51ca0572d908194ebd4d066518d9f334fc1;hb=1da4b519f8e73d3be9e37f9d72367654bf662e63;hp=6a3d2d6e810ecd6c3d87697d1b5d06ab4bed5084;hpb=11376429e4a807790da32ea9b9eaf4856530baee;p=functest.git

diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 6a3d2d6e8..338fa51ca 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -10,21 +10,21 @@
 
 """Tempest configuration utilities."""
 
-import ConfigParser
+from __future__ import print_function
+
 import logging
 import fileinput
 import os
 import subprocess
 
 import pkg_resources
+from six.moves import configparser
 import yaml
 
 from functest.utils import config
 from functest.utils import env
 
 
-IMAGE_ID_ALT = None
-FLAVOR_ID_ALT = None
 RALLY_CONF_PATH = "/etc/rally/rally.conf"
 RALLY_AARCH64_PATCH_PATH = pkg_resources.resource_filename(
     'functest', 'ci/rally_aarch64_patch.conf')
@@ -44,7 +44,7 @@ CI_INSTALLER_TYPE = env.get('INSTALLER_TYPE')
 LOGGER = logging.getLogger(__name__)
 
 
-def create_rally_deployment():
+def create_rally_deployment(environ=None):
     """Create new rally deployment"""
     # set the architecture to default
     pod_arch = env.get("POD_ARCH")
@@ -55,10 +55,10 @@ def create_rally_deployment():
         with open(RALLY_AARCH64_PATCH_PATH, "r") as pfile:
             rally_patch_conf = pfile.read()
 
-        for line in fileinput.input(RALLY_CONF_PATH, inplace=1):
-            print line,
+        for line in fileinput.input(RALLY_CONF_PATH):
+            print(line, end=' ')
             if "cirros|testvm" in line:
-                print rally_patch_conf
+                print(rally_patch_conf)
 
     LOGGER.info("Creating Rally environment...")
 
@@ -73,7 +73,7 @@ def create_rally_deployment():
 
     cmd = ['rally', 'deployment', 'create', '--fromenv',
            '--name', str(getattr(config.CONF, 'rally_deployment_name'))]
-    output = subprocess.check_output(cmd)
+    output = subprocess.check_output(cmd, env=environ)
     LOGGER.info("%s\n%s", " ".join(cmd), output)
 
     cmd = ['rally', 'deployment', 'check']
@@ -183,33 +183,33 @@ def update_tempest_conf_file(conf_file, rconfig):
         rconfig.write(config_file)
 
 
-def configure_tempest_update_params(tempest_conf_file,
-                                    network_name=None, image_id=None,
-                                    flavor_id=None, compute_cnt=1):
+def configure_tempest_update_params(
+        tempest_conf_file, network_name=None, image_id=None, flavor_id=None,
+        compute_cnt=1, image_alt_id=None, flavor_alt_id=None):
     # pylint: disable=too-many-branches, too-many-arguments
     """
     Add/update needed parameters into tempest.conf file
     """
     LOGGER.debug("Updating selected tempest.conf parameters...")
-    rconfig = ConfigParser.RawConfigParser()
+    rconfig = configparser.RawConfigParser()
     rconfig.read(tempest_conf_file)
     rconfig.set('compute', 'fixed_network_name', network_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:
-        rconfig.set('compute', 'image_ref_alt', IMAGE_ID_ALT)
-    if getattr(config.CONF, 'tempest_use_custom_flavors'):
-        if flavor_id is not None:
-            rconfig.set('compute', 'flavor_ref', flavor_id)
-        if FLAVOR_ID_ALT is not None:
-            rconfig.set('compute', 'flavor_ref_alt', FLAVOR_ID_ALT)
+    if image_alt_id is not None:
+        rconfig.set('compute', 'image_ref_alt', image_alt_id)
+    if flavor_id is not None:
+        rconfig.set('compute', 'flavor_ref', flavor_id)
+    if flavor_alt_id is not None:
+        rconfig.set('compute', 'flavor_ref_alt', flavor_alt_id)
     if compute_cnt > 1:
         # enable multinode tests
         rconfig.set('compute', 'min_compute_nodes', compute_cnt)
         rconfig.set('compute-feature-enabled', 'live_migration', True)
-
-    rconfig.set('identity', 'region', os.environ.get('OS_REGION_NAME'))
+    rconfig.set('compute-feature-enabled', 'shelve', False)
+    if os.environ.get('OS_REGION_NAME'):
+        rconfig.set('identity', 'region', os.environ.get('OS_REGION_NAME'))
     identity_api_version = os.environ.get("OS_IDENTITY_API_VERSION", '3')
     if identity_api_version == '3':
         auth_version = 'v3'
@@ -223,20 +223,19 @@ def configure_tempest_update_params(tempest_conf_file,
     rconfig.set('object-storage', 'operator_role',
                 getattr(config.CONF, 'tempest_object_storage_operator_role'))
 
-    if os.environ.get('OS_ENDPOINT_TYPE') is not None:
-        rconfig.set('identity', 'v3_endpoint_type',
-                    os.environ.get('OS_ENDPOINT_TYPE'))
-
-    if os.environ.get('OS_ENDPOINT_TYPE') is not None:
-        sections = rconfig.sections()
-        services_list = [
-            'compute', 'volume', 'image', 'network', 'data-processing',
-            'object-storage', 'orchestration']
-        for service in services_list:
-            if service not in sections:
-                rconfig.add_section(service)
-            rconfig.set(service, 'endpoint_type',
-                        os.environ.get('OS_ENDPOINT_TYPE'))
+    rconfig.set(
+        'identity', 'v3_endpoint_type',
+        os.environ.get('OS_INTERFACE', 'public'))
+
+    sections = rconfig.sections()
+    services_list = [
+        'compute', 'volume', 'image', 'network', 'data-processing',
+        'object-storage', 'orchestration']
+    for service in services_list:
+        if service not in sections:
+            rconfig.add_section(service)
+        rconfig.set(
+            service, 'endpoint_type', os.environ.get('OS_INTERFACE', 'public'))
 
     LOGGER.debug('Add/Update required params defined in tempest_conf.yaml '
                  'into tempest.conf file')