Merge "evacuate: Fix password parameter name for SDK"

This commit is contained in:
Zuul 2024-09-13 17:35:50 +00:00 committed by Gerrit Code Review
commit f63784606d
2 changed files with 6 additions and 6 deletions

View File

@ -3837,7 +3837,7 @@ host."""
kwargs = { kwargs = {
'host': parsed_args.host, 'host': parsed_args.host,
'password': parsed_args.password, 'admin_password': parsed_args.password,
} }
if not sdk_utils.supports_microversion(compute_client, '2.14'): if not sdk_utils.supports_microversion(compute_client, '2.14'):

View File

@ -6982,7 +6982,7 @@ class TestServerEvacuate(TestServer):
evac_args = { evac_args = {
'host': None, 'host': None,
'on_shared_storage': False, 'on_shared_storage': False,
'password': None, 'admin_password': None,
} }
self._test_evacuate(args, verify_args, evac_args) self._test_evacuate(args, verify_args, evac_args)
@ -6999,7 +6999,7 @@ class TestServerEvacuate(TestServer):
evac_args = { evac_args = {
'host': None, 'host': None,
'on_shared_storage': False, 'on_shared_storage': False,
'password': 'password', 'admin_password': 'password',
} }
self._test_evacuate(args, verify_args, evac_args) self._test_evacuate(args, verify_args, evac_args)
@ -7016,7 +7016,7 @@ class TestServerEvacuate(TestServer):
('server', self.server.id), ('server', self.server.id),
('host', 'target-host'), ('host', 'target-host'),
] ]
evac_args = {'host': host, 'password': None} evac_args = {'host': host, 'admin_password': None}
self._test_evacuate(args, verify_args, evac_args) self._test_evacuate(args, verify_args, evac_args)
@ -7049,7 +7049,7 @@ class TestServerEvacuate(TestServer):
evac_args = { evac_args = {
'host': None, 'host': None,
'on_shared_storage': True, 'on_shared_storage': True,
'password': None, 'admin_password': None,
} }
self._test_evacuate(args, verify_args, evac_args) self._test_evacuate(args, verify_args, evac_args)
@ -7080,7 +7080,7 @@ class TestServerEvacuate(TestServer):
evac_args = { evac_args = {
'host': None, 'host': None,
'on_shared_storage': False, 'on_shared_storage': False,
'password': None, 'admin_password': None,
} }
self._test_evacuate(args, verify_args, evac_args) self._test_evacuate(args, verify_args, evac_args)
mock_wait_for_status.assert_called_once_with( mock_wait_for_status.assert_called_once_with(