Merge "Use barbicanclient.v1 instead of barbicanclient"

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
 

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

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
 

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