From: Dimitri Mazmanov Date: Fri, 24 Mar 2017 10:59:41 +0000 (+0100) Subject: Change api version X-Git-Tag: danube.1.RC1~15^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F71%2F31771%2F1;p=functest.git Change api version The api_version had full API url instead of just the version. Change-Id: I78b39ea5d39e1ffab54d2bca41df96aadd47ac86 Signed-off-by: Dimitri Mazmanov (cherry picked from commit 3fb0175dab6d60af2fe40274fab19abf3ea6162f) --- diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 1b7182692..f4a94f654 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -341,7 +341,7 @@ def configure_tempest_multisite_params(tempest_conf_file): # cmd = ("openstack endpoint show kingbird | grep publicurl |" # "awk '{print $4}' | awk -F '/' '{print $4}'") # kingbird_api_version = os.popen(cmd).read() - kingbird_api_version = os_utils.get_endpoint(service_type='multisite') + # kingbird_api_version = os_utils.get_endpoint(service_type='multisite') if CI_INSTALLER_TYPE == 'fuel': # For MOS based setup, the service is accessible @@ -399,7 +399,7 @@ def configure_tempest_multisite_params(tempest_conf_file): config.set('kingbird', 'endpoint_type', 'publicURL') config.set('kingbird', 'TIME_TO_SYNC', '120') config.set('kingbird', 'endpoint_url', kingbird_endpoint_url) - config.set('kingbird', 'api_version', kingbird_api_version) + config.set('kingbird', 'api_version', 'v1.0') with open(tempest_conf_file, 'wb') as config_file: config.write(config_file)