osc-lib: exceptions

Use osc-lib directly for exceptions.

Leave openstackclient.common.exceptions for deprecation period.

Change-Id: Iea3e862302372e1b31ccd27f69db59b4953ca828

51 files changed, 93 insertions, 61 deletions

diff --git a/openstackclient/api/api.py b/openstackclient/api/api.py
index bd2abd88..0b00ff50 100644
--- a/openstackclient/api/api.py
+++ b/openstackclient/api/api.py
@@ -17,8 +17,7 @@ import simplejson as json
 
 from keystoneauth1 import exceptions as ks_exceptions
 from keystoneauth1 import session as ks_session
-
-from openstackclient.common import exceptions
+from osc_lib import exceptions
 
 
 class KeystoneSession(object):
diff --git a/openstackclient/api/auth.py b/openstackclient/api/auth.py
index ded0e369..f1e53c49 100644
--- a/openstackclient/api/auth.py
+++ b/openstackclient/api/auth.py
@@ -17,8 +17,8 @@ import argparse
 import logging
 
 from keystoneauth1.loading import base
+from osc_lib import exceptions as exc
 
-from openstackclient.common import exceptions as exc
 from openstackclient.common import utils
 from openstackclient.i18n import _
 
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index e8ba7ec4..04f624d0 100644
--- a/openstackclient/common/clientmanager.py
+++ b/openstackclient/common/clientmanager.py
@@ -20,12 +20,12 @@ import logging
 import pkg_resources
 import sys
 
+from osc_lib import exceptions
 from oslo_utils import strutils
 import requests
 import six
 
 from openstackclient.api import auth
-from openstackclient.common import exceptions
 from openstackclient.common import session as osc_session
 from openstackclient.identity import client as identity_client
 
diff --git a/openstackclient/common/command.py b/openstackclient/common/command.py
index 144a0db1..adf984fa 100644
--- a/openstackclient/common/command.py
+++ b/openstackclient/common/command.py
@@ -18,9 +18,9 @@ import logging
 from cliff import command
 from cliff import lister
 from cliff import show
+from osc_lib import exceptions
 import six
 
-from openstackclient.common import exceptions
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/compute/client.py b/openstackclient/compute/client.py
index 8e6eedcf..aa4c431f 100644
--- a/openstackclient/compute/client.py
+++ b/openstackclient/compute/client.py
@@ -15,7 +15,8 @@
 
 import logging
 
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
 from openstackclient.common import utils
 from openstackclient.i18n import _
 
diff --git a/openstackclient/compute/v2/agent.py b/openstackclient/compute/v2/agent.py
index 064fe5a6..7b1a301e 100644
--- a/openstackclient/compute/v2/agent.py
+++ b/openstackclient/compute/v2/agent.py
@@ -15,10 +15,10 @@
 
 """Agent action implementations"""
 
+from osc_lib import exceptions
 import six
 
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import utils
 from openstackclient.i18n import _
 
diff --git a/openstackclient/compute/v2/flavor.py b/openstackclient/compute/v2/flavor.py
index 87909a18..7761ab43 100644
--- a/openstackclient/compute/v2/flavor.py
+++ b/openstackclient/compute/v2/flavor.py
@@ -15,10 +15,10 @@
 
 """Flavor action implementations"""
 
+from osc_lib import exceptions
 import six
 
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import parseractions
 from openstackclient.common import utils
 from openstackclient.i18n import _
diff --git a/openstackclient/compute/v2/keypair.py b/openstackclient/compute/v2/keypair.py
index 8af209fe..3810c1a3 100644
--- a/openstackclient/compute/v2/keypair.py
+++ b/openstackclient/compute/v2/keypair.py
@@ -17,11 +17,12 @@
 
 import io
 import os
-import six
 import sys
 
+from osc_lib import exceptions
+import six
+
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import utils
 from openstackclient.i18n import _
 
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 5688b55f..ee59bb34 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -19,17 +19,17 @@ import argparse
 import getpass
 import io
 import os
-import six
 import sys
 
-from openstackclient.common import command
+from osc_lib import exceptions
+import six
 
 try:
     from novaclient.v2 import servers
 except ImportError:
     from novaclient.v1_1 import servers
 
-from openstackclient.common import exceptions
+from openstackclient.common import command
 from openstackclient.common import parseractions
 from openstackclient.common import utils
 from openstackclient.i18n import _
