From a596cfe640f8215d1381f80511d0b95b7d3878eb Mon Sep 17 00:00:00 2001 From: scrungus Date: Fri, 3 Mar 2023 09:55:18 +0000 Subject: [PATCH] Update barbicanclient The changes in version 5.5 barbicanclient cause breaking changes. Changing which barbicanclient is used fixes this issue. Story: 2010629 Task: 47581 Change-Id: I1b6b0a4c1960fb5cb6ce04ea755074944fe4bb6f (cherry picked from commit 33ab4e9cb42e5a68019c16f6f6ecd679c8dca5ab) --- magnum/common/clients.py | 2 +- magnum/tests/unit/common/test_clients.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/magnum/common/clients.py b/magnum/common/clients.py index fe8c367ea6..a80263ce63 100644 --- a/magnum/common/clients.py +++ b/magnum/common/clients.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from barbicanclient.v1 import client as barbicanclient +from barbicanclient import client as barbicanclient from cinderclient.v3 import client as cinder_client from glanceclient import client as glanceclient from heatclient import client as heatclient diff --git a/magnum/tests/unit/common/test_clients.py b/magnum/tests/unit/common/test_clients.py index d5a3ac16c5..ddf412755a 100644 --- a/magnum/tests/unit/common/test_clients.py +++ b/magnum/tests/unit/common/test_clients.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from barbicanclient.v1 import client as barbicanclient +from barbicanclient import client as barbicanclient from glanceclient import client as glanceclient from heatclient import client as heatclient from neutronclient.v2_0 import client as neutronclient