openstack/rally-openstack
Code Issues Proposed changes

Merge "Fix auth issue in verification"

Browse Source
This commit is contained in:
Jenkins 2017-09-26 23:52:56 +00:00 committed by Gerrit Code Review
commit 776fe28e97
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rally/plugins/openstack/verification/tempest/config.ini
View File

@ -23,6 +23,8 @@ attach_encrypted_volume = False
[identity] [identity]
[identity-feature-enabled]
[image-feature-enabled] [image-feature-enabled]
deactivate_image = True deactivate_image = True

15
rally/plugins/openstack/verification/tempest/config.py
View File

@ -19,7 +19,6 @@ import os
from oslo_config import cfg from oslo_config import cfg
import six import six
from six.moves import configparser from six.moves import configparser
from six.moves.urllib import parse
from rally.common import logging from rally.common import logging
from rally import exceptions from rally import exceptions
@ -95,17 +94,19 @@ class TempestConfigfileManager(object):
uri_v3 = versions[3] uri_v3 = versions[3]
target_version = 3 target_version = 3
elif set(versions.keys()) == {2} or set(versions.keys()) == {3}: elif set(versions.keys()) == {2} or set(versions.keys()) == {3}:
# only one version is available while discovering, let's just # only one version is available while discovering
# guess the second auth_url (it should not be used)
# get the most recent version # get the most recent version
target_version = sorted(versions.keys())[-1] target_version = sorted(versions.keys())[-1]
if target_version == 2: if target_version == 2:
uri = self.credential.auth_url uri = versions[2]
uri_v3 = parse.urljoin(uri, "/v3") uri_v3 = os.path.join(cropped_auth_url, "v3")
else: else:
uri_v3 = self.credential.auth_url # keystone v2 is disabled. let's do it explicitly
uri = parse.urljoin(uri_v3, "/v2.0") self.conf.set("identity-feature-enabled", "api_v2",
"False")
uri_v3 = versions[3]
uri = os.path.join(cropped_auth_url, "v2.0")
else: else:
# Does Keystone released new version of API ?! # Does Keystone released new version of API ?!
LOG.debug("Discovered keystone versions: %s", versions) LOG.debug("Discovered keystone versions: %s", versions)

2
tests/ci/rally_verify.py
View File

@ -325,7 +325,7 @@ class RunVerification(Step):
def run(self): def run(self):
super(RunVerification, self).run() super(RunVerification, self).run()
if False and "Success: 0" in self.result["output"]: if "Success: 0" in self.result["output"]:
self.result["status"] = Status.FAILURE self.result["status"] = Status.FAILURE

12
tests/unit/plugins/openstack/verification/tempest/test_config.py
View File

@ -105,18 +105,20 @@ class TempestConfigfileManagerTestCase(test.TestCase):
# case #5: only one version is discoverable; # case #5: only one version is discoverable;
{"auth_url": "http://example.com", {"auth_url": "http://example.com",
"data": [{"version": (2, 0), "url": "foo2.com"}], "data": [{"version": (2, 0), "url": "foo2.com"}],
"ex_uri": "http://example.com", "ex_auth_version": "v2", "ex_uri": "foo2.com", "ex_auth_version": "v2",
"ex_uri_v3": "http://example.com/v3"}, "ex_uri_v3": "http://example.com/v3"},
# case #6: the same case, but keystone v3 is discoverable # case #6: the same case, but keystone v3 is discoverable
{"auth_url": "http://example.com", {"auth_url": "http://example.com",
"data": [{"version": (3, 0), "url": "foo3.com"}], "data": [{"version": (3, 0), "url": "foo3.com"}],
"ex_uri": "http://example.com/v2.0", "ex_auth_version": "v3", "ex_uri": "http://example.com/v2.0", "ex_auth_version": "v3",
"ex_uri_v3": "http://example.com"} "ex_uri_v3": "foo3.com",
"ex_v2_off": True}
) )
@ddt.unpack @ddt.unpack
def test__configure_identity(self, auth_url, data, ex_uri, def test__configure_identity(self, auth_url, data, ex_uri,
ex_uri_v3, ex_auth_version): ex_uri_v3, ex_auth_version, ex_v2_off=False):
self.tempest.conf.add_section("identity") self.tempest.conf.add_section("identity")
self.tempest.conf.add_section("identity-feature-enabled")
self.tempest.credential.auth_url = auth_url self.tempest.credential.auth_url = auth_url
process_url = osclients.Keystone( process_url = osclients.Keystone(
self.tempest.credential, 0, 0)._remove_url_version self.tempest.credential, 0, 0)._remove_url_version
@ -141,6 +143,10 @@ class TempestConfigfileManagerTestCase(test.TestCase):
CRED["https_insecure"]), CRED["https_insecure"]),
"ca_certificates_file": CRED["https_cacert"]} "ca_certificates_file": CRED["https_cacert"]}
self.assertEqual(expected, dict(self.tempest.conf.items("identity"))) self.assertEqual(expected, dict(self.tempest.conf.items("identity")))
if ex_v2_off:
self.assertEqual(
"False",
self.tempest.conf.get("identity-feature-enabled", "api_v2"))
def test__configure_network_if_neutron(self): def test__configure_network_if_neutron(self):
self.tempest.available_services = ["neutron"] self.tempest.available_services = ["neutron"]