openstack
/
tempest
Code Issues Proposed changes

Replacing get_vnc_console with get_remote_console after microversion 2.6 

The compute os-getVNCConsole Action API is deprecated from the
Microversion 2.5, so we should change to use the new remote-consoles API
from Microversion 2.6

ref: https://developer.openstack.org/api-ref/compute/#get-vnc-console-os-getvncconsole-action-deprecated

Implements blueprint: clear-deprecated-api

Change-Id: Iecba937a25f52b5a35eb523d9da069408fd5dc6b
This commit is contained in:
zhufl 2018-03-28 17:12:32 +08:00 committed by Ghanshyam Mann
parent c606a5bf2b
commit c32ee7d3f0
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tempest/api/compute/servers/test_novnc.py
View File

@ -58,6 +58,9 @@ class NoVNCConsoleTestJSON(base.BaseV2ComputeTest):
def resource_setup(cls):
super(NoVNCConsoleTestJSON, cls).resource_setup()
cls.server = cls.create_test_server(wait_until="ACTIVE")
cls.use_get_remote_console = False
if not cls.is_requested_microversion_compatible('2.5'):
cls.use_get_remote_console = True
def _validate_novnc_html(self, vnc_url):
"""Verify we can connect to novnc and get back the javascript."""
@ -170,8 +173,13 @@ class NoVNCConsoleTestJSON(base.BaseV2ComputeTest):
@decorators.idempotent_id('c640fdff-8ab4-45a4-a5d8-7e6146cbd0dc')
def test_novnc(self):
body = self.client.get_vnc_console(self.server['id'],
type='novnc')['console']
if self.use_get_remote_console:
body = self.client.get_remote_console(
self.server['id'], console_type='novnc',
protocol='vnc')['remote_console']
else:
body = self.client.get_vnc_console(self.server['id'],
type='novnc')['console']
self.assertEqual('novnc', body['type'])
# Do the initial HTTP Request to novncproxy to get the NoVNC JavaScript
self._validate_novnc_html(body['url'])
@ -184,8 +192,13 @@ class NoVNCConsoleTestJSON(base.BaseV2ComputeTest):
@decorators.idempotent_id('f9c79937-addc-4aaa-9e0e-841eef02aeb7')
def test_novnc_bad_token(self):
body = self.client.get_vnc_console(self.server['id'],
type='novnc')['console']
if self.use_get_remote_console:
body = self.client.get_remote_console(
self.server['id'], console_type='novnc',
protocol='vnc')['remote_console']
else:
body = self.client.get_vnc_console(self.server['id'],
type='novnc')['console']
self.assertEqual('novnc', body['type'])
# Do the WebSockify HTTP Request to novncproxy with a bad token
url = body['url'].replace('token=', 'token=bad')

9
tempest/api/compute/servers/test_server_actions.py
View File

@ -640,8 +640,13 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
# Get the VNC console of type 'novnc' and 'xvpvnc'
console_types = ['novnc', 'xvpvnc']
for console_type in console_types:
body = self.client.get_vnc_console(self.server_id,
type=console_type)['console']
if self.is_requested_microversion_compatible('2.5'):
body = self.client.get_vnc_console(
self.server_id, type=console_type)['console']
else:
body = self.client.get_remote_console(
self.server_id, console_type=console_type,
protocol='vnc')['remote_console']
self.assertEqual(console_type, body['type'])
self.assertNotEqual('', body['url'])
self._validate_url(body['url'])