diff options
| author | Zuul <zuul@review.opendev.org> | 2023-01-25 15:28:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-01-25 15:28:16 +0000 |
| commit | 5307672367d90324d7b313eb432374de0047d319 (patch) | |
| tree | f7b8b1243dc3e8c4d45e5f3e7b84c223998ca2cd | |
| parent | 193320f64ebbe7501a93e053387247ce95b399e5 (diff) | |
| parent | ee92961fe5275f85779634aad637d00c15802b49 (diff) | |
| download | horizon-5307672367d90324d7b313eb432374de0047d319.tar.gz | |
Merge "Remove console_type parameter for server_mks_console function"
| -rw-r--r-- | openstack_dashboard/api/nova.py | 4 | ||||
| -rw-r--r-- | openstack_dashboard/test/unit/api/test_nova.py | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/openstack_dashboard/api/nova.py b/openstack_dashboard/api/nova.py index 03bdee1a9..3d403caa2 100644 --- a/openstack_dashboard/api/nova.py +++ b/openstack_dashboard/api/nova.py @@ -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']) diff --git a/openstack_dashboard/test/unit/api/test_nova.py b/openstack_dashboard/test/unit/api/test_nova.py index d394b78f7..fb0df1d7d 100644 --- a/openstack_dashboard/test/unit/api/test_nova.py +++ b/openstack_dashboard/test/unit/api/test_nova.py @@ -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): |