openstack/horizon
Code Issues Proposed changes

Merge "Remove console_type parameter for server_mks_console function"

Browse Source
This commit is contained in:
Zuul
2023-01-25 15:28:16 +00:00
committed by Gerrit Code Review
parent 193320f64e ee92961fe5
commit 5307672367
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_dashboard/api/nova.py
View File

@@ -222,10 +222,10 @@ def server_serial_console(request, instance_id, console_type='serial'):
@profiler.trace
def server_mks_console(request, instance_id, console_type='mks'):
def server_mks_console(request, instance_id):
microver = get_microversion(request, "remote_console_mks")
nc = _nova.novaclient(request, microver)
console = nc.servers.get_mks_console(instance_id, console_type)
console = nc.servers.get_mks_console(instance_id)
return MKSConsole(console['remote_console'])

6
openstack_dashboard/test/unit/api/test_nova.py
View File

@@ -151,19 +151,17 @@ class ComputeApiTests(test.APIMockTestCase):
def test_server_mks_console(self, mock_novaclient):
server = self.servers.first()
console = self.servers.mks_console_data
console_type = console["remote_console"]["type"]
novaclient = mock_novaclient.return_value
self._mock_current_version(novaclient, '2.53')
novaclient.servers.get_mks_console.return_value = console
ret_val = api.nova.server_mks_console(self.request,
server.id,
console_type)
server.id)
self.assertIsInstance(ret_val, api.nova.MKSConsole)
novaclient.versions.get_current.assert_called_once_with()
novaclient.servers.get_mks_console.assert_called_once_with(
server.id, console_type)
server.id)
@mock.patch.object(api._nova, 'novaclient')
def test_server_list(self, mock_novaclient):