From 9e2b8e67307e739008307e977ce545d49d0956a6 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Fri, 13 May 2016 17:27:12 -0500 Subject: [PATCH] osc-lib: command Leave command.py and test_command.py as a sanity check during the deprecation period. Change-Id: I24e1b755cbfbcbcaeb5273ec0c9706b82384fc85 --- doc/source/plugins.rst | 4 +--- openstackclient/common/availability_zone.py | 2 +- openstackclient/common/configuration.py | 2 +- openstackclient/common/extension.py | 2 +- openstackclient/common/limits.py | 2 +- openstackclient/common/module.py | 2 +- openstackclient/common/quota.py | 2 +- openstackclient/common/timing.py | 2 +- openstackclient/compute/v2/agent.py | 2 +- openstackclient/compute/v2/aggregate.py | 2 +- openstackclient/compute/v2/console.py | 2 +- openstackclient/compute/v2/fixedip.py | 3 +-- openstackclient/compute/v2/flavor.py | 2 +- openstackclient/compute/v2/floatingip.py | 3 +-- openstackclient/compute/v2/floatingippool.py | 3 +-- openstackclient/compute/v2/host.py | 2 +- openstackclient/compute/v2/hypervisor.py | 2 +- openstackclient/compute/v2/hypervisor_stats.py | 2 +- openstackclient/compute/v2/keypair.py | 2 +- openstackclient/compute/v2/server.py | 2 +- openstackclient/compute/v2/server_backup.py | 2 +- openstackclient/compute/v2/server_group.py | 2 +- openstackclient/compute/v2/service.py | 2 +- openstackclient/compute/v2/usage.py | 2 +- openstackclient/identity/v2_0/catalog.py | 2 +- openstackclient/identity/v2_0/ec2creds.py | 2 +- openstackclient/identity/v2_0/endpoint.py | 2 +- openstackclient/identity/v2_0/project.py | 2 +- openstackclient/identity/v2_0/role.py | 2 +- openstackclient/identity/v2_0/service.py | 2 +- openstackclient/identity/v2_0/token.py | 4 ++-- openstackclient/identity/v2_0/user.py | 2 +- openstackclient/identity/v3/catalog.py | 2 +- openstackclient/identity/v3/consumer.py | 2 +- openstackclient/identity/v3/credential.py | 2 +- openstackclient/identity/v3/domain.py | 2 +- openstackclient/identity/v3/ec2creds.py | 2 +- openstackclient/identity/v3/endpoint.py | 2 +- openstackclient/identity/v3/federation_protocol.py | 2 +- openstackclient/identity/v3/group.py | 2 +- openstackclient/identity/v3/identity_provider.py | 2 +- openstackclient/identity/v3/mapping.py | 2 +- openstackclient/identity/v3/policy.py | 2 +- openstackclient/identity/v3/project.py | 2 +- openstackclient/identity/v3/region.py | 2 +- openstackclient/identity/v3/role.py | 2 +- openstackclient/identity/v3/role_assignment.py | 2 +- openstackclient/identity/v3/service.py | 2 +- openstackclient/identity/v3/service_provider.py | 2 +- openstackclient/identity/v3/token.py | 2 +- openstackclient/identity/v3/trust.py | 2 +- openstackclient/identity/v3/unscoped_saml.py | 2 +- openstackclient/identity/v3/user.py | 2 +- openstackclient/image/v1/image.py | 2 +- openstackclient/image/v2/image.py | 2 +- openstackclient/network/common.py | 2 +- openstackclient/network/v2/address_scope.py | 2 +- openstackclient/network/v2/ip_availability.py | 2 +- openstackclient/network/v2/network.py | 2 +- openstackclient/network/v2/network_segment.py | 2 +- openstackclient/network/v2/port.py | 2 +- openstackclient/network/v2/router.py | 2 +- openstackclient/network/v2/subnet.py | 2 +- openstackclient/network/v2/subnet_pool.py | 2 +- openstackclient/object/v1/account.py | 3 +-- openstackclient/object/v1/container.py | 3 +-- openstackclient/object/v1/object.py | 3 +-- openstackclient/tests/common/test_command.py | 2 +- openstackclient/volume/v1/backup.py | 2 +- openstackclient/volume/v1/qos_specs.py | 2 +- openstackclient/volume/v1/service.py | 2 +- openstackclient/volume/v1/snapshot.py | 2 +- openstackclient/volume/v1/volume.py | 2 +- openstackclient/volume/v1/volume_transfer_request.py | 2 +- openstackclient/volume/v1/volume_type.py | 2 +- openstackclient/volume/v2/backup.py | 2 +- openstackclient/volume/v2/qos_specs.py | 2 +- openstackclient/volume/v2/service.py | 2 +- openstackclient/volume/v2/snapshot.py | 2 +- openstackclient/volume/v2/volume.py | 2 +- openstackclient/volume/v2/volume_transfer_request.py | 2 +- openstackclient/volume/v2/volume_type.py | 2 +- 82 files changed, 83 insertions(+), 91 deletions(-) diff --git a/doc/source/plugins.rst b/doc/source/plugins.rst index 8640efbccd..00aa5137ae 100644 --- a/doc/source/plugins.rst +++ b/doc/source/plugins.rst @@ -153,13 +153,11 @@ the plugin commands: # osc-lib interfaces available to plugins: from osc_lib.cli import parseractions + from osc_lib.command import command from osc_lib import exceptions from osc_lib import logs from osc_lib import utils - # OSC common interfaces available to plugins: - from openstackclient.common import command - class DeleteMypluginobject(command.Command): """Delete mypluginobject""" diff --git a/openstackclient/common/availability_zone.py b/openstackclient/common/availability_zone.py index 6117c918a0..af161d1f61 100644 --- a/openstackclient/common/availability_zone.py +++ b/openstackclient/common/availability_zone.py @@ -16,10 +16,10 @@ import copy from novaclient import exceptions as nova_exceptions +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/common/configuration.py b/openstackclient/common/configuration.py index ba4de12d81..d6e2ab45bb 100644 --- a/openstackclient/common/configuration.py +++ b/openstackclient/common/configuration.py @@ -13,9 +13,9 @@ """Configuration action implementations""" +from osc_lib.command import command import six -from openstackclient.common import command from openstackclient.i18n import _ REDACTED = "" diff --git a/openstackclient/common/extension.py b/openstackclient/common/extension.py index 6fcf9fa80d..327fc2238c 100644 --- a/openstackclient/common/extension.py +++ b/openstackclient/common/extension.py @@ -17,9 +17,9 @@ import itertools +from osc_lib.command import command from osc_lib import utils -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/common/limits.py b/openstackclient/common/limits.py index 249d1b443d..f7aa82f62c 100644 --- a/openstackclient/common/limits.py +++ b/openstackclient/common/limits.py @@ -17,9 +17,9 @@ import itertools +from osc_lib.command import command from osc_lib import utils -from openstackclient.common import command from openstackclient.i18n import _ from openstackclient.identity import common as identity_common diff --git a/openstackclient/common/module.py b/openstackclient/common/module.py index 91e779fb28..7c5fcd55a2 100644 --- a/openstackclient/common/module.py +++ b/openstackclient/common/module.py @@ -17,10 +17,10 @@ import sys +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/common/quota.py b/openstackclient/common/quota.py index 6fd1e2f5cc..087d8ea3fd 100644 --- a/openstackclient/common/quota.py +++ b/openstackclient/common/quota.py @@ -18,10 +18,10 @@ import itertools import sys +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/common/timing.py b/openstackclient/common/timing.py index 71c2fec7e7..dd2aeb8343 100644 --- a/openstackclient/common/timing.py +++ b/openstackclient/common/timing.py @@ -13,7 +13,7 @@ """Timing Implementation""" -from openstackclient.common import command +from osc_lib.command import command class Timing(command.Lister): diff --git a/openstackclient/compute/v2/agent.py b/openstackclient/compute/v2/agent.py index 5f7050761c..ce6898c122 100644 --- a/openstackclient/compute/v2/agent.py +++ b/openstackclient/compute/v2/agent.py @@ -15,11 +15,11 @@ """Agent action implementations""" +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/compute/v2/aggregate.py b/openstackclient/compute/v2/aggregate.py index 9e44615d4d..8000c93a0e 100644 --- a/openstackclient/compute/v2/aggregate.py +++ b/openstackclient/compute/v2/aggregate.py @@ -17,10 +17,10 @@ """Compute v2 Aggregate action implementations""" from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/compute/v2/console.py b/openstackclient/compute/v2/console.py index ff7f1af6fa..97d3f318f8 100644 --- a/openstackclient/compute/v2/console.py +++ b/openstackclient/compute/v2/console.py @@ -18,10 +18,10 @@ import sys from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/compute/v2/fixedip.py b/openstackclient/compute/v2/fixedip.py index e3b80c5f39..8bd72ca3d6 100644 --- a/openstackclient/compute/v2/fixedip.py +++ b/openstackclient/compute/v2/fixedip.py @@ -15,10 +15,9 @@ """Fixed IP action implementations""" +from osc_lib.command import command from osc_lib import utils -from openstackclient.common import command - class AddFixedIP(command.Command): """Add fixed IP address to server""" diff --git a/openstackclient/compute/v2/flavor.py b/openstackclient/compute/v2/flavor.py index 439818ebd2..ab2bc85d0f 100644 --- a/openstackclient/compute/v2/flavor.py +++ b/openstackclient/compute/v2/flavor.py @@ -16,11 +16,11 @@ """Flavor action implementations""" from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ from openstackclient.identity import common as identity_common diff --git a/openstackclient/compute/v2/floatingip.py b/openstackclient/compute/v2/floatingip.py index 780ea68474..98079fbc38 100644 --- a/openstackclient/compute/v2/floatingip.py +++ b/openstackclient/compute/v2/floatingip.py @@ -15,10 +15,9 @@ """Floating IP action implementations""" +from osc_lib.command import command from osc_lib import utils -from openstackclient.common import command - class AddFloatingIP(command.Command): """Add floating IP address to server""" diff --git a/openstackclient/compute/v2/floatingippool.py b/openstackclient/compute/v2/floatingippool.py index eb7c9e86be..0d46e32b12 100644 --- a/openstackclient/compute/v2/floatingippool.py +++ b/openstackclient/compute/v2/floatingippool.py @@ -15,10 +15,9 @@ """Floating IP Pool action implementations""" +from osc_lib.command import command from osc_lib import utils -from openstackclient.common import command - class ListFloatingIPPool(command.Lister): """List pools of floating IP addresses""" diff --git a/openstackclient/compute/v2/host.py b/openstackclient/compute/v2/host.py index 15396d0cb7..620b4abbab 100644 --- a/openstackclient/compute/v2/host.py +++ b/openstackclient/compute/v2/host.py @@ -15,9 +15,9 @@ """Host action implementations""" +from osc_lib.command import command from osc_lib import utils -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/compute/v2/hypervisor.py b/openstackclient/compute/v2/hypervisor.py index b13cdb4741..a34f2e1d7f 100644 --- a/openstackclient/compute/v2/hypervisor.py +++ b/openstackclient/compute/v2/hypervisor.py @@ -17,10 +17,10 @@ import re +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/compute/v2/hypervisor_stats.py b/openstackclient/compute/v2/hypervisor_stats.py index 290f54185b..a70f0ce1ca 100644 --- a/openstackclient/compute/v2/hypervisor_stats.py +++ b/openstackclient/compute/v2/hypervisor_stats.py @@ -16,7 +16,7 @@ import six -from openstackclient.common import command +from osc_lib.command import command class ShowHypervisorStats(command.ShowOne): diff --git a/openstackclient/compute/v2/keypair.py b/openstackclient/compute/v2/keypair.py index acf467b303..13c0a99ca1 100644 --- a/openstackclient/compute/v2/keypair.py +++ b/openstackclient/compute/v2/keypair.py @@ -19,11 +19,11 @@ import io import os import sys +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 99429c5a24..eb954c3631 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -22,6 +22,7 @@ import os import sys from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils import six @@ -31,7 +32,6 @@ try: except ImportError: from novaclient.v1_1 import servers -from openstackclient.common import command from openstackclient.i18n import _ from openstackclient.identity import common as identity_common diff --git a/openstackclient/compute/v2/server_backup.py b/openstackclient/compute/v2/server_backup.py index 972db66099..c0e2e5ee4c 100644 --- a/openstackclient/compute/v2/server_backup.py +++ b/openstackclient/compute/v2/server_backup.py @@ -17,12 +17,12 @@ import sys +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils from oslo_utils import importutils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/compute/v2/server_group.py b/openstackclient/compute/v2/server_group.py index 5763ba2fac..955b147e71 100644 --- a/openstackclient/compute/v2/server_group.py +++ b/openstackclient/compute/v2/server_group.py @@ -15,10 +15,10 @@ """Compute v2 Server Group action implementations""" +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/compute/v2/service.py b/openstackclient/compute/v2/service.py index 206344dc9a..304657836c 100644 --- a/openstackclient/compute/v2/service.py +++ b/openstackclient/compute/v2/service.py @@ -15,10 +15,10 @@ """Service action implementations""" +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/compute/v2/usage.py b/openstackclient/compute/v2/usage.py index cc24346f89..2f35b01b13 100644 --- a/openstackclient/compute/v2/usage.py +++ b/openstackclient/compute/v2/usage.py @@ -18,10 +18,10 @@ import datetime import sys +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py index 2de1e8e7a2..62e6b1f97a 100644 --- a/openstackclient/identity/v2_0/catalog.py +++ b/openstackclient/identity/v2_0/catalog.py @@ -13,11 +13,11 @@ """Identity v2 Service Catalog action implementations""" +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/identity/v2_0/ec2creds.py b/openstackclient/identity/v2_0/ec2creds.py index 86f07bce8f..78f65824a6 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.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/identity/v2_0/endpoint.py b/openstackclient/identity/v2_0/endpoint.py index 89c8a38ba9..4ffa363ef7 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.command import command from osc_lib import utils import six -from openstackclient.common import command 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 b03f8381dd..8be482fe57 100644 --- a/openstackclient/identity/v2_0/project.py +++ b/openstackclient/identity/v2_0/project.py @@ -17,10 +17,10 @@ from keystoneauth1 import exceptions as ks_exc from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py index 075234fcdb..4c3fe6e236 100644 --- a/openstackclient/identity/v2_0/role.py +++ b/openstackclient/identity/v2_0/role.py @@ -16,11 +16,11 @@ """Identity v2 Role action implementations""" from keystoneauth1 import exceptions as ks_exc +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py index 631b873798..947f361cf3 100644 --- a/openstackclient/identity/v2_0/service.py +++ b/openstackclient/identity/v2_0/service.py @@ -17,11 +17,11 @@ import argparse +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ from openstackclient.identity import common diff --git a/openstackclient/identity/v2_0/token.py b/openstackclient/identity/v2_0/token.py index d708749d30..56f920f313 100644 --- a/openstackclient/identity/v2_0/token.py +++ b/openstackclient/identity/v2_0/token.py @@ -15,10 +15,10 @@ """Identity v2 Token action implementations""" +from osc_lib.command import command +from osc_lib import exceptions import six -from openstackclient.common import command -from openstackclient.common import exceptions from openstackclient.i18n import _ diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py index a10d213b35..7777bab886 100644 --- a/openstackclient/identity/v2_0/user.py +++ b/openstackclient/identity/v2_0/user.py @@ -16,10 +16,10 @@ """Identity v2.0 User action implementations""" from keystoneauth1 import exceptions as ks_exc +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/identity/v3/catalog.py b/openstackclient/identity/v3/catalog.py index a3286003b8..a6e141c945 100644 --- a/openstackclient/identity/v3/catalog.py +++ b/openstackclient/identity/v3/catalog.py @@ -13,11 +13,11 @@ """Identity v3 Service Catalog action implementations""" +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/identity/v3/consumer.py b/openstackclient/identity/v3/consumer.py index 8aa92f6de2..a4620bf9ef 100644 --- a/openstackclient/identity/v3/consumer.py +++ b/openstackclient/identity/v3/consumer.py @@ -17,10 +17,10 @@ import sys +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/identity/v3/credential.py b/openstackclient/identity/v3/credential.py index 6c65a20658..eeeddfa554 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.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/identity/v3/domain.py b/openstackclient/identity/v3/domain.py index b0cd4d553f..8eb7bc91de 100644 --- a/openstackclient/identity/v3/domain.py +++ b/openstackclient/identity/v3/domain.py @@ -18,10 +18,10 @@ import sys from keystoneauth1 import exceptions as ks_exc +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/identity/v3/ec2creds.py b/openstackclient/identity/v3/ec2creds.py index fe052a3c65..835fe96fd9 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.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ from openstackclient.identity import common diff --git a/openstackclient/identity/v3/endpoint.py b/openstackclient/identity/v3/endpoint.py index 8e433fb9eb..367b4e7b1f 100644 --- a/openstackclient/identity/v3/endpoint.py +++ b/openstackclient/identity/v3/endpoint.py @@ -17,10 +17,10 @@ import sys +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command 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 5050ec6f9a..377ddcceec 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.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/identity/v3/group.py b/openstackclient/identity/v3/group.py index 85087214cd..fb0a25b973 100644 --- a/openstackclient/identity/v3/group.py +++ b/openstackclient/identity/v3/group.py @@ -18,10 +18,10 @@ import sys from keystoneauth1 import exceptions as ks_exc +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command 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 a082f2f4f7..0b530a26fc 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.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/identity/v3/mapping.py b/openstackclient/identity/v3/mapping.py index 723e3bbc4e..5937474e76 100644 --- a/openstackclient/identity/v3/mapping.py +++ b/openstackclient/identity/v3/mapping.py @@ -17,11 +17,11 @@ import json +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/identity/v3/policy.py b/openstackclient/identity/v3/policy.py index f09920318c..68fb273820 100644 --- a/openstackclient/identity/v3/policy.py +++ b/openstackclient/identity/v3/policy.py @@ -17,10 +17,10 @@ import sys +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py index 843767aa14..6145dcf14c 100644 --- a/openstackclient/identity/v3/project.py +++ b/openstackclient/identity/v3/project.py @@ -17,10 +17,10 @@ from keystoneauth1 import exceptions as ks_exc from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ from openstackclient.identity import common diff --git a/openstackclient/identity/v3/region.py b/openstackclient/identity/v3/region.py index da8e36325c..b5e46a9adb 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.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py index 879dbc33d0..1bb2758587 100644 --- a/openstackclient/identity/v3/role.py +++ b/openstackclient/identity/v3/role.py @@ -18,10 +18,10 @@ import sys from keystoneauth1 import exceptions as ks_exc +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command 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 5e1d997a31..39e2336d6f 100644 --- a/openstackclient/identity/v3/role_assignment.py +++ b/openstackclient/identity/v3/role_assignment.py @@ -13,9 +13,9 @@ """Identity v3 Assignment action implementations """ +from osc_lib.command import command from osc_lib import utils -from openstackclient.common import command from openstackclient.i18n import _ from openstackclient.identity import common diff --git a/openstackclient/identity/v3/service.py b/openstackclient/identity/v3/service.py index 450b066c14..7beadc9d18 100644 --- a/openstackclient/identity/v3/service.py +++ b/openstackclient/identity/v3/service.py @@ -17,10 +17,10 @@ import sys +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command 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 5bb15463f9..0beea81379 100644 --- a/openstackclient/identity/v3/service_provider.py +++ b/openstackclient/identity/v3/service_provider.py @@ -15,10 +15,10 @@ import sys +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/identity/v3/token.py b/openstackclient/identity/v3/token.py index 0eefbf3b6e..ecf09693e0 100644 --- a/openstackclient/identity/v3/token.py +++ b/openstackclient/identity/v3/token.py @@ -15,11 +15,11 @@ """Identity v3 Token action implementations""" +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ from openstackclient.identity import common diff --git a/openstackclient/identity/v3/trust.py b/openstackclient/identity/v3/trust.py index 0f900250e7..bbc86adb90 100644 --- a/openstackclient/identity/v3/trust.py +++ b/openstackclient/identity/v3/trust.py @@ -15,10 +15,10 @@ import datetime +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command 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 901fa26e37..f116174b32 100644 --- a/openstackclient/identity/v3/unscoped_saml.py +++ b/openstackclient/identity/v3/unscoped_saml.py @@ -17,10 +17,10 @@ The first step of federated auth is to fetch an unscoped token. From there, the user can list domains and projects they are allowed to access, and request a scoped token.""" +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py index b2e60f8f1b..39125e2cd2 100644 --- a/openstackclient/identity/v3/user.py +++ b/openstackclient/identity/v3/user.py @@ -19,10 +19,10 @@ import copy import sys from keystoneauth1 import exceptions as ks_exc +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ from openstackclient.identity import common diff --git a/openstackclient/image/v1/image.py b/openstackclient/image/v1/image.py index f137f262a9..1644809d76 100644 --- a/openstackclient/image/v1/image.py +++ b/openstackclient/image/v1/image.py @@ -27,11 +27,11 @@ else: from glanceclient.common import utils as gc_utils from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import utils import six from openstackclient.api import utils as api_utils -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py index 7d663a6c83..62f7bee88c 100644 --- a/openstackclient/image/v2/image.py +++ b/openstackclient/image/v2/image.py @@ -19,12 +19,12 @@ import argparse from glanceclient.common import utils as gc_utils from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils import six from openstackclient.api import utils as api_utils -from openstackclient.common import command from openstackclient.i18n import _ from openstackclient.identity import common diff --git a/openstackclient/network/common.py b/openstackclient/network/common.py index 10c61ab1b8..16cc7379ba 100644 --- a/openstackclient/network/common.py +++ b/openstackclient/network/common.py @@ -13,10 +13,10 @@ import abc +from osc_lib.command import command from osc_lib import exceptions import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/network/v2/address_scope.py b/openstackclient/network/v2/address_scope.py index fc2ff3f345..bc1a96c326 100644 --- a/openstackclient/network/v2/address_scope.py +++ b/openstackclient/network/v2/address_scope.py @@ -13,10 +13,10 @@ """Address scope action implementations""" +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils -from openstackclient.common import command from openstackclient.i18n import _ from openstackclient.identity import common as identity_common diff --git a/openstackclient/network/v2/ip_availability.py b/openstackclient/network/v2/ip_availability.py index 6974a24626..d429e86c8b 100644 --- a/openstackclient/network/v2/ip_availability.py +++ b/openstackclient/network/v2/ip_availability.py @@ -13,9 +13,9 @@ """IP Availability Info implementations""" +from osc_lib.command import command from osc_lib import utils -from openstackclient.common import command 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 81e96fb254..4d01accda9 100644 --- a/openstackclient/network/v2/network.py +++ b/openstackclient/network/v2/network.py @@ -13,9 +13,9 @@ """Network action implementations""" +from osc_lib.command import command from osc_lib import utils -from openstackclient.common import command 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 e965d2ebb2..bedf15f7d7 100644 --- a/openstackclient/network/v2/network_segment.py +++ b/openstackclient/network/v2/network_segment.py @@ -15,9 +15,9 @@ # TODO(rtheis): Add description and name properties when support is available. +from osc_lib.command import command from osc_lib import utils -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py index a040f20f48..1c5db706e3 100644 --- a/openstackclient/network/v2/port.py +++ b/openstackclient/network/v2/port.py @@ -17,10 +17,10 @@ import argparse import logging from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils -from openstackclient.common import command 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 db3a90e114..92ecf84d2c 100644 --- a/openstackclient/network/v2/router.py +++ b/openstackclient/network/v2/router.py @@ -18,9 +18,9 @@ import json import logging from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import utils -from openstackclient.common import command from openstackclient.i18n import _ from openstackclient.identity import common as identity_common diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py index 6bdb9a5486..ceb1cb1471 100644 --- a/openstackclient/network/v2/subnet.py +++ b/openstackclient/network/v2/subnet.py @@ -16,10 +16,10 @@ import copy from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils -from openstackclient.common import command 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 7e0bb2c0a0..79f98fd919 100644 --- a/openstackclient/network/v2/subnet_pool.py +++ b/openstackclient/network/v2/subnet_pool.py @@ -14,9 +14,9 @@ """Subnet pool action implementations""" from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import utils -from openstackclient.common import command from openstackclient.i18n import _ from openstackclient.identity import common as identity_common diff --git a/openstackclient/object/v1/account.py b/openstackclient/object/v1/account.py index 8ef3468726..801fe4504a 100644 --- a/openstackclient/object/v1/account.py +++ b/openstackclient/object/v1/account.py @@ -14,11 +14,10 @@ """Account v1 action implementations""" from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command - class SetAccount(command.Command): """Set account properties""" diff --git a/openstackclient/object/v1/container.py b/openstackclient/object/v1/container.py index f26b64a1f4..2b021ec25f 100644 --- a/openstackclient/object/v1/container.py +++ b/openstackclient/object/v1/container.py @@ -17,11 +17,10 @@ from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command - class CreateContainer(command.Lister): """Create new container""" diff --git a/openstackclient/object/v1/object.py b/openstackclient/object/v1/object.py index 820780ff39..39dba3d5c7 100644 --- a/openstackclient/object/v1/object.py +++ b/openstackclient/object/v1/object.py @@ -17,11 +17,10 @@ from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command - class CreateObject(command.Lister): """Upload object to container""" diff --git a/openstackclient/tests/common/test_command.py b/openstackclient/tests/common/test_command.py index 658bc895c0..a8bcf6a81a 100644 --- a/openstackclient/tests/common/test_command.py +++ b/openstackclient/tests/common/test_command.py @@ -14,9 +14,9 @@ import mock +from osc_lib.command import command from osc_lib import exceptions -from openstackclient.common import command from openstackclient.tests import fakes as test_fakes from openstackclient.tests import utils as test_utils diff --git a/openstackclient/volume/v1/backup.py b/openstackclient/volume/v1/backup.py index f70d9b42e1..212c74eff2 100644 --- a/openstackclient/volume/v1/backup.py +++ b/openstackclient/volume/v1/backup.py @@ -17,10 +17,10 @@ import copy +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/volume/v1/qos_specs.py b/openstackclient/volume/v1/qos_specs.py index d26d9af48d..56a96256ac 100644 --- a/openstackclient/volume/v1/qos_specs.py +++ b/openstackclient/volume/v1/qos_specs.py @@ -16,10 +16,10 @@ """Volume v1 QoS action implementations""" from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/volume/v1/service.py b/openstackclient/volume/v1/service.py index c065b526bd..2df38573d4 100644 --- a/openstackclient/volume/v1/service.py +++ b/openstackclient/volume/v1/service.py @@ -14,9 +14,9 @@ """Service action implementations""" +from osc_lib.command import command from osc_lib import utils -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/volume/v1/snapshot.py b/openstackclient/volume/v1/snapshot.py index c931eeffa8..41127af5dd 100644 --- a/openstackclient/volume/v1/snapshot.py +++ b/openstackclient/volume/v1/snapshot.py @@ -18,10 +18,10 @@ import copy from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/volume/v1/volume.py b/openstackclient/volume/v1/volume.py index a302ab38d2..7a3bfb971b 100644 --- a/openstackclient/volume/v1/volume.py +++ b/openstackclient/volume/v1/volume.py @@ -18,10 +18,10 @@ import argparse from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/volume/v1/volume_transfer_request.py b/openstackclient/volume/v1/volume_transfer_request.py index 9cffe98831..5d8ff6839c 100644 --- a/openstackclient/volume/v1/volume_transfer_request.py +++ b/openstackclient/volume/v1/volume_transfer_request.py @@ -14,9 +14,9 @@ """Volume v2 transfer action implementations""" +from osc_lib.command import command from osc_lib import utils -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/volume/v1/volume_type.py b/openstackclient/volume/v1/volume_type.py index fb93753076..289966e52e 100644 --- a/openstackclient/volume/v1/volume_type.py +++ b/openstackclient/volume/v1/volume_type.py @@ -16,10 +16,10 @@ """Volume v1 Type action implementations""" from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/volume/v2/backup.py b/openstackclient/volume/v2/backup.py index 371ddafddf..6a44e30c57 100644 --- a/openstackclient/volume/v2/backup.py +++ b/openstackclient/volume/v2/backup.py @@ -16,10 +16,10 @@ import copy +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/volume/v2/qos_specs.py b/openstackclient/volume/v2/qos_specs.py index 43772b55d9..7ec272b38e 100644 --- a/openstackclient/volume/v2/qos_specs.py +++ b/openstackclient/volume/v2/qos_specs.py @@ -16,10 +16,10 @@ """Volume v2 QoS action implementations""" from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/volume/v2/service.py b/openstackclient/volume/v2/service.py index c065b526bd..2df38573d4 100644 --- a/openstackclient/volume/v2/service.py +++ b/openstackclient/volume/v2/service.py @@ -14,9 +14,9 @@ """Service action implementations""" +from osc_lib.command import command from osc_lib import utils -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/volume/v2/snapshot.py b/openstackclient/volume/v2/snapshot.py index 39af1bd2fd..439904e744 100644 --- a/openstackclient/volume/v2/snapshot.py +++ b/openstackclient/volume/v2/snapshot.py @@ -17,10 +17,10 @@ import copy from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/volume/v2/volume.py b/openstackclient/volume/v2/volume.py index c6175c4b6a..b1a3af2efc 100644 --- a/openstackclient/volume/v2/volume.py +++ b/openstackclient/volume/v2/volume.py @@ -17,10 +17,10 @@ import copy from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ from openstackclient.identity import common as identity_common diff --git a/openstackclient/volume/v2/volume_transfer_request.py b/openstackclient/volume/v2/volume_transfer_request.py index 9cffe98831..5d8ff6839c 100644 --- a/openstackclient/volume/v2/volume_transfer_request.py +++ b/openstackclient/volume/v2/volume_transfer_request.py @@ -14,9 +14,9 @@ """Volume v2 transfer action implementations""" +from osc_lib.command import command from osc_lib import utils -from openstackclient.common import command from openstackclient.i18n import _ diff --git a/openstackclient/volume/v2/volume_type.py b/openstackclient/volume/v2/volume_type.py index edea91fd77..dc6b4f9b27 100644 --- a/openstackclient/volume/v2/volume_type.py +++ b/openstackclient/volume/v2/volume_type.py @@ -15,11 +15,11 @@ """Volume v2 Type action implementations""" from osc_lib.cli import parseractions +from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils import six -from openstackclient.common import command from openstackclient.i18n import _ from openstackclient.identity import common as identity_common