From 58d1b06fdcda8e147ee0de77b9f1c835b97030fd Mon Sep 17 00:00:00 2001 From: Sylvain Bauza Date: Wed, 18 Sep 2024 08:46:44 +0200 Subject: [PATCH] evacuate SDK actually uses admin_pass param Change I0cd86675a884e6c2cbd3a861b8e111f961f0f336 was incorrect, the SDK param name is admin_pass. Change-Id: Ibe22c3d7d7ba0f1a5178475143e35fee5cac2ca2 --- openstackclient/compute/v2/server.py | 2 +- openstackclient/tests/unit/compute/v2/test_server.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index dbd5dab5dc..f7b860df8d 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -3872,7 +3872,7 @@ host.""" kwargs = { 'host': parsed_args.host, - 'admin_password': parsed_args.password, + 'admin_pass': parsed_args.password, } if not sdk_utils.supports_microversion(compute_client, '2.14'): diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py index 44d89a4830..a07e33333f 100644 --- a/openstackclient/tests/unit/compute/v2/test_server.py +++ b/openstackclient/tests/unit/compute/v2/test_server.py @@ -6982,7 +6982,7 @@ class TestServerEvacuate(TestServer): evac_args = { 'host': None, 'on_shared_storage': False, - 'admin_password': None, + 'admin_pass': None, } self._test_evacuate(args, verify_args, evac_args) @@ -6999,7 +6999,7 @@ class TestServerEvacuate(TestServer): evac_args = { 'host': None, 'on_shared_storage': False, - 'admin_password': 'password', + 'admin_pass': 'password', } self._test_evacuate(args, verify_args, evac_args) @@ -7016,7 +7016,7 @@ class TestServerEvacuate(TestServer): ('server', self.server.id), ('host', 'target-host'), ] - evac_args = {'host': host, 'admin_password': None} + evac_args = {'host': host, 'admin_pass': None} self._test_evacuate(args, verify_args, evac_args) @@ -7049,7 +7049,7 @@ class TestServerEvacuate(TestServer): evac_args = { 'host': None, 'on_shared_storage': True, - 'admin_password': None, + 'admin_pass': None, } self._test_evacuate(args, verify_args, evac_args) @@ -7080,7 +7080,7 @@ class TestServerEvacuate(TestServer): evac_args = { 'host': None, 'on_shared_storage': False, - 'admin_password': None, + 'admin_pass': None, } self._test_evacuate(args, verify_args, evac_args) mock_wait_for_status.assert_called_once_with(