osc-lib: utils

Use osc-lib directly for utils.

Leave openstackclient.common.utils for deprecation period.

Change-Id: I5bd9579abc4e07f45219ccd0565626e6667472f7

15 files changed, 21 insertions, 15 deletions

diff --git a/openstackclient/volume/client.py b/openstackclient/volume/client.py
index a60f4b0e..cc195460 100644
--- a/openstackclient/volume/client.py
+++ b/openstackclient/volume/client.py
@@ -15,7 +15,8 @@
 
 import logging
 
-from openstackclient.common import utils
+from osc_lib import utils
+
 from openstackclient.i18n import _
 
 LOG = logging.getLogger(__name__)
diff --git a/openstackclient/volume/v1/backup.py b/openstackclient/volume/v1/backup.py
index 607b5211..f70d9b42 100644
--- a/openstackclient/volume/v1/backup.py
+++ b/openstackclient/volume/v1/backup.py
@@ -16,10 +16,11 @@
 """Volume v1 Backup action implementations"""
 
 import copy
+
+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/volume/v1/qos_specs.py b/openstackclient/volume/v1/qos_specs.py
index c49477a0..70f68269 100644
--- a/openstackclient/volume/v1/qos_specs.py
+++ b/openstackclient/volume/v1/qos_specs.py
@@ -15,11 +15,11 @@
 
 """Volume v1 QoS 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/volume/v1/service.py b/openstackclient/volume/v1/service.py
index 023dda98..c065b526 100644
--- a/openstackclient/volume/v1/service.py
+++ b/openstackclient/volume/v1/service.py
@@ -14,8 +14,9 @@
 
 """Service 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/volume/v1/snapshot.py b/openstackclient/volume/v1/snapshot.py
index 5132d71e..af0b5229 100644
--- a/openstackclient/volume/v1/snapshot.py
+++ b/openstackclient/volume/v1/snapshot.py
@@ -16,11 +16,12 @@
 """Volume v1 Snapshot action implementations"""
 
 import copy
+
+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/volume/v1/volume.py b/openstackclient/volume/v1/volume.py
index ffec1803..359d931e 100644
--- a/openstackclient/volume/v1/volume.py
+++ b/openstackclient/volume/v1/volume.py
@@ -16,11 +16,12 @@
 """Volume v1 Volume action implementations"""
 
 import argparse
+
+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/volume/v1/volume_transfer_request.py b/openstackclient/volume/v1/volume_transfer_request.py
index 98689e7b..9cffe988 100644
--- a/openstackclient/volume/v1/volume_transfer_request.py
+++ b/openstackclient/volume/v1/volume_transfer_request.py
@@ -14,9 +14,9 @@
 
 """Volume v2 transfer 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/volume/v1/volume_type.py b/openstackclient/volume/v1/volume_type.py
index 4e9b1920..e4d22abb 100644
--- a/openstackclient/volume/v1/volume_type.py
+++ b/openstackclient/volume/v1/volume_type.py
@@ -15,11 +15,11 @@
 
 """Volume v1 Type 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/volume/v2/backup.py b/openstackclient/volume/v2/backup.py
index e6fbe78d..371ddafd 100644
--- a/openstackclient/volume/v2/backup.py
+++ b/openstackclient/volume/v2/backup.py
@@ -16,10 +16,10 @@
 
 import copy
 
+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/volume/v2/qos_specs.py b/openstackclient/volume/v2/qos_specs.py
index 90e11c77..c4473117 100644
--- a/openstackclient/volume/v2/qos_specs.py
+++ b/openstackclient/volume/v2/qos_specs.py
@@ -15,11 +15,11 @@
 
 """Volume v2 QoS 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/volume/v2/service.py b/openstackclient/volume/v2/service.py
index 023dda98..c065b526 100644
--- a/openstackclient/volume/v2/service.py
+++ b/openstackclient/volume/v2/service.py
@@ -14,8 +14,9 @@
 
 """Service 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/volume/v2/snapshot.py b/openstackclient/volume/v2/snapshot.py
index d9017080..99b7462b 100644
--- a/openstackclient/volume/v2/snapshot.py
+++ b/openstackclient/volume/v2/snapshot.py
@@ -16,11 +16,11 @@
 
 import copy
 
+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/volume/v2/volume.py b/openstackclient/volume/v2/volume.py
index 18473da3..c6262d17 100644
--- a/openstackclient/volume/v2/volume.py
+++ b/openstackclient/volume/v2/volume.py
@@ -16,11 +16,11 @@
 
 import copy
 
+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/volume/v2/volume_transfer_request.py b/openstackclient/volume/v2/volume_transfer_request.py
index 98689e7b..9cffe988 100644
--- a/openstackclient/volume/v2/volume_transfer_request.py
+++ b/openstackclient/volume/v2/volume_transfer_request.py
@@ -14,9 +14,9 @@
 
 """Volume v2 transfer 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/volume/v2/volume_type.py b/openstackclient/volume/v2/volume_type.py
index e2e1c53e..0896ecff 100644
--- a/openstackclient/volume/v2/volume_type.py
+++ b/openstackclient/volume/v2/volume_type.py
@@ -15,11 +15,11 @@
 """Volume v2 Type 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