Skip to content

Commit 2c92b60

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "osc-lib: command"
2 parents 287fe36 + 9e2b8e6 commit 2c92b60

82 files changed

Lines changed: 83 additions & 91 deletions

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: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,11 @@ the plugin commands:
153153
154154
# osc-lib interfaces available to plugins:
155155
from osc_lib.cli import parseractions
156+
from osc_lib.command import command
156157
from osc_lib import exceptions
157158
from osc_lib import logs
158159
from osc_lib import utils
159160
160-
# OSC common interfaces available to plugins:
161-
from openstackclient.common import command
162-
163161
164162
class DeleteMypluginobject(command.Command):
165163
"""Delete mypluginobject"""

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.command import command
1920
from osc_lib import utils
2021
import six
2122

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

2525

openstackclient/common/configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
"""Configuration action implementations"""
1515

16+
from osc_lib.command import command
1617
import six
1718

18-
from openstackclient.common import command
1919
from openstackclient.i18n import _
2020

2121
REDACTED = "<redacted>"

openstackclient/common/extension.py

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

1818
import itertools
1919

20+
from osc_lib.command import command
2021
from osc_lib import utils
2122

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

2525

openstackclient/common/limits.py

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

1818
import itertools
1919

20+
from osc_lib.command import command
2021
from osc_lib import utils
2122

22-
from openstackclient.common import command
2323
from openstackclient.i18n import _
2424
from openstackclient.identity import common as identity_common
2525

openstackclient/common/module.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
import sys
1919

20+
from osc_lib.command import command
2021
from osc_lib import utils
2122
import six
2223

23-
from openstackclient.common import command
2424
from openstackclient.i18n import _
2525

2626

openstackclient/common/quota.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
import itertools
1919
import sys
2020

21+
from osc_lib.command import command
2122
from osc_lib import utils
2223
import six
2324

24-
from openstackclient.common import command
2525
from openstackclient.i18n import _
2626

2727

openstackclient/common/timing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
"""Timing Implementation"""
1515

16-
from openstackclient.common import command
16+
from osc_lib.command import command
1717

1818

1919
class Timing(command.Lister):

openstackclient/compute/v2/agent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515

1616
"""Agent action implementations"""
1717

18+
from osc_lib.command import command
1819
from osc_lib import exceptions
1920
from osc_lib import utils
2021
import six
2122

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

2525

openstackclient/compute/v2/aggregate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
"""Compute v2 Aggregate action implementations"""
1818

1919
from osc_lib.cli import parseractions
20+
from osc_lib.command import command
2021
from osc_lib import utils
2122
import six
2223

23-
from openstackclient.common import command
2424
from openstackclient.i18n import _
2525

2626

0 commit comments

Comments
 (0)