From 08c84454c05c78f67bd2a2a6e53c9d9d91357405 Mon Sep 17 00:00:00 2001
From: Sylvain Bauza <sbauza@redhat.com>
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
(cherry picked from commit 58d1b06fdcda8e147ee0de77b9f1c835b97030fd)
---
 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 199b387558..ec4ec612d7 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -3840,7 +3840,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 f60262f448..d33506d0e1 100644
--- a/openstackclient/tests/unit/compute/v2/test_server.py
+++ b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -6974,7 +6974,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)
 
@@ -6991,7 +6991,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)
 
@@ -7008,7 +7008,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)
 
@@ -7041,7 +7041,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)
 
@@ -7072,7 +7072,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(