openstack/nova
Code Issues Proposed changes

Remove consoleauth 1.X rpc api

Browse Source 
A previous change adding support for the 2.x rpc interface but retained
compatibility with 1.x as a transition point.  This commit removes the
old API from the server side.

UpgradeImpact

Part of blueprint rpc-major-version-updates-icehouse

Change-Id: I523c3fd605352cb83463a6040ba1f6eb30630810
This commit is contained in:
Russell Bryant
2013-10-14 19:00:51 -04:00
parent 1f93e63b6e
commit 02619bfd20
2 changed files with 11 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
nova/consoleauth/manager.py
View File

@@ -50,7 +50,7 @@ CONF.import_opt('enable', 'nova.cells.opts', group='cells')
class ConsoleAuthManager(manager.Manager):
"""Manages token based authentication."""
RPC_API_VERSION = '1.2'
RPC_API_VERSION = '2.0'
def __init__(self, scheduler_driver=None, *args, **kwargs):
super(ConsoleAuthManager, self).__init__(service_name='consoleauth',
@@ -59,13 +59,6 @@ class ConsoleAuthManager(manager.Manager):
self.compute_rpcapi = compute_rpcapi.ComputeAPI()
self.cells_rpcapi = cells_rpcapi.CellsAPI()
def create_rpc_dispatcher(self, backdoor_port=None, additional_apis=None):
if not additional_apis:
additional_apis = []
additional_apis.append(_ConsoleAuthManagerV2Proxy(self))
return super(ConsoleAuthManager, self).create_rpc_dispatcher(
backdoor_port, additional_apis)
def _get_tokens_for_instance(self, instance_uuid):
tokens_str = self.mc.get(instance_uuid.encode('UTF-8'))
if not tokens_str:
@@ -75,7 +68,7 @@ class ConsoleAuthManager(manager.Manager):
return tokens
def authorize_console(self, context, token, console_type, host, port,
internal_access_path, instance_uuid=None):
internal_access_path, instance_uuid):
token_dict = {'token': token,
'instance_uuid': instance_uuid,
@@ -86,16 +79,15 @@ class ConsoleAuthManager(manager.Manager):
'last_activity_at': time.time()}
data = jsonutils.dumps(token_dict)
self.mc.set(token.encode('UTF-8'), data, CONF.console_token_ttl)
if instance_uuid is not None:
tokens = self._get_tokens_for_instance(instance_uuid)
# Remove the expired tokens from cache.
for tok in tokens:
token_str = self.mc.get(tok.encode('UTF-8'))
if not token_str:
tokens.remove(tok)
tokens.append(token)
self.mc.set(instance_uuid.encode('UTF-8'),
jsonutils.dumps(tokens))
tokens = self._get_tokens_for_instance(instance_uuid)
# Remove the expired tokens from cache.
for tok in tokens:
token_str = self.mc.get(tok.encode('UTF-8'))
if not token_str:
tokens.remove(tok)
tokens.append(token)
self.mc.set(instance_uuid.encode('UTF-8'),
jsonutils.dumps(tokens))
LOG.audit(_("Received Token: %(token)s, %(token_dict)s"),
{'token': token, 'token_dict': token_dict})
@@ -134,30 +126,3 @@ class ConsoleAuthManager(manager.Manager):
for token in tokens:
self.mc.delete(token.encode('UTF-8'))
self.mc.delete(instance_uuid.encode('UTF-8'))
# NOTE(russellb) This method can be removed in 2.0 of this API. It is
# deprecated in favor of the method in the base API.
def get_backdoor_port(self, context):
return self.backdoor_port
class _ConsoleAuthManagerV2Proxy(object):
# Notes for changes since 1.X
# - removed get_backdoor_port()
# - instance_uuid required for authorize_console()
RPC_API_VERSION = '2.0'
def __init__(self, manager):
self.manager = manager
def authorize_console(self, context, token, console_type, host, port,
internal_access_path, instance_uuid):
self.manager.authorize_console(context, token, console_type, host,
port, internal_access_path, instance_uuid)
def check_token(self, context, token):
return self.manager.check_token(context, token)
def delete_tokens_for_instance(self, ctxt, instance_uuid):
self.manager.delete_tokens_for_instance(ctxt, instance_uuid)

14
nova/tests/consoleauth/test_consoleauth.py
View File

@@ -99,12 +99,6 @@ class ConsoleauthTestCase(test.TestCase):
instance_uuid=self.instance['uuid'])
self.assertFalse(self.manager_api.check_token(self.context, token))
def test_console_no_instance_uuid(self):
self.manager_api.authorize_console(self.context, u"token", 'novnc',
'127.0.0.1', '8080', 'host',
instance_uuid=None)
self.assertFalse(self.manager_api.check_token(self.context, u"token"))
def test_delete_expired_tokens(self):
self.useFixture(test.TimeOverride())
token = u'mytok'
@@ -129,14 +123,6 @@ class ConsoleauthTestCase(test.TestCase):
self.assertEqual(stored_tokens[0], token1)
class ConsoleauthV2TestCase(ConsoleauthTestCase):
"""Test Case for consoleauth."""
def setUp(self):
super(ConsoleauthV2TestCase, self).setUp()
self.manager_api = manager._ConsoleAuthManagerV2Proxy(self.manager)
class ControlauthMemcacheEncodingTestCase(test.TestCase):
def setUp(self):
super(ControlauthMemcacheEncodingTestCase, self).setUp()