openstack
/
nova
Code Issues Proposed changes

Remove havana compat from nova.consoleauth.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: I253db2fe161add62cb248665c7920126f0d7455f
This commit is contained in:
Russell Bryant 2014-10-25 15:35:47 -04:00
parent d9d04933a4
commit 0469ce366b
2 changed files with 6 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nova/consoleauth/rpcapi.py
View File

@ -67,11 +67,7 @@ class ConsoleAuthAPI(object):
internal_access_path, instance_uuid):
# The remote side doesn't return anything, but we want to block
# until it completes.'
version = '2.0'
if not self.client.can_send_version('2.0'):
# NOTE(russellb) Havana compat
version = '1.2'
cctxt = self.client.prepare(version=version)
cctxt = self.client.prepare()
return cctxt.call(ctxt,
'authorize_console',
token=token, console_type=console_type,
@ -80,19 +76,11 @@ class ConsoleAuthAPI(object):
instance_uuid=instance_uuid)
def check_token(self, ctxt, token):
version = '2.0'
if not self.client.can_send_version('2.0'):
# NOTE(russellb) Havana compat
version = '1.0'
cctxt = self.client.prepare(version=version)
cctxt = self.client.prepare()
return cctxt.call(ctxt, 'check_token', token=token)
def delete_tokens_for_instance(self, ctxt, instance_uuid):
version = '2.0'
if not self.client.can_send_version('2.0'):
# NOTE(russellb) Havana compat
version = '1.2'
cctxt = self.client.prepare(version=version)
cctxt = self.client.prepare()
return cctxt.cast(ctxt,
'delete_tokens_for_instance',
instance_uuid=instance_uuid)

25
nova/tests/unit/consoleauth/test_rpcapi.py
View File

@ -39,7 +39,6 @@ class ConsoleAuthRpcAPITestCase(test.NoDBTestCase):
self.assertEqual(rpcapi.client.target.topic, CONF.consoleauth_topic)
orig_prepare = rpcapi.client.prepare
expected_version = kwargs.pop('version', rpcapi.client.target.version)
with contextlib.nested(
mock.patch.object(rpcapi.client, 'cast' if do_cast else 'call'),
@ -51,12 +50,12 @@ class ConsoleAuthRpcAPITestCase(test.NoDBTestCase):
prepare_mock.return_value = rpcapi.client
rpc_mock.return_value = None if do_cast else 'foo'
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_authorize_console(self):
@ -64,28 +63,10 @@ class ConsoleAuthRpcAPITestCase(test.NoDBTestCase):
console_type='ctype', host='h', port='p',
internal_access_path='iap', instance_uuid="instance")
# NOTE(russellb) Havana compat
self.flags(consoleauth='havana', group='upgrade_levels')
self._test_consoleauth_api('authorize_console', token='token',
console_type='ctype', host='h', port='p',
internal_access_path='iap', instance_uuid="instance",
version='1.2')
def test_check_token(self):
self._test_consoleauth_api('check_token', token='t')
# NOTE(russellb) Havana compat
self.flags(consoleauth='havana', group='upgrade_levels')
self._test_consoleauth_api('check_token', token='t', version='1.0')
def test_delete_tokens_for_instance(self):
def test_delete_tokens_for_instnace(self):
self._test_consoleauth_api('delete_tokens_for_instance',
_do_cast=True,
instance_uuid="instance")
# NOTE(russellb) Havana compat
self.flags(consoleauth='havana', group='upgrade_levels')
self._test_consoleauth_api('delete_tokens_for_instance',
_do_cast=True,
instance_uuid="instance",
version='1.2')