osc-lib: utils

Use osc-lib directly for utils.

Leave openstackclient.common.utils for deprecation period.

Change-Id: I5bd9579abc4e07f45219ccd0565626e6667472f7

30 files changed, 52 insertions, 50 deletions

diff --git a/openstackclient/identity/client.py b/openstackclient/identity/client.py
index c166e66a..1868b224 100644
--- a/openstackclient/identity/client.py
+++ b/openstackclient/identity/client.py
@@ -16,8 +16,9 @@
 import logging
 
 from keystoneclient.v2_0 import client as identity_client_v2
+from osc_lib import utils
+
 from openstackclient.api import auth
-from openstackclient.common import utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/openstackclient/identity/common.py b/openstackclient/identity/common.py
index 5a65c47c..16ee63e1 100644
--- a/openstackclient/identity/common.py
+++ b/openstackclient/identity/common.py
@@ -21,8 +21,7 @@ from keystoneclient.v3 import groups
 from keystoneclient.v3 import projects
 from keystoneclient.v3 import users
 from osc_lib import exceptions
-
-from openstackclient.common import utils
+from osc_lib import utils
 
 
 def find_service(identity_client, name_type_or_id):
diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py
index 3210df76..2de1e8e7 100644
--- a/openstackclient/identity/v2_0/catalog.py
+++ b/openstackclient/identity/v2_0/catalog.py
@@ -14,10 +14,10 @@
 """Identity v2 Service Catalog 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/identity/v2_0/ec2creds.py b/openstackclient/identity/v2_0/ec2creds.py
index dfd67591..86f07bce 100644
--- a/openstackclient/identity/v2_0/ec2creds.py
+++ b/openstackclient/identity/v2_0/ec2creds.py
@@ -16,10 +16,10 @@
 
 """Identity v2 EC2 Credentials action implementations"""
 
+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/identity/v2_0/endpoint.py b/openstackclient/identity/v2_0/endpoint.py
index 09ea738f..89c8a38b 100644
--- a/openstackclient/identity/v2_0/endpoint.py
+++ b/openstackclient/identity/v2_0/endpoint.py
@@ -15,10 +15,10 @@
 
 """Endpoint action implementations"""
 
+from osc_lib import utils
 import six
 
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v2_0/project.py b/openstackclient/identity/v2_0/project.py
index 80f88d73..688849fa 100644
--- a/openstackclient/identity/v2_0/project.py
+++ b/openstackclient/identity/v2_0/project.py
@@ -15,13 +15,12 @@
 
 """Identity v2 Project action implementations"""
 
-import six
-
 from keystoneauth1 import exceptions as ks_exc
+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/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py
index 8914abfd..075234fc 100644
--- a/openstackclient/identity/v2_0/role.py
+++ b/openstackclient/identity/v2_0/role.py
@@ -17,10 +17,10 @@
 
 from keystoneauth1 import exceptions as ks_exc
 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/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py
index 1293afc7..631b8737 100644
--- a/openstackclient/identity/v2_0/service.py
+++ b/openstackclient/identity/v2_0/service.py
@@ -18,10 +18,10 @@
 import argparse
 
 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 _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py
index f8f5df29..a10d213b 100644
--- a/openstackclient/identity/v2_0/user.py
+++ b/openstackclient/identity/v2_0/user.py
@@ -15,12 +15,11 @@
 
 """Identity v2.0 User action implementations"""
 
-import six
-
 from keystoneauth1 import exceptions as ks_exc
+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/identity/v3/catalog.py b/openstackclient/identity/v3/catalog.py
index 202c3a3f..a3286003 100644
--- a/openstackclient/identity/v3/catalog.py
+++ b/openstackclient/identity/v3/catalog.py
@@ -14,10 +14,10 @@
 """Identity v3 Service Catalog 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/identity/v3/consumer.py b/openstackclient/identity/v3/consumer.py
index a062b743..8aa92f6d 100644
--- a/openstackclient/identity/v3/consumer.py
+++ b/openstackclient/identity/v3/consumer.py
@@ -15,11 +15,12 @@
 
 """Identity v3 Consumer action implementations"""
 
-import six
 import sys
 
+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/identity/v3/credential.py b/openstackclient/identity/v3/credential.py
index 99013478..6c65a206 100644
--- a/openstackclient/identity/v3/credential.py
+++ b/openstackclient/identity/v3/credential.py
@@ -15,10 +15,10 @@
 
 """Identity v3 Credential action implementations"""
 
+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/identity/v3/domain.py b/openstackclient/identity/v3/domain.py
index c345028f..b0cd4d55 100644
--- a/openstackclient/identity/v3/domain.py
+++ b/openstackclient/identity/v3/domain.py
@@ -15,13 +15,13 @@
 
 """Identity v3 Domain action implementations"""
 
-import six
 import sys
 
 from keystoneauth1 import exceptions as ks_exc
+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/identity/v3/ec2creds.py b/openstackclient/identity/v3/ec2creds.py
index 859ec2a7..fe052a3c 100644
--- a/openstackclient/identity/v3/ec2creds.py
+++ b/openstackclient/identity/v3/ec2creds.py
@@ -12,10 +12,10 @@
 
 """Identity v3 EC2 Credentials action implementations"""
 
+from osc_lib import utils
 import six
 
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v3/endpoint.py b/openstackclient/identity/v3/endpoint.py
index 39022d27..8e433fb9 100644
--- a/openstackclient/identity/v3/endpoint.py
+++ b/openstackclient/identity/v3/endpoint.py
@@ -15,11 +15,12 @@
 
 """Identity v3 Endpoint action implementations"""
 
