Skip to content

Commit e5e29a8

Browse files
author
Dean Troyer
committed
osc-lib: utils
Use osc-lib directly for utils. Leave openstackclient.common.utils for deprecation period. Change-Id: I5bd9579abc4e07f45219ccd0565626e6667472f7
1 parent d20c863 commit e5e29a8

113 files changed

Lines changed: 185 additions & 548 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎doc/source/plugins.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ so the version should not contain the leading 'v' character.
9595

9696
.. code-block:: python
9797
98-
from openstackclient.common import utils
98+
from osc_lib import utils
9999
100100
101101
DEFAULT_API_VERSION = '1'
@@ -153,12 +153,12 @@ the plugin commands:
153153
154154
# osc-lib interfaces available to plugins:
155155
from osc_lib import exceptions
156+
from osc_lib import utils
156157
157158
# OSC common interfaces available to plugins:
158159
from openstackclient.common import command
159160
from openstackclient.common import parseractions
160161
from openstackclient.common import logs
161-
from openstackclient.common import utils
162162
163163
164164
class DeleteMypluginobject(command.Command):

‎openstackclient/api/auth.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
from keystoneauth1.loading import base
2020
from osc_lib import exceptions as exc
21+
from osc_lib import utils
2122

22-
from openstackclient.common import utils
2323
from openstackclient.i18n import _
2424

2525
LOG = logging.getLogger(__name__)

‎openstackclient/api/object_store_v1.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020
import six
2121
from six.moves import urllib
2222

23+
from osc_lib import utils
24+
2325
from openstackclient.api import api
24-
from openstackclient.common import utils
2526

2627

2728
class APIv1(api.BaseAPI):

‎openstackclient/common/availability_zone.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
import copy
1717

1818
from novaclient import exceptions as nova_exceptions
19+
from osc_lib import utils
1920
import six
2021

2122
from openstackclient.common import command
22-
from openstackclient.common import utils
2323
from openstackclient.i18n import _
2424

2525

‎openstackclient/common/extension.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717

1818
import itertools
1919

20+
from osc_lib import utils
21+
2022
from openstackclient.common import command
21-
from openstackclient.common import utils
2223
from openstackclient.i18n import _
2324

2425

‎openstackclient/common/limits.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717

1818
import itertools
1919

20+
from osc_lib import utils
21+
2022
from openstackclient.common import command
21-
from openstackclient.common import utils
2223
from openstackclient.i18n import _
2324
from openstackclient.identity import common as identity_common
2425

‎openstackclient/common/module.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515

1616
"""Module action implementation"""
1717

18-
import six
1918
import sys
2019

20+
from osc_lib import utils
21+
import six
22+
2123
from openstackclient.common import command
22-
from openstackclient.common import utils
2324
from openstackclient.i18n import _
2425

2526

‎openstackclient/common/quota.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
"""Quota action implementations"""
1717

1818
import itertools
19-
import six
2019
import sys
2120

21+
from osc_lib import utils
22+
import six
23+
2224
from openstackclient.common import command
23-
from openstackclient.common import utils
2425
from openstackclient.i18n import _
2526

2627

‎openstackclient/compute/client.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
import logging
1717

1818
from osc_lib import exceptions
19+
from osc_lib import utils
1920

20-
from openstackclient.common import utils
2121
from openstackclient.i18n import _
2222

23+
2324
LOG = logging.getLogger(__name__)
2425

2526
DEFAULT_API_VERSION = '2'

‎openstackclient/compute/v2/agent.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
"""Agent action implementations"""
1717

1818
from osc_lib import exceptions
19+
from osc_lib import utils
1920
import six
2021

2122
from openstackclient.common import command
22-
from openstackclient.common import utils
2323
from openstackclient.i18n import _
2424

2525

0 commit comments

Comments
 (0)