diff --git a/openstackclient/compute/v2/server_backup.py b/openstackclient/compute/v2/server_backup.py
index 24d71015..f0b3edc5 100644
--- a/openstackclient/compute/v2/server_backup.py
+++ b/openstackclient/compute/v2/server_backup.py
@@ -17,11 +17,11 @@
 
 import sys
 
+from osc_lib import exceptions
 from oslo_utils import importutils
 import six
 
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import utils
 from openstackclient.i18n import _
 
diff --git a/openstackclient/compute/v2/server_group.py b/openstackclient/compute/v2/server_group.py
index 2e275b71..1b817018 100644
--- a/openstackclient/compute/v2/server_group.py
+++ b/openstackclient/compute/v2/server_group.py
@@ -15,8 +15,9 @@
 
 """Compute v2 Server Group action implementations"""
 
+from osc_lib import exceptions
+
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import utils
 from openstackclient.i18n import _
 
diff --git a/openstackclient/compute/v2/service.py b/openstackclient/compute/v2/service.py
index 5660ff55..2a589f6b 100644
--- a/openstackclient/compute/v2/service.py
+++ b/openstackclient/compute/v2/service.py
@@ -15,8 +15,9 @@
 
 """Service action implementations"""
 
+from osc_lib import exceptions
+
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import utils
 from openstackclient.i18n import _
 
diff --git a/openstackclient/identity/common.py b/openstackclient/identity/common.py
index 2afa41fb..5a65c47c 100644
--- a/openstackclient/identity/common.py
+++ b/openstackclient/identity/common.py
@@ -20,8 +20,8 @@ from keystoneclient.v3 import domains
 from keystoneclient.v3 import groups
 from keystoneclient.v3 import projects
 from keystoneclient.v3 import users
+from osc_lib import exceptions
 
-from openstackclient.common import exceptions
 from openstackclient.common import utils
 
 
diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py
index 33692a0d..3210df76 100644
--- a/openstackclient/identity/v2_0/catalog.py
+++ b/openstackclient/identity/v2_0/catalog.py
@@ -13,10 +13,10 @@
 
 """Identity v2 Service Catalog action implementations"""
 
+from osc_lib import exceptions
 import six
 
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import utils
 from openstackclient.i18n import _
 
diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py
index 0f8da992..8914abfd 100644
--- a/openstackclient/identity/v2_0/role.py
+++ b/openstackclient/identity/v2_0/role.py
@@ -15,12 +15,11 @@
 
 """Identity v2 Role action implementations"""
 
-import six
-
 from keystoneauth1 import exceptions as ks_exc
+from osc_lib import exceptions
+import six
 
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import utils
 from openstackclient.i18n import _
 
diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py
index 7fe66d91..1293afc7 100644
--- a/openstackclient/identity/v2_0/service.py
+++ b/openstackclient/identity/v2_0/service.py
@@ -16,10 +16,11 @@
 """Service action implementations"""
 
 import argparse
+
+from osc_lib import exceptions
 import six
 
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common
diff --git a/openstackclient/identity/v3/catalog.py b/openstackclient/identity/v3/catalog.py
index c2b4359d..202c3a3f 100644
--- a/openstackclient/identity/v3/catalog.py
+++ b/openstackclient/identity/v3/catalog.py
@@ -13,10 +13,10 @@
 
 """Identity v3 Service Catalog action implementations"""
 
+from osc_lib import exceptions
 import six
 
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import utils
 from openstackclient.i18n import _
 
diff --git a/openstackclient/identity/v3/mapping.py b/openstackclient/identity/v3/mapping.py
index c45796e4..acf3a081 100644
--- a/openstackclient/identity/v3/mapping.py
+++ b/openstackclient/identity/v3/mapping.py
@@ -19,8 +19,9 @@ import json
 
 import six
 
+from osc_lib import exceptions
+
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import utils
 from openstackclient.i18n import _
 
diff --git a/openstackclient/identity/v3/token.py b/openstackclient/identity/v3/token.py
index cc399363..5a47dfdd 100644
--- a/openstackclient/identity/v3/token.py
+++ b/openstackclient/identity/v3/token.py
@@ -17,8 +17,9 @@
 
 import six
 
