evacuate SDK actually uses admin_pass param
Change I0cd86675a884e6c2cbd3a861b8e111f961f0f336 was incorrect, the SDK param name is admin_pass. Change-Id: Ibe22c3d7d7ba0f1a5178475143e35fee5cac2ca2 (cherry picked from commit 58d1b06fdcda8e147ee0de77b9f1c835b97030fd)
This commit is contained in:
parent
fb958fa5d0
commit
08c84454c0
@ -3840,7 +3840,7 @@ host."""
|
|||||||
|
|
||||||
kwargs = {
|
kwargs = {
|
||||||
'host': parsed_args.host,
|
'host': parsed_args.host,
|
||||||
'admin_password': parsed_args.password,
|
'admin_pass': parsed_args.password,
|
||||||
}
|
}
|
||||||
|
|
||||||
if not sdk_utils.supports_microversion(compute_client, '2.14'):
|
if not sdk_utils.supports_microversion(compute_client, '2.14'):
|
||||||
|
@ -6974,7 +6974,7 @@ class TestServerEvacuate(TestServer):
|
|||||||
evac_args = {
|
evac_args = {
|
||||||
'host': None,
|
'host': None,
|
||||||
'on_shared_storage': False,
|
'on_shared_storage': False,
|
||||||
'admin_password': None,
|
'admin_pass': None,
|
||||||
}
|
}
|
||||||
self._test_evacuate(args, verify_args, evac_args)
|
self._test_evacuate(args, verify_args, evac_args)
|
||||||
|
|
||||||
@ -6991,7 +6991,7 @@ class TestServerEvacuate(TestServer):
|
|||||||
evac_args = {
|
evac_args = {
|
||||||
'host': None,
|
'host': None,
|
||||||
'on_shared_storage': False,
|
'on_shared_storage': False,
|
||||||
'admin_password': 'password',
|
'admin_pass': 'password',
|
||||||
}
|
}
|
||||||
self._test_evacuate(args, verify_args, evac_args)
|
self._test_evacuate(args, verify_args, evac_args)
|
||||||
|
|
||||||
@ -7008,7 +7008,7 @@ class TestServerEvacuate(TestServer):
|
|||||||
('server', self.server.id),
|
('server', self.server.id),
|
||||||
('host', 'target-host'),
|
('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)
|
self._test_evacuate(args, verify_args, evac_args)
|
||||||
|
|
||||||
@ -7041,7 +7041,7 @@ class TestServerEvacuate(TestServer):
|
|||||||
evac_args = {
|
evac_args = {
|
||||||
'host': None,
|
'host': None,
|
||||||
'on_shared_storage': True,
|
'on_shared_storage': True,
|
||||||
'admin_password': None,
|
'admin_pass': None,
|
||||||
}
|
}
|
||||||
self._test_evacuate(args, verify_args, evac_args)
|
self._test_evacuate(args, verify_args, evac_args)
|
||||||
|
|
||||||
@ -7072,7 +7072,7 @@ class TestServerEvacuate(TestServer):
|
|||||||
evac_args = {
|
evac_args = {
|
||||||
'host': None,
|
'host': None,
|
||||||
'on_shared_storage': False,
|
'on_shared_storage': False,
|
||||||
'admin_password': None,
|
'admin_pass': 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(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user