From ff96fea0120ab43968a10230ce7899a3c6504e75 Mon Sep 17 00:00:00 2001
From: Thrivikram Mudunuri <mthrivikram+opendev@gmail.com>
Date: Sat, 13 Nov 2021 17:39:41 -0500
Subject: [PATCH] Switch server suspend and server resume to SDK

Switch the server suspend and server resume commands from novaclient to
SDK. Use the SDK versions of test fakes to support fake Server
resources.

Change-Id: Idd0b4f13fab0f238e42844a7d759538bbda24f68
---
 openstackclient/compute/v2/server.py          | 20 +++++++++----------
 .../tests/unit/compute/v2/test_server.py      |  8 ++++----
 ...uspend-resume-to-sdk-fd1709336607b496.yaml |  5 +++++
 3 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 releasenotes/notes/migrate-server-suspend-resume-to-sdk-fd1709336607b496.yaml

diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 09954c49d2..a7479bb41a 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -4081,13 +4081,13 @@ class ResumeServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-
-        compute_client = self.app.client_manager.compute
+        compute_client = self.app.client_manager.sdk_connection.compute
         for server in parsed_args.server:
-            utils.find_resource(
-                compute_client.servers,
+            server_id = compute_client.find_server(
                 server,
-            ).resume()
+                ignore_missing=False,
+            ).id
+            compute_client.resume_server(server_id)
 
 
 class SetServer(command.Command):
@@ -4652,13 +4652,13 @@ class SuspendServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-
-        compute_client = self.app.client_manager.compute
+        compute_client = self.app.client_manager.sdk_connection.compute
         for server in parsed_args.server:
-            utils.find_resource(
-                compute_client.servers,
+            server_id = compute_client.find_server(
                 server,
-            ).suspend()
+                ignore_missing=False,
+            ).id
+            compute_client.suspend_server(server_id)
 
 
 class UnlockServer(command.Command):
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
index 435ddb4778..27ea12637c 100644
--- a/openstackclient/tests/unit/compute/v2/test_server.py
+++ b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -7617,10 +7617,10 @@ class TestServerResume(TestServer):
         }
 
     def test_server_resume_one_server(self):
-        self.run_method_with_servers('resume', 1)
+        self.run_method_with_sdk_servers('resume_server', 1)
 
     def test_server_resume_multi_servers(self):
-        self.run_method_with_servers('resume', 3)
+        self.run_method_with_sdk_servers('resume_server', 3)
 
 
 class TestServerSet(TestServer):
@@ -8284,10 +8284,10 @@ class TestServerSuspend(TestServer):
         }
 
     def test_server_suspend_one_server(self):
-        self.run_method_with_servers('suspend', 1)
+        self.run_method_with_sdk_servers('suspend_server', 1)
 
     def test_server_suspend_multi_servers(self):
-        self.run_method_with_servers('suspend', 3)
+        self.run_method_with_sdk_servers('suspend_server', 3)
 
 
 class TestServerUnlock(TestServer):
diff --git a/releasenotes/notes/migrate-server-suspend-resume-to-sdk-fd1709336607b496.yaml b/releasenotes/notes/migrate-server-suspend-resume-to-sdk-fd1709336607b496.yaml
new file mode 100644
index 0000000000..7d3781bbf4
--- /dev/null
+++ b/releasenotes/notes/migrate-server-suspend-resume-to-sdk-fd1709336607b496.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Migrate ``server suspend`` and ``server resume`` commands from novaclient
+    to sdk.