openstack
/
nova
Code Issues Proposed changes

Remove havana compat from nova.console.rpcapi 

Since we only support upgrading from N-1 to N, there's no
need to keep around this older upgrade related code.

Change-Id: I663b77230cb0ca87c31a4dfd6cddaf10c588a000
This commit is contained in:
Russell Bryant 2014-10-25 15:38:33 -04:00
parent 0469ce366b
commit b494ec6579
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nova/console/rpcapi.py
View File

@ -69,19 +69,10 @@ class ConsoleAPI(object):
CONF.upgrade_levels.console)
self.client = rpc.get_client(target, version_cap=version_cap)
def _get_compat_version(self, current, havana_compat):
if not self.client.can_send_version(current):
return havana_compat
return current
def add_console(self, ctxt, instance_id):
# NOTE(russellb) Havana compat
version = self._get_compat_version('2.0', '1.0')
cctxt = self.client.prepare(version=version)
cctxt = self.client.prepare()
cctxt.cast(ctxt, 'add_console', instance_id=instance_id)
def remove_console(self, ctxt, console_id):
# NOTE(russellb) Havana compat
version = self._get_compat_version('2.0', '1.0')
cctxt = self.client.prepare(version=version)
cctxt = self.client.prepare()
cctxt.cast(ctxt, 'remove_console', console_id=console_id)

15
nova/tests/unit/console/test_rpcapi.py
View File

@ -37,7 +37,6 @@ class ConsoleRpcAPITestCase(test.NoDBTestCase):
self.assertEqual(rpcapi.client.target.topic, CONF.console_topic)
orig_prepare = rpcapi.client.prepare
expected_version = kwargs.pop('version', rpcapi.client.target.version)
with contextlib.nested(
mock.patch.object(rpcapi.client, rpc_method),
@ -49,28 +48,18 @@ class ConsoleRpcAPITestCase(test.NoDBTestCase):
prepare_mock.return_value = rpcapi.client
rpc_mock.return_value = 'foo' if rpc_method == 'call' else None
csv_mock.side_effect = (
lambda v: orig_prepare(version=v).can_send_version())
lambda v: orig_prepare().can_send_version())
retval = getattr(rpcapi, method)(ctxt, **kwargs)
self.assertEqual(retval, rpc_mock.return_value)
prepare_mock.assert_called_once_with(version=expected_version)
prepare_mock.assert_called_once_with()
rpc_mock.assert_called_once_with(ctxt, method, **kwargs)
def test_add_console(self):
self._test_console_api('add_console', instance_id='i',
rpc_method='cast')
# NOTE(russellb) Havana compat
self.flags(console='havana', group='upgrade_levels')
self._test_console_api('add_console', instance_id='i',
rpc_method='cast', version='1.0')
def test_remove_console(self):
self._test_console_api('remove_console', console_id='i',
rpc_method='cast')
# NOTE(russellb) Havana compat
self.flags(console='havana', group='upgrade_levels')
self._test_console_api('remove_console', console_id='i',
rpc_method='cast', version='1.0')