-import six
 import sys
 
+from osc_lib import utils
+import six
+
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v3/federation_protocol.py b/openstackclient/identity/v3/federation_protocol.py
index c0f4bc93..5050ec6f 100644
--- a/openstackclient/identity/v3/federation_protocol.py
+++ b/openstackclient/identity/v3/federation_protocol.py
@@ -14,10 +14,10 @@
 
 """Identity v3 Protocols actions implementations"""
 
+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/identity/v3/group.py b/openstackclient/identity/v3/group.py
index fdb94da6..85087214 100644
--- a/openstackclient/identity/v3/group.py
+++ b/openstackclient/identity/v3/group.py
@@ -15,13 +15,13 @@
 
 """Group action implementations"""
 
-import six
 import sys
 
 from keystoneauth1 import exceptions as ks_exc
+from osc_lib import utils
+import six
 
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v3/identity_provider.py b/openstackclient/identity/v3/identity_provider.py
index 3749aa35..a082f2f4 100644
--- a/openstackclient/identity/v3/identity_provider.py
+++ b/openstackclient/identity/v3/identity_provider.py
@@ -13,10 +13,10 @@
 
 """Identity v3 IdentityProvider action implementations"""
 
+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/identity/v3/mapping.py b/openstackclient/identity/v3/mapping.py
index acf3a081..723e3bbc 100644
--- a/openstackclient/identity/v3/mapping.py
+++ b/openstackclient/identity/v3/mapping.py
@@ -17,12 +17,11 @@
 
 import json
 
-import six
-
 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/identity/v3/policy.py b/openstackclient/identity/v3/policy.py
index 74a783b0..f0992031 100644
--- a/openstackclient/identity/v3/policy.py
+++ b/openstackclient/identity/v3/policy.py
@@ -15,11 +15,12 @@
 
 """Identity v3 Policy action implementations"""
 
-import six
 import sys
 
+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/identity/v3/project.py b/openstackclient/identity/v3/project.py
index acf639f2..2d504950 100644
--- a/openstackclient/identity/v3/project.py
+++ b/openstackclient/identity/v3/project.py
@@ -15,13 +15,12 @@
 
 """Project action implementations"""
 
-import six
-
 from keystoneauth1 import exceptions as ks_exc
+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
 
diff --git a/openstackclient/identity/v3/region.py b/openstackclient/identity/v3/region.py
index 053e4b31..da8e3632 100644
--- a/openstackclient/identity/v3/region.py
+++ b/openstackclient/identity/v3/region.py
@@ -13,10 +13,10 @@
 
 """Identity v3 Region action implementations"""
 
+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/identity/v3/role.py b/openstackclient/identity/v3/role.py
index e7078f44..879dbc33 100644
--- a/openstackclient/identity/v3/role.py
+++ b/openstackclient/identity/v3/role.py
@@ -15,13 +15,13 @@
 
 """Identity v3 Role action implementations"""
 
-import six
 import sys
 
 from keystoneauth1 import exceptions as ks_exc
+from osc_lib import utils
+import six
 
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v3/role_assignment.py b/openstackclient/identity/v3/role_assignment.py
index 521075fe..5e1d997a 100644
--- a/openstackclient/identity/v3/role_assignment.py
+++ b/openstackclient/identity/v3/role_assignment.py
@@ -13,8 +13,9 @@
 
 """Identity v3 Assignment action implementations """
 
+from osc_lib import utils
+
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v3/service.py b/openstackclient/identity/v3/service.py
index 35507a63..450b066c 100644
--- a/openstackclient/identity/v3/service.py
+++ b/openstackclient/identity/v3/service.py
@@ -15,11 +15,12 @@
 
 """Identity v3 Service action implementations"""
 
-import six
 import sys
 
+from osc_lib import utils
+import six
+
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v3/service_provider.py b/openstackclient/identity/v3/service_provider.py
index f1e9f35d..5bb15463 100644
--- a/openstackclient/identity/v3/service_provider.py
+++ b/openstackclient/identity/v3/service_provider.py
@@ -13,11 +13,12 @@
 
 """Service Provider action implementations"""
 
-import six
 import sys
 
+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/identity/v3/token.py b/openstackclient/identity/v3/token.py
index 5a47dfdd..0eefbf3b 100644
--- a/openstackclient/identity/v3/token.py
+++ b/openstackclient/identity/v3/token.py
@@ -15,12 +15,11 @@
 
 """Identity v3 Token action implementations"""
 
-import six
-
 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 _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v3/trust.py b/openstackclient/identity/v3/trust.py
index 336b703c..0f900250 100644
--- a/openstackclient/identity/v3/trust.py
+++ b/openstackclient/identity/v3/trust.py
@@ -14,10 +14,11 @@
 """Identity v3 Trust action implementations"""
 
 import datetime
+
+from osc_lib import utils
 import six
 
 from openstackclient.common import command
-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 6eee27d2..901fa26e 100644
--- a/openstackclient/identity/v3/unscoped_saml.py
+++ b/openstackclient/identity/v3/unscoped_saml.py
@@ -18,9 +18,9 @@ the user can list domains and projects they are allowed to access, and request
 a scoped token."""
 
 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/identity/v3/user.py b/openstackclient/identity/v3/user.py
index a71b4b78..b2e60f8f 100644
--- a/openstackclient/identity/v3/user.py
+++ b/openstackclient/identity/v3/user.py
@@ -16,13 +16,13 @@
 """Identity v3 User action implementations"""
 
 import copy
-import six
 import sys
 
 from keystoneauth1 import exceptions as ks_exc
+from osc_lib import utils
+import six
 
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common