osc-lib: utils

Use osc-lib directly for utils.

Leave openstackclient.common.utils for deprecation period.

Change-Id: I5bd9579abc4e07f45219ccd0565626e6667472f7

12 files changed, 19 insertions, 12 deletions

diff --git a/openstackclient/network/client.py b/openstackclient/network/client.py
index d711f4fc..c81b7d87 100644
--- a/openstackclient/network/client.py
+++ b/openstackclient/network/client.py
@@ -15,8 +15,8 @@ import logging
 
 from openstack import connection
 from openstack import profile
+from osc_lib import utils
 
-from openstackclient.common import utils
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/network/v2/address_scope.py b/openstackclient/network/v2/address_scope.py
index 9b670ea4..fc2ff3f3 100644
--- a/openstackclient/network/v2/address_scope.py
+++ b/openstackclient/network/v2/address_scope.py
@@ -14,9 +14,9 @@
 """Address scope 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 _
 from openstackclient.identity import common as identity_common
 
diff --git a/openstackclient/network/v2/floating_ip.py b/openstackclient/network/v2/floating_ip.py
index 21f86599..c734c2ed 100644
--- a/openstackclient/network/v2/floating_ip.py
+++ b/openstackclient/network/v2/floating_ip.py
@@ -13,7 +13,8 @@
 
 """IP Floating action implementations"""
 
-from openstackclient.common import utils
+from osc_lib import utils
+
 from openstackclient.i18n import _
 from openstackclient.network import common
 
diff --git a/openstackclient/network/v2/ip_availability.py b/openstackclient/network/v2/ip_availability.py
index ff7b07c7..6974a246 100644
--- a/openstackclient/network/v2/ip_availability.py
+++ b/openstackclient/network/v2/ip_availability.py
@@ -13,8 +13,9 @@
 
 """IP Availability Info 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 as identity_common
 
diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py
index 87e65dad..81e96fb2 100644
--- a/openstackclient/network/v2/network.py
+++ b/openstackclient/network/v2/network.py
@@ -13,8 +13,9 @@
 
 """Network 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 as identity_common
 from openstackclient.network import common
diff --git a/openstackclient/network/v2/network_segment.py b/openstackclient/network/v2/network_segment.py
index 818ffc02..e965d2eb 100644
--- a/openstackclient/network/v2/network_segment.py
+++ b/openstackclient/network/v2/network_segment.py
@@ -15,8 +15,9 @@
 
 # TODO(rtheis): Add description and name properties when support is available.
 
+from osc_lib import utils
+
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py
index ae6d2dff..643207d9 100644
--- a/openstackclient/network/v2/port.py
+++ b/openstackclient/network/v2/port.py
@@ -17,10 +17,10 @@ import argparse
 import logging
 
 from osc_lib import exceptions
+from osc_lib import utils
 
 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/network/v2/router.py b/openstackclient/network/v2/router.py
index 60908294..eab8b22c 100644
--- a/openstackclient/network/v2/router.py
+++ b/openstackclient/network/v2/router.py
@@ -17,9 +17,10 @@ import argparse
 import json
 import logging
 
+from osc_lib import utils
+
 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/network/v2/security_group.py b/openstackclient/network/v2/security_group.py
index 1ef2754e..95971800 100644
--- a/openstackclient/network/v2/security_group.py
+++ b/openstackclient/network/v2/security_group.py
@@ -14,9 +14,10 @@
 """Security Group action implementations"""
 
 import argparse
+
+from osc_lib import utils
 import six
 
-from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
diff --git a/openstackclient/network/v2/security_group_rule.py b/openstackclient/network/v2/security_group_rule.py
index a7f4fa7e..0132ef4e 100644
--- a/openstackclient/network/v2/security_group_rule.py
+++ b/openstackclient/network/v2/security_group_rule.py
@@ -21,10 +21,10 @@ except ImportError:
     from novaclient.v1_1 import security_group_rules as compute_secgroup_rules
 
 from osc_lib import exceptions
+from osc_lib import utils
 import six
 
 from openstackclient.common import parseractions
-from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py
index 95c7e1ae..2b12ee03 100644
--- a/openstackclient/network/v2/subnet.py
+++ b/openstackclient/network/v2/subnet.py
@@ -16,10 +16,10 @@
 import copy
 
 from osc_lib import exceptions
+from osc_lib import utils
 
 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/network/v2/subnet_pool.py b/openstackclient/network/v2/subnet_pool.py
index 17f1e97d..23993300 100644
--- a/openstackclient/network/v2/subnet_pool.py
+++ b/openstackclient/network/v2/subnet_pool.py
@@ -13,9 +13,10 @@
 
 """Subnet pool action implementations"""
 
+from osc_lib import utils
+
 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