x/python-ganttclient
Code Issues Proposed changes

Merge "Add version to consoleauth rpc API."

Browse Source
This commit is contained in:
Jenkins
2012-05-18 18:22:15 +00:00
committed by Gerrit Code Review
parent c8489a9217 992f7ec411
commit b231d0c9e3
2 changed files with 7 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
nova/tests/test_compute.py
View File

@@ -3484,26 +3484,23 @@ class ComputeAPITestCase(BaseTestCase):
'console_type': fake_console_type,
'host': 'fake_console_host',
'port': 'fake_console_port',
'internal_access_path': 'fake_access_path',
'access_url': 'fake_console_url'}
'internal_access_path': 'fake_access_path'}
fake_connect_info2 = copy.deepcopy(fake_connect_info)
fake_connect_info2['access_url'] = 'fake_console_url'
self.mox.StubOutWithMock(rpc, 'call')
rpc_msg1 = {'method': 'get_vnc_console',
'args': {'instance_uuid': fake_instance['uuid'],
'console_type': fake_console_type}}
# 2nd rpc.call receives almost everything from fake_connect_info
# except 'access_url'
rpc_msg2_args = dict([(k, v)
for k, v in fake_connect_info.items()
if k != 'access_url'])
rpc_msg2 = {'method': 'authorize_console',
'args': rpc_msg2_args}
'args': fake_connect_info,
'version': '1.0'}
rpc.call(self.context, 'compute.%s' % fake_instance['host'],
rpc_msg1).AndReturn(fake_connect_info)
rpc_msg1).AndReturn(fake_connect_info2)
rpc.call(self.context, FLAGS.consoleauth_topic,
rpc_msg2).AndReturn(None)
rpc_msg2, None).AndReturn(None)
self.mox.ReplayAll()

55
nova/tests/test_consoleauth.py
View File

@@ -1,55 +0,0 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2012 OpenStack LLC.
# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
"""
Tests for Consoleauth Code.
"""
import time
from nova.consoleauth import manager
from nova import context
from nova import db
from nova import flags
from nova import log as logging
from nova.openstack.common import importutils
from nova import test
from nova import utils
FLAGS = flags.FLAGS
LOG = logging.getLogger(__name__)
class ConsoleauthTestCase(test.TestCase):
"""Test Case for consoleauth."""
def setUp(self):
super(ConsoleauthTestCase, self).setUp()
self.manager = importutils.import_object(FLAGS.consoleauth_manager)
self.context = context.get_admin_context()
def test_tokens_expire(self):
"""Test that tokens expire correctly."""
token = 'mytok'
self.flags(console_token_ttl=1)
self.manager.authorize_console(self.context, token, 'novnc',
'127.0.0.1', 'host', '')
self.assertTrue(self.manager.check_token(self.context, token))
time.sleep(1.1)
self.assertFalse(self.manager.check_token(self.context, token))