From 54cd3caf1061fe1132e3b0dd0d885e76abc7f490 Mon Sep 17 00:00:00 2001 From: Ricardo Rocha Date: Wed, 10 Jan 2018 07:37:52 +0000 Subject: [PATCH] Use barbicanclient.v1 instead of barbicanclient Direct import of barbicanclient is being deprecated, we should use barbicanclient.v1 as per the warning message. Closes-Bug: #1737145 Change-Id: I59d9ecfefd6a432cb8004da0d3676c576e53c5f0 --- magnum/common/cert_manager/barbican_cert_manager.py | 2 +- magnum/common/clients.py | 2 +- magnum/tests/unit/common/cert_manager/test_barbican.py | 6 +++--- magnum/tests/unit/common/test_clients.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/magnum/common/cert_manager/barbican_cert_manager.py b/magnum/common/cert_manager/barbican_cert_manager.py index cdb9993412..698577ba4d 100644 --- a/magnum/common/cert_manager/barbican_cert_manager.py +++ b/magnum/common/cert_manager/barbican_cert_manager.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from barbicanclient import client as barbican_client from barbicanclient import exceptions as barbican_exc +from barbicanclient.v1 import client as barbican_client from oslo_log import log as logging from oslo_utils import excutils diff --git a/magnum/common/clients.py b/magnum/common/clients.py index 86fa599680..bd69f2bd00 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 import client as barbicanclient +from barbicanclient.v1 import client as barbicanclient from glanceclient import client as glanceclient from heatclient import client as heatclient from keystoneauth1.exceptions import catalog diff --git a/magnum/tests/unit/common/cert_manager/test_barbican.py b/magnum/tests/unit/common/cert_manager/test_barbican.py index 5f99baf470..445f418975 100644 --- a/magnum/tests/unit/common/cert_manager/test_barbican.py +++ b/magnum/tests/unit/common/cert_manager/test_barbican.py @@ -14,9 +14,9 @@ import uuid -from barbicanclient import client as barbican_client -from barbicanclient import containers -from barbicanclient import secrets +from barbicanclient.v1 import client as barbican_client +from barbicanclient.v1 import containers +from barbicanclient.v1 import secrets import mock from mock import patch diff --git a/magnum/tests/unit/common/test_clients.py b/magnum/tests/unit/common/test_clients.py index eaa3b6f8f7..c437584da3 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 import client as barbicanclient +from barbicanclient.v1 import client as barbicanclient from glanceclient import client as glanceclient from heatclient import client as heatclient import mock