openstack/rally-openstack
Code Issues Proposed changes

Merge "[osclients] use keystone auth_ref directly"

Browse Source
This commit is contained in:
Jenkins 2016-09-01 11:57:00 +00:00 committed by Gerrit Code Review
commit b2b03cac72
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rally/plugins/openstack/context/api_versions.py
View File

@ -191,7 +191,7 @@ class OpenStackAPIVersions(context.Context):
self.context.get("admin", {}).get("credential")) self.context.get("admin", {}).get("credential"))
clients = osclients.Clients(random.choice( clients = osclients.Clients(random.choice(
self.context["users"])["credential"]) self.context["users"])["credential"])
services = clients.keystone().service_catalog.get_endpoints() services = clients.keystone.service_catalog.get_endpoints()
services_from_admin = None services_from_admin = None
for client_name, conf in six.iteritems(self.config): for client_name, conf in six.iteritems(self.config):
if "service_type" in conf and conf["service_type"] not in services: if "service_type" in conf and conf["service_type"] not in services:

14
tests/unit/plugins/openstack/context/test_api_versions.py
View File

@ -24,8 +24,10 @@ class OpenStackServicesTestCase(test.TestCase):
def setUp(self): def setUp(self):
super(OpenStackServicesTestCase, self).setUp() super(OpenStackServicesTestCase, self).setUp()
self.mock_clients = mock.patch("rally.osclients.Clients").start() self.mock_clients = mock.patch("rally.osclients.Clients").start()
self.mock_kc = self.mock_clients.return_value.keystone.return_value osclient_kc = self.mock_clients.return_value.keystone
self.mock_kc.service_catalog.get_endpoints.return_value = [] self.mock_kc = osclient_kc.return_value
self.service_catalog = osclient_kc.service_catalog
self.service_catalog.get_endpoints.return_value = []
self.mock_kc.services.list.return_value = [] self.mock_kc.services.list.return_value = []
def test_validate_correct_config(self): def test_validate_correct_config(self):
@ -85,7 +87,7 @@ class OpenStackServicesTestCase(test.TestCase):
"users": [{"credential": mock.MagicMock()}]} "users": [{"credential": mock.MagicMock()}]}
ctx = api_versions.OpenStackAPIVersions(context) ctx = api_versions.OpenStackAPIVersions(context)
self.assertRaises(exceptions.ValidationError, ctx.setup) self.assertRaises(exceptions.ValidationError, ctx.setup)
self.mock_kc.service_catalog.get_endpoints.assert_called_once_with() self.service_catalog.get_endpoints.assert_called_once_with()
self.mock_kc.services.list.assert_called_once_with() self.mock_kc.services.list.assert_called_once_with()
def test_setup_with_wrong_service_name_and_without_admin(self): def test_setup_with_wrong_service_name_and_without_admin(self):
@ -95,7 +97,7 @@ class OpenStackServicesTestCase(test.TestCase):
"users": [{"credential": mock.MagicMock()}]} "users": [{"credential": mock.MagicMock()}]}
ctx = api_versions.OpenStackAPIVersions(context) ctx = api_versions.OpenStackAPIVersions(context)
self.assertRaises(exceptions.BenchmarkSetupFailure, ctx.setup) self.assertRaises(exceptions.BenchmarkSetupFailure, ctx.setup)
self.mock_kc.service_catalog.get_endpoints.assert_called_once_with() self.service_catalog.get_endpoints.assert_called_once_with()
self.assertFalse(self.mock_kc.services.list.called) self.assertFalse(self.mock_kc.services.list.called)
def test_setup_with_wrong_service_type(self): def test_setup_with_wrong_service_type(self):
@ -105,7 +107,7 @@ class OpenStackServicesTestCase(test.TestCase):
"users": [{"credential": mock.MagicMock()}]} "users": [{"credential": mock.MagicMock()}]}
ctx = api_versions.OpenStackAPIVersions(context) ctx = api_versions.OpenStackAPIVersions(context)
self.assertRaises(exceptions.ValidationError, ctx.setup) self.assertRaises(exceptions.ValidationError, ctx.setup)
self.mock_kc.service_catalog.get_endpoints.assert_called_once_with() self.service_catalog.get_endpoints.assert_called_once_with()
def test_setup_with_service_name(self): def test_setup_with_service_name(self):
self.mock_kc.services.list.return_value = [ self.mock_kc.services.list.return_value = [
@ -118,7 +120,7 @@ class OpenStackServicesTestCase(test.TestCase):
ctx = api_versions.OpenStackAPIVersions(context) ctx = api_versions.OpenStackAPIVersions(context)
ctx.setup() ctx.setup()
self.mock_kc.service_catalog.get_endpoints.assert_called_once_with() self.service_catalog.get_endpoints.assert_called_once_with()
self.mock_kc.services.list.assert_called_once_with() self.mock_kc.services.list.assert_called_once_with()
self.assertEqual( self.assertEqual(