Merge "evacuate: Fix password parameter name for SDK"

Author: Zuul

openstackclient/compute/v2/server.py

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

openstackclient/tests/unit/compute/v2/test_server.py

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