Support nova client micro versions

Support micro versions when requesting a nova client.
This commit is contained in:
Liam Young
2020-11-18 09:36:44 +00:00
parent c91ebb5ec4
commit b23d9e285b
2 changed files with 14 additions and 2 deletions
@@ -289,6 +289,15 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
openstack_utils.get_undercloud_keystone_session()
self.get_keystone_session.assert_called_once_with(_auth, verify=None)
def test_get_nova_session_client(self):
session_mock = mock.MagicMock()
self.patch_object(openstack_utils.novaclient_client, "Client")
openstack_utils.get_nova_session_client(session_mock)
self.Client.assert_called_once_with(2, session=session_mock)
self.Client.reset_mock()
openstack_utils.get_nova_session_client(session_mock, version=2.56)
self.Client.assert_called_once_with(2.56, session=session_mock)
def test_get_urllib_opener(self):
self.patch_object(openstack_utils.urllib.request, "ProxyHandler")
self.patch_object(openstack_utils.urllib.request, "HTTPHandler")
+5 -2
View File
@@ -253,15 +253,18 @@ def get_designate_session_client(**kwargs):
**kwargs)
def get_nova_session_client(session):
def get_nova_session_client(session, version=None):
"""Return novaclient authenticated by keystone session.
:param session: Keystone session object
:type session: keystoneauth1.session.Session object
:param version: Version of client to request.
:type version: float
:returns: Authenticated novaclient
:rtype: novaclient.Client object
"""
return novaclient_client.Client(2, session=session)
version = version or 2
return novaclient_client.Client(version, session=session)
def get_neutron_session_client(session):