openstack
/
heat
Code Issues Proposed changes

Merge "Add support different versions for nova client"

This commit is contained in:
Jenkins 2016-11-14 05:38:50 +00:00 committed by Gerrit Code Review
parent 6f998af1e5 ce64d23e49
commit 2fb786c568
2 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
heat/engine/clients/os/nova.py
View File

@ -40,7 +40,6 @@ from heat.engine import constraints
LOG = logging.getLogger(__name__)
NOVA_API_VERSION = "2.1"
CLIENT_NAME = 'nova'
@ -59,11 +58,24 @@ class NovaClientPlugin(client_plugin.ClientPlugin):
exceptions_module = exceptions
supported_versions = [
NOVA_API_VERSION, V2_26
] = [
'2.1', '2.26'
]
service_types = [COMPUTE] = ['compute']
def _create(self):
def _get_service_name(self):
return self.COMPUTE
def _create(self, version=None):
if not version:
# TODO(prazumovsky): remove all unexpected calls from tests and
# add default_version after that.
version = self.NOVA_API_VERSION
endpoint_type = self._get_client_option(CLIENT_NAME, 'endpoint_type')
extensions = nc.discover_extensions(NOVA_API_VERSION)
extensions = nc.discover_extensions(version)
args = {
'session': self.context.keystone_session,
@ -75,7 +87,15 @@ class NovaClientPlugin(client_plugin.ClientPlugin):
'http_log_debug')
}
client = nc.Client(NOVA_API_VERSION, **args)
client = nc.Client(version, **args)
# NOTE: check for microversion availability
if version == self.V2_26:
try:
client.versions.get_current()
except exceptions.NotAcceptable:
raise exception.InvalidServiceVersion(service=self.COMPUTE,
version=version)
return client
def is_not_found(self, ex):

22
heat/tests/clients/test_nova_client.py
View File

@ -52,6 +52,28 @@ class NovaClientPluginTest(NovaClientPluginTestCase):
ext_mock.assert_called_once_with('2.1')
self.assertIsNotNone(client.servers)
def test_v2_26_create(self):
ctxt = utils.dummy_context()
ext_mock = self.patchobject(nc, 'discover_extensions')
self.patchobject(nc, 'Client', return_value=mock.Mock())
plugin = ctxt.clients.client_plugin('nova')
plugin.client(version=plugin.V2_26)
ext_mock.assert_called_once_with(plugin.V2_26)
def test_v2_26_create_failed(self):
ctxt = utils.dummy_context()
self.patchobject(nc, 'discover_extensions')
plugin = ctxt.clients.client_plugin('nova')
client_stub = mock.Mock()
client_stub.versions.get_current.side_effect = [
nova_exceptions.NotAcceptable(406)]
self.patchobject(nc, 'Client', return_value=client_stub)
self.assertRaises(exception.InvalidServiceVersion, plugin.client,
plugin.V2_26)
def test_get_ip(self):
my_image = mock.MagicMock()
my_image.addresses = {