Change api version 71/31771/1
authorDimitri Mazmanov <dimitri.mazmanov@ericsson.com>
Fri, 24 Mar 2017 10:59:41 +0000 (11:59 +0100)
committerJose Lausuch <jose.lausuch@ericsson.com>
Sat, 25 Mar 2017 15:20:57 +0000 (15:20 +0000)
The api_version had full API url instead of just the version.

Change-Id: I78b39ea5d39e1ffab54d2bca41df96aadd47ac86
Signed-off-by: Dimitri Mazmanov <dimitri.mazmanov@ericsson.com>
(cherry picked from commit 3fb0175dab6d60af2fe40274fab19abf3ea6162f)

functest/opnfv_tests/openstack/tempest/conf_utils.py

index 1b71826..f4a94f6 100644 (file)
@@ -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)