Merge "osc-lib: command"

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"""

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 _
 
 

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 = "<redacted>"

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 _
 
 

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
 

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 _
 
 

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 _
 
 

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):

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 _
 
 

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 _
 
 

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 _
 
 

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"""

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
 

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"""

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"""

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 _
 
 

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 _
 
 

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):

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 _
 
 

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
 

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 _
 
 

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 _
 
 

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 _
 
 

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 _
 
 

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 _
 
 

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 _
 
 

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
 

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 _
 
 

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 _
 
 

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
 

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 _
 
 

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 _
 
 

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 _
 
 

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 _
 
 

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 _
 
 

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 _
 
 

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
 

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
 

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 _
 
 

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
 

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 _
 
 

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 _
 
 

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 _
 
 

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
 

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 _
 
 

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
 

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
 

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
 

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 _
 
 

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
 

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
 

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 _
 
 

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
 

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 _
 
 

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
 

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 _
 
 

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
 

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
 

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

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 _
 
 

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
 

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
 

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
 

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
 

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"""

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"""

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"""

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
 

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 _
 
 

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 _
 
 

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 _
 
 

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 _
 
 

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 _
 
 

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 _
 
 

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 _
 
 

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 _
 
 

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 _
 
 

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 _
 
 

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 _
 
 

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
 

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 _
 
 

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