8 files changed, 15 insertions, 11 deletions
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 _