diff --git a/rally/plugins/openstack/credential.py b/rally/plugins/openstack/credential.py index 79c4990f..7ebf0da5 100644 --- a/rally/plugins/openstack/credential.py +++ b/rally/plugins/openstack/credential.py @@ -15,14 +15,12 @@ from rally.common import logging from rally import consts -from rally.deployment import credential from rally.plugins.openstack import osclients LOG = logging.getLogger(__file__) -@credential.configure("openstack") -class OpenStackCredential(credential.Credential): +class OpenStackCredential(object): """Credential for OpenStack.""" def __init__(self, auth_url, username, password, tenant_name=None, diff --git a/rally/plugins/openstack/platforms/existing.py b/rally/plugins/openstack/platforms/existing.py index 6f0fa7bc..123a11bb 100644 --- a/rally/plugins/openstack/platforms/existing.py +++ b/rally/plugins/openstack/platforms/existing.py @@ -173,3 +173,6 @@ class OpenStack(platform.Platform): "services": osclients.Clients(active_user).list_services() } } + + def _get_validation_context(self): + return {"users@openstack": {}} diff --git a/tests/unit/plugins/openstack/test_credential.py b/tests/unit/plugins/openstack/test_credential.py index b6bdc51c..c69f6c82 100644 --- a/tests/unit/plugins/openstack/test_credential.py +++ b/tests/unit/plugins/openstack/test_credential.py @@ -16,7 +16,7 @@ import mock from rally import consts -from rally.deployment import credential +from rally.plugins.openstack import credential from tests.unit import test @@ -24,8 +24,7 @@ class OpenStackCredentialTestCase(test.TestCase): def setUp(self): super(OpenStackCredentialTestCase, self).setUp() - cred_cls = credential.get("openstack") - self.credential = cred_cls( + self.credential = credential.OpenStackCredential( "foo_url", "foo_user", "foo_password", tenant_name="foo_tenant", permission=consts.EndpointPermission.ADMIN)