15 files changed, 22 insertions, 16 deletions
diff --git a/openstackclient/compute/v2/agent.py b/openstackclient/compute/v2/agent.py
index 7b1a301e..5f705076 100644
--- a/openstackclient/compute/v2/agent.py
+++ b/openstackclient/compute/v2/agent.py
@@ -16,10 +16,10 @@
 """Agent action implementations"""
 
 from osc_lib import exceptions
+from osc_lib import utils
 import six
 
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/compute/v2/aggregate.py b/openstackclient/compute/v2/aggregate.py
index 752e0fdf..69227b0c 100644
--- a/openstackclient/compute/v2/aggregate.py
+++ b/openstackclient/compute/v2/aggregate.py
@@ -16,11 +16,11 @@
 
 """Compute v2 Aggregate action implementations"""
 
+from osc_lib import utils
 import six
 
 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/console.py b/openstackclient/compute/v2/console.py
index 1165862c..ee168016 100644
--- a/openstackclient/compute/v2/console.py
+++ b/openstackclient/compute/v2/console.py
@@ -15,12 +15,13 @@
 
 """Compute v2 Console action implementations"""
 
-import six
 import sys
 
+from osc_lib import utils
+import six
+
 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/fixedip.py b/openstackclient/compute/v2/fixedip.py
index daac97d1..e3b80c5f 100644
--- a/openstackclient/compute/v2/fixedip.py
+++ b/openstackclient/compute/v2/fixedip.py
@@ -15,8 +15,9 @@
 
 """Fixed IP action implementations"""
 
+from osc_lib import utils
+
 from openstackclient.common import command
-from openstackclient.common import utils
 
 
 class AddFixedIP(command.Command):
diff --git a/openstackclient/compute/v2/flavor.py b/openstackclient/compute/v2/flavor.py
index 7761ab43..7cca37e5 100644
--- a/openstackclient/compute/v2/flavor.py
+++ b/openstackclient/compute/v2/flavor.py
@@ -16,11 +16,11 @@
 """Flavor action implementations"""
 
 from osc_lib import exceptions
+from osc_lib import utils
 import six
 
 from openstackclient.common import command
 from openstackclient.common import parseractions
-from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 
diff --git a/openstackclient/compute/v2/floatingip.py b/openstackclient/compute/v2/floatingip.py
index fac4d2e3..780ea684 100644
--- a/openstackclient/compute/v2/floatingip.py
+++ b/openstackclient/compute/v2/floatingip.py
@@ -15,8 +15,9 @@
 
 """Floating IP action implementations"""
 
+from osc_lib import utils
+
 from openstackclient.common import command
-from openstackclient.common import utils
 
 
 class AddFloatingIP(command.Command):
diff --git a/openstackclient/compute/v2/floatingippool.py b/openstackclient/compute/v2/floatingippool.py
index 997e0324..eb7c9e86 100644
--- a/openstackclient/compute/v2/floatingippool.py
+++ b/openstackclient/compute/v2/floatingippool.py
@@ -15,8 +15,9 @@
 
 """Floating IP Pool action implementations"""
 
+from osc_lib import utils
+
 from openstackclient.common import command
-from openstackclient.common import utils
 
 
 class ListFloatingIPPool(command.Lister):
diff --git a/openstackclient/compute/v2/host.py b/openstackclient/compute/v2/host.py
index 73e2cdf9..15396d0c 100644
--- a/openstackclient/compute/v2/host.py
+++ b/openstackclient/compute/v2/host.py
@@ -15,8 +15,9 @@
 
 """Host action implementations"""
 
+from osc_lib import utils
+
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/compute/v2/hypervisor.py b/openstackclient/compute/v2/hypervisor.py
index 333a7dea..b13cdb47 100644
--- a/openstackclient/compute/v2/hypervisor.py
+++ b/openstackclient/compute/v2/hypervisor.py
@@ -16,10 +16,11 @@
 """Hypervisor action implementations"""
 
 import re
+
+from osc_lib import utils
 import six
 
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/compute/v2/keypair.py b/openstackclient/compute/v2/keypair.py
index 3810c1a3..acf467b3 100644
--- a/openstackclient/compute/v2/keypair.py
+++ b/openstackclient/compute/v2/keypair.py
@@ -20,10 +20,10 @@ import os
 import sys
 
 from osc_lib import exceptions
+from osc_lib import utils
 import six
 
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index ee59bb34..7e810898 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -22,6 +22,7 @@ import os
 import sys
 
 from osc_lib import exceptions
+from osc_lib import utils
 import six
 
 try:
@@ -31,7 +32,6 @@ except ImportError:
 
 from openstackclient.common import command
 from openstackclient.common import parseractions
-from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 
diff --git a/openstackclient/compute/v2/server_backup.py b/openstackclient/compute/v2/server_backup.py
index f0b3edc5..972db660 100644
--- a/openstackclient/compute/v2/server_backup.py
+++ b/openstackclient/compute/v2/server_backup.py
@@ -18,11 +18,11 @@
 import sys
 
 from osc_lib import exceptions
+from osc_lib import utils
 from oslo_utils import importutils
 import six
 
 from openstackclient.common import command
-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 1b817018..5763ba2f 100644
--- a/openstackclient/compute/v2/server_group.py
+++ b/openstackclient/compute/v2/server_group.py
@@ -16,9 +16,9 @@
 """Compute v2 Server Group action implementations"""
 
 from osc_lib import exceptions
+from osc_lib import utils
 
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/compute/v2/service.py b/openstackclient/compute/v2/service.py
index 2a589f6b..206344dc 100644
--- a/openstackclient/compute/v2/service.py
+++ b/openstackclient/compute/v2/service.py
@@ -16,9 +16,9 @@
 """Service action implementations"""
 
 from osc_lib import exceptions
+from osc_lib import utils
 
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/compute/v2/usage.py b/openstackclient/compute/v2/usage.py
index b83bef13..cc24346f 100644
--- a/openstackclient/compute/v2/usage.py
+++ b/openstackclient/compute/v2/usage.py
@@ -18,10 +18,10 @@
 import datetime
 import sys
 
+from osc_lib import utils
 import six
 
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _