diff options
| author | Dean Troyer <dtroyer@gmail.com> | 2016-05-13 16:14:09 -0500 |
|---|---|---|
| committer | Dean Troyer <dtroyer@gmail.com> | 2016-06-13 10:50:44 -0500 |
| commit | e5e29a8fef7ba2396015918545a49e717fe75d15 (patch) | |
| tree | c42c9581e6358c9327853e7800de0dfecc20a405 /openstackclient/tests/network | |
| parent | d20c863ebc11cecaaefe043e615b2fb4f5f26063 (diff) | |
| download | python-openstackclient-e5e29a8fef7ba2396015918545a49e717fe75d15.tar.gz | |
osc-lib: utils
Use osc-lib directly for utils.
Leave openstackclient.common.utils for deprecation period.
Change-Id: I5bd9579abc4e07f45219ccd0565626e6667472f7
Diffstat (limited to 'openstackclient/tests/network')
6 files changed, 11 insertions, 7 deletions
diff --git a/openstackclient/tests/network/v2/test_ip_availability.py b/openstackclient/tests/network/v2/test_ip_availability.py index 04979e77..39e11cd5 100644 --- a/openstackclient/tests/network/v2/test_ip_availability.py +++ b/openstackclient/tests/network/v2/test_ip_availability.py @@ -14,7 +14,8 @@ import copy import mock -from openstackclient.common import utils as osc_utils +from osc_lib import utils as common_utils + from openstackclient.network.v2 import ip_availability from openstackclient.tests import fakes from openstackclient.tests.identity.v3 import fakes as identity_fakes @@ -140,7 +141,7 @@ class TestShowIPAvailability(TestIPAvailability): _ip_availability.network_id, _ip_availability.network_name, _ip_availability.tenant_id, - osc_utils.format_list( + common_utils.format_list( _ip_availability.subnet_ip_availability), _ip_availability.total_ips, _ip_availability.used_ips, diff --git a/openstackclient/tests/network/v2/test_network.py b/openstackclient/tests/network/v2/test_network.py index 581e9278..8fc9dadf 100644 --- a/openstackclient/tests/network/v2/test_network.py +++ b/openstackclient/tests/network/v2/test_network.py @@ -16,8 +16,8 @@ import mock from mock import call from osc_lib import exceptions +from osc_lib import utils -from openstackclient.common import utils from openstackclient.network.v2 import network from openstackclient.tests.compute.v2 import fakes as compute_fakes from openstackclient.tests import fakes diff --git a/openstackclient/tests/network/v2/test_port.py b/openstackclient/tests/network/v2/test_port.py index 02c7d4a4..779dca05 100644 --- a/openstackclient/tests/network/v2/test_port.py +++ b/openstackclient/tests/network/v2/test_port.py @@ -15,8 +15,8 @@ import mock from mock import call from osc_lib import exceptions +from osc_lib import utils -from openstackclient.common import utils from openstackclient.network.v2 import port from openstackclient.tests.network.v2 import fakes as network_fakes from openstackclient.tests import utils as tests_utils diff --git a/openstackclient/tests/network/v2/test_router.py b/openstackclient/tests/network/v2/test_router.py index b25381ef..16296139 100644 --- a/openstackclient/tests/network/v2/test_router.py +++ b/openstackclient/tests/network/v2/test_router.py @@ -13,7 +13,8 @@ import mock -from openstackclient.common import utils as osc_utils +from osc_lib import utils as osc_utils + from openstackclient.network.v2 import router from openstackclient.tests.network.v2 import fakes as network_fakes from openstackclient.tests import utils as tests_utils diff --git a/openstackclient/tests/network/v2/test_subnet.py b/openstackclient/tests/network/v2/test_subnet.py index 25684d63..de7e1821 100644 --- a/openstackclient/tests/network/v2/test_subnet.py +++ b/openstackclient/tests/network/v2/test_subnet.py @@ -14,7 +14,8 @@ import copy import mock -from openstackclient.common import utils +from osc_lib import utils + from openstackclient.network.v2 import subnet as subnet_v2 from openstackclient.tests import fakes from openstackclient.tests.identity.v3 import fakes as identity_fakes_v3 diff --git a/openstackclient/tests/network/v2/test_subnet_pool.py b/openstackclient/tests/network/v2/test_subnet_pool.py index f7bb5895..10ef76d8 100644 --- a/openstackclient/tests/network/v2/test_subnet_pool.py +++ b/openstackclient/tests/network/v2/test_subnet_pool.py @@ -15,7 +15,8 @@ import argparse import copy import mock -from openstackclient.common import utils +from osc_lib import utils + from openstackclient.network.v2 import subnet_pool from openstackclient.tests import fakes from openstackclient.tests.identity.v3 import fakes as identity_fakes_v3 |