openstack
/
nova
Code Issues Proposed changes

Merge "Limit get_sdk_adapter to requested service type"

This commit is contained in:
Zuul 2019-08-22 20:13:32 +00:00 committed by Gerrit Code Review
parent efbe94cd7d 4412a90cf1
commit 5559236b11
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/tests/unit/test_utils.py
View File

@ -1325,8 +1325,9 @@ class TestGetSDKAdapter(test.NoDBTestCase):
self.assertEqual(actual, mock_proxy)
mock_get_confgrp.assert_called_once_with(service_type)
mock_get_auth_sess.assert_called_once_with(mock_confgrp)
mock_connection.assert_called_once_with(session=mock_session,
oslo_conf=mock_conf)
mock_connection.assert_called_once_with(
session=mock_session, oslo_conf=mock_conf,
service_types={'test_service'})
@mock.patch('nova.utils._get_conf_group')
@mock.patch('nova.utils._get_auth_and_session')

3
nova/utils.py
View File

@ -1024,7 +1024,8 @@ def get_sdk_adapter(service_type):
"""
confgrp = _get_conf_group(service_type)
_, sess = _get_auth_and_session(confgrp)
conn = connection.Connection(session=sess, oslo_conf=CONF)
conn = connection.Connection(
session=sess, oslo_conf=CONF, service_types={service_type})
return getattr(conn, service_type)