+from osc_lib import exceptions
+
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common
diff --git a/openstackclient/identity/v3/unscoped_saml.py b/openstackclient/identity/v3/unscoped_saml.py
index 5cb8e486..6eee27d2 100644
--- a/openstackclient/identity/v3/unscoped_saml.py
+++ b/openstackclient/identity/v3/unscoped_saml.py
@@ -17,8 +17,9 @@ The first step of federated auth is to fetch an unscoped token. From there,
 the user can list domains and projects they are allowed to access, and request
 a scoped token."""
 
+from osc_lib import exceptions
+
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import utils
 from openstackclient.i18n import _
 
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
index fa1de424..f23ba5e2 100644
--- a/openstackclient/image/v2/image.py
+++ b/openstackclient/image/v2/image.py
@@ -19,10 +19,10 @@ import argparse
 import six
 
 from glanceclient.common import utils as gc_utils
+from osc_lib import exceptions
 
 from openstackclient.api import utils as api_utils
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import parseractions
 from openstackclient.common import utils
 from openstackclient.i18n import _
diff --git a/openstackclient/network/common.py b/openstackclient/network/common.py
index 4028ac0d..10c61ab1 100644
--- a/openstackclient/network/common.py
+++ b/openstackclient/network/common.py
@@ -12,10 +12,11 @@
 #
 
 import abc
+
+from osc_lib import exceptions
 import six
 
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/network/v2/address_scope.py b/openstackclient/network/v2/address_scope.py
index 40a0b8f6..9b670ea4 100644
--- a/openstackclient/network/v2/address_scope.py
+++ b/openstackclient/network/v2/address_scope.py
@@ -13,8 +13,9 @@
 
 """Address scope action implementations"""
 
+from osc_lib import exceptions
+
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py
index bc9321d1..ae6d2dff 100644
--- a/openstackclient/network/v2/port.py
+++ b/openstackclient/network/v2/port.py
@@ -16,8 +16,9 @@
 import argparse
 import logging
 
+from osc_lib import exceptions
+
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import parseractions
 from openstackclient.common import utils
 from openstackclient.i18n import _
diff --git a/openstackclient/network/v2/security_group_rule.py b/openstackclient/network/v2/security_group_rule.py
index 5abe9b9d..a7f4fa7e 100644
--- a/openstackclient/network/v2/security_group_rule.py
+++ b/openstackclient/network/v2/security_group_rule.py
@@ -14,14 +14,15 @@
 """Security Group Rule action implementations"""
 
 import argparse
-import six
 
 try:
     from novaclient.v2 import security_group_rules as compute_secgroup_rules
 except ImportError:
     from novaclient.v1_1 import security_group_rules as compute_secgroup_rules
 
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+import six
+
 from openstackclient.common import parseractions
 from openstackclient.common import utils
 from openstackclient.i18n import _
diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py
index 8e378c7e..95c7e1ae 100644
--- a/openstackclient/network/v2/subnet.py
+++ b/openstackclient/network/v2/subnet.py
@@ -12,10 +12,12 @@
 #
 
 """Subnet action implementations"""
+
 import copy
 
+from osc_lib import exceptions
+
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import parseractions
 from openstackclient.common import utils
 from openstackclient.i18n import _
diff --git a/openstackclient/shell.py b/openstackclient/shell.py
index 9179ad01..f2881d00 100644
--- a/openstackclient/shell.py
+++ b/openstackclient/shell.py
@@ -26,13 +26,13 @@ from cliff import app
 from cliff import command
 from cliff import complete
 from cliff import help
+from osc_lib import exceptions as exc
 from oslo_utils import importutils
 from oslo_utils import strutils
 
 import openstackclient
 from openstackclient.common import clientmanager
 from openstackclient.common import commandmanager
-from openstackclient.common import exceptions as exc
 from openstackclient.common import logs
 from openstackclient.common import timing
 from openstackclient.common import utils
diff --git a/openstackclient/tests/api/test_api.py b/openstackclient/tests/api/test_api.py
index 81197967..b444d9f1 100644
--- a/openstackclient/tests/api/test_api.py
+++ b/openstackclient/tests/api/test_api.py
@@ -13,8 +13,9 @@
 
 """Base API Library Tests"""
 
+from osc_lib import exceptions
+
 from openstackclient.api import api
-from openstackclient.common import exceptions
 from openstackclient.tests.api import fakes as api_fakes
 
 
diff --git a/openstackclient/tests/common/test_clientmanager.py b/openstackclient/tests/common/test_clientmanager.py
index 33485b00..520cce13 100644
--- a/openstackclient/tests/common/test_clientmanager.py
+++ b/openstackclient/tests/common/test_clientmanager.py
@@ -15,15 +15,15 @@
 
 import json as jsonutils
 import mock
-from requests_mock.contrib import fixture
 
 from keystoneauth1.access import service_catalog
 from keystoneauth1.identity import v2 as auth_v2
 from keystoneauth1 import token_endpoint
+from osc_lib import exceptions as exc
+from requests_mock.contrib import fixture
 
 from openstackclient.api import auth
 from openstackclient.common import clientmanager
-from openstackclient.common import exceptions as exc
 from openstackclient.tests import fakes
 from openstackclient.tests import utils
 
diff --git a/openstackclient/tests/common/test_command.py b/openstackclient/tests/common/test_command.py
index 722a4c06..658bc895 100644
--- a/openstackclient/tests/common/test_command.py
+++ b/openstackclient/tests/common/test_command.py
@@ -14,8 +14,9 @@
 
 import mock
 
+from osc_lib import exceptions
+
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.tests import fakes as test_fakes
 from openstackclient.tests import utils as test_utils
 
diff --git a/openstackclient/tests/common/test_utils.py b/openstackclient/tests/common/test_utils.py
index 2248d043..e521530a 100644
--- a/openstackclient/tests/common/test_utils.py
+++ b/openstackclient/tests/common/test_utils.py
@@ -18,7 +18,8 @@ import uuid
 
 import mock
 
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
 from openstackclient.common import utils
 from openstackclient.tests import fakes
 from openstackclient.tests import utils as test_utils
diff --git a/openstackclient/tests/compute/v2/test_agent.py b/openstackclient/tests/compute/v2/test_agent.py
index d3d1ff29..b9040ba9 100644
--- a/openstackclient/tests/compute/v2/test_agent.py
+++ b/openstackclient/tests/compute/v2/test_agent.py
@@ -16,7 +16,8 @@
 import mock
 
 from mock import call
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
 from openstackclient.compute.v2 import agent
 from openstackclient.tests.compute.v2 import fakes as compute_fakes
 
diff --git a/openstackclient/tests/compute/v2/test_flavor.py b/openstackclient/tests/compute/v2/test_flavor.py
index 434d5f92..139585c2 100644
--- a/openstackclient/tests/compute/v2/test_flavor.py
+++ b/openstackclient/tests/compute/v2/test_flavor.py
@@ -15,7 +15,8 @@
 
 import copy
 
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
 from openstackclient.common import utils
 from openstackclient.compute.v2 import flavor
 from openstackclient.tests.compute.v2 import fakes as compute_fakes
diff --git a/openstackclient/tests/compute/v2/test_hypervisor.py b/openstackclient/tests/compute/v2/test_hypervisor.py
index 8d717ba7..ee0f40ed 100644
--- a/openstackclient/tests/compute/v2/test_hypervisor.py
+++ b/openstackclient/tests/compute/v2/test_hypervisor.py
@@ -15,7 +15,8 @@
 
 import copy
 
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
 from openstackclient.compute.v2 import hypervisor
 from openstackclient.tests.compute.v2 import fakes as compute_fakes
 from openstackclient.tests import fakes
diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py
index d642e6dd..bd736248 100644
--- a/openstackclient/tests/compute/v2/test_server.py
+++ b/openstackclient/tests/compute/v2/test_server.py
@@ -14,9 +14,10 @@
 #
 import getpass
 import mock
-
 from mock import call
-from openstackclient.common import exceptions
+
+from osc_lib import exceptions
+
 from openstackclient.common import utils as common_utils
 from openstackclient.compute.v2 import server
 from openstackclient.tests.compute.v2 import fakes as compute_fakes
diff --git a/openstackclient/tests/compute/v2/test_server_backup.py b/openstackclient/tests/compute/v2/test_server_backup.py
index b35f9f52..3495d1b8 100644
--- a/openstackclient/tests/compute/v2/test_server_backup.py
+++ b/openstackclient/tests/compute/v2/test_server_backup.py
@@ -13,7 +13,8 @@
 
 import mock
 
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
 from openstackclient.common import utils as common_utils
 from openstackclient.compute.v2 import server_backup
 from openstackclient.tests.compute.v2 import fakes as compute_fakes
diff --git a/openstackclient/tests/compute/v2/test_server_group.py b/openstackclient/tests/compute/v2/test_server_group.py
index 70ff23f9..4e0dbe45 100644
--- a/openstackclient/tests/compute/v2/test_server_group.py
+++ b/openstackclient/tests/compute/v2/test_server_group.py
@@ -15,7 +15,8 @@
 
 import mock
 
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
 from openstackclient.common import utils
 from openstackclient.compute.v2 import server_group
 from openstackclient.tests.compute.v2 import fakes as compute_fakes
diff --git a/openstackclient/tests/compute/v2/test_service.py b/openstackclient/tests/compute/v2/test_service.py
index cf534978..3f741340 100644
--- a/openstackclient/tests/compute/v2/test_service.py
+++ b/openstackclient/tests/compute/v2/test_service.py
@@ -13,7 +13,8 @@
 #   under the License.
 #
 
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
 from openstackclient.compute.v2 import service
 from openstackclient.tests.compute.v2 import fakes as compute_fakes
 
diff --git a/openstackclient/tests/identity/v2_0/test_role.py b/openstackclient/tests/identity/v2_0/test_role.py
index 486a4a2a..7241c7bd 100644
--- a/openstackclient/tests/identity/v2_0/test_role.py
+++ b/openstackclient/tests/identity/v2_0/test_role.py
@@ -17,8 +17,8 @@ import copy
 import mock
 
 from keystoneauth1 import exceptions as ks_exc
+from osc_lib import exceptions
 
-from openstackclient.common import exceptions
 from openstackclient.identity.v2_0 import role
 from openstackclient.tests import fakes
 from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
diff --git a/openstackclient/tests/identity/v3/test_mappings.py b/openstackclient/tests/identity/v3/test_mappings.py
index b9e3b1d5..af7b135d 100644
--- a/openstackclient/tests/identity/v3/test_mappings.py
+++ b/openstackclient/tests/identity/v3/test_mappings.py
@@ -16,7 +16,8 @@ import copy
 
 import mock
 
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
 from openstackclient.identity.v3 import mapping
 from openstackclient.tests import fakes
 from openstackclient.tests.identity.v3 import fakes as identity_fakes
diff --git a/openstackclient/tests/identity/v3/test_project.py b/openstackclient/tests/identity/v3/test_project.py
index 1e9d1c8b..5be4e389 100644
--- a/openstackclient/tests/identity/v3/test_project.py
+++ b/openstackclient/tests/identity/v3/test_project.py
@@ -16,7 +16,8 @@
 import copy
 import mock
 
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
 from openstackclient.identity.v3 import project
 from openstackclient.tests import fakes
 from openstackclient.tests.identity.v3 import fakes as identity_fakes
diff --git a/openstackclient/tests/identity/v3/test_unscoped_saml.py b/openstackclient/tests/identity/v3/test_unscoped_saml.py
index d12cb454..62623902 100644
--- a/openstackclient/tests/identity/v3/test_unscoped_saml.py
+++ b/openstackclient/tests/identity/v3/test_unscoped_saml.py
@@ -12,7 +12,8 @@
 
 import copy
 
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
 from openstackclient.identity.v3 import unscoped_saml
 from openstackclient.tests import fakes
 from openstackclient.tests.identity.v3 import fakes as identity_fakes
diff --git a/openstackclient/tests/image/v1/test_image.py b/openstackclient/tests/image/v1/test_image.py
index 018e1199..b0436b9a 100644
--- a/openstackclient/tests/image/v1/test_image.py
+++ b/openstackclient/tests/image/v1/test_image.py
@@ -16,7 +16,8 @@
 import copy
 import mock
 
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
 from openstackclient.image.v1 import image
 from openstackclient.tests import fakes
 from openstackclient.tests.image.v1 import fakes as image_fakes
diff --git a/openstackclient/tests/image/v2/test_image.py b/openstackclient/tests/image/v2/test_image.py
index ca20d83d..d8693df0 100644
--- a/openstackclient/tests/image/v2/test_image.py
+++ b/openstackclient/tests/image/v2/test_image.py
@@ -19,7 +19,8 @@ import mock
 import warlock
 
 from glanceclient.v2 import schemas
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
 from openstackclient.common import utils as common_utils
 from openstackclient.image.v2 import image
 from openstackclient.tests import fakes
diff --git a/openstackclient/tests/network/v2/test_address_scope.py b/openstackclient/tests/network/v2/test_address_scope.py
index d02f01ca..722371f9 100644
--- a/openstackclient/tests/network/v2/test_address_scope.py
+++ b/openstackclient/tests/network/v2/test_address_scope.py
@@ -15,7 +15,8 @@ import copy
 import mock
 
 from mock import call
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
 from openstackclient.network.v2 import address_scope
 from openstackclient.tests import fakes
 from openstackclient.tests.identity.v3 import fakes as identity_fakes_v3
diff --git a/openstackclient/tests/network/v2/test_network.py b/openstackclient/tests/network/v2/test_network.py
index 509259a8..581e9278 100644
--- a/openstackclient/tests/network/v2/test_network.py
+++ b/openstackclient/tests/network/v2/test_network.py
@@ -13,9 +13,10 @@
 
 import copy
 import mock
-
 from mock import call
-from openstackclient.common import exceptions
+
+from osc_lib import exceptions
+
 from openstackclient.common import utils
 from openstackclient.network.v2 import network
 from openstackclient.tests.compute.v2 import fakes as compute_fakes
diff --git a/openstackclient/tests/network/v2/test_network_segment.py b/openstackclient/tests/network/v2/test_network_segment.py
index 0a99eced..a635d845 100644
--- a/openstackclient/tests/network/v2/test_network_segment.py
+++ b/openstackclient/tests/network/v2/test_network_segment.py
@@ -13,7 +13,8 @@
 
 import mock
 
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
 from openstackclient.network.v2 import network_segment
 from openstackclient.tests.network.v2 import fakes as network_fakes
 from openstackclient.tests import utils as tests_utils
diff --git a/openstackclient/tests/network/v2/test_port.py b/openstackclient/tests/network/v2/test_port.py
index 628a5d52..02c7d4a4 100644
--- a/openstackclient/tests/network/v2/test_port.py
+++ b/openstackclient/tests/network/v2/test_port.py
@@ -14,7 +14,8 @@
 import mock
 
 from mock import call
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
 from openstackclient.common import utils
 from openstackclient.network.v2 import port
 from openstackclient.tests.network.v2 import fakes as network_fakes
diff --git a/openstackclient/tests/network/v2/test_security_group_rule.py b/openstackclient/tests/network/v2/test_security_group_rule.py
index 2a64b884..b1f2209d 100644
--- a/openstackclient/tests/network/v2/test_security_group_rule.py
+++ b/openstackclient/tests/network/v2/test_security_group_rule.py
@@ -14,7 +14,8 @@
 import copy
 import mock
 
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
 from openstackclient.network import utils as network_utils
 from openstackclient.network.v2 import security_group_rule
 from openstackclient.tests.compute.v2 import fakes as compute_fakes
diff --git a/openstackclient/tests/volume/test_find_resource.py b/openstackclient/tests/volume/test_find_resource.py
index 00cc46a6..d29a955d 100644
--- a/openstackclient/tests/volume/test_find_resource.py
+++ b/openstackclient/tests/volume/test_find_resource.py
@@ -17,8 +17,8 @@ import mock
 
 from cinderclient.v1 import volume_snapshots
 from cinderclient.v1 import volumes
+from osc_lib import exceptions
 
-from openstackclient.common import exceptions
 from openstackclient.common import utils
 from openstackclient.tests import utils as test_utils
 from openstackclient.volume import client  # noqa
diff --git a/openstackclient/volume/v2/volume_type.py b/openstackclient/volume/v2/volume_type.py
index 9aed17bc..e2e1c53e 100644
--- a/openstackclient/volume/v2/volume_type.py
+++ b/openstackclient/volume/v2/volume_type.py
@@ -14,10 +14,10 @@
 
 """Volume v2 Type action implementations"""
 
+from osc_lib import exceptions
 import six
 
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import parseractions
 from openstackclient.common import utils
 from openstackclient.i18n import _