From cc9b8b3d2d14e58d32797ffed219f70bc9f77573 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Thu, 19 Jan 2023 20:29:53 +0000
Subject: [PATCH] Use new get_rpc_client API from oslo.messaging

Use the new API that is consistent with
the existing API instead of instantiating the client
class directly.

This was introduced in release 14.1.0 here [1] and
added into oslo.messaging here [2]

[1] https://review.opendev.org/c/openstack/requirements/+/869340
[2] https://review.opendev.org/c/openstack/oslo.messaging/+/862419

Change-Id: I671d04a62f7ce408534342e89542ecc78c59ecb7
---
 requirements.txt  | 2 +-
 zun/common/rpc.py | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index c9e9f824f..54d6d61b5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -25,7 +25,7 @@ oslo.i18n>=5.0.0 # Apache-2.0
 oslo.log>=4.2.0 # Apache-2.0
 oslo.concurrency>=4.1.0 # Apache-2.0
 oslo.config>=8.1.0 # Apache-2.0
-oslo.messaging>=12.2.0 # Apache-2.0
+oslo.messaging>=14.1.0 # Apache-2.0
 oslo.middleware>=4.1.0 # Apache-2.0
 oslo.policy>=3.6.0 # Apache-2.0
 oslo.privsep>=2.2.0 # Apache-2.0
diff --git a/zun/common/rpc.py b/zun/common/rpc.py
index 26ecb66b4..3e4411c6e 100644
--- a/zun/common/rpc.py
+++ b/zun/common/rpc.py
@@ -117,7 +117,6 @@ class ProfilerRequestContextSerializer(RequestContextSerializer):
 
 def get_client(target, serializer=None, timeout=None):
     assert TRANSPORT is not None
-    return messaging.RPCClient(TRANSPORT,
-                               target,
-                               serializer=serializer,
-                               timeout=timeout)
+    return messaging.get_rpc_client(
+        TRANSPORT, target, serializer=serializer,
+        timeout=timeout)