Merge "osc-lib: command"

29 files changed, 30 insertions, 30 deletions

diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py
index 2de1e8e7..62e6b1f9 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 86f07bce..78f65824 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 89c8a38b..4ffa363e 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 b03f8381..8be482fe 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 075234fc..4c3fe6e2 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 631b8737..947f361c 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 d708749d..56f920f3 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 a10d213b..7777bab8 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 a3286003..a6e141c9 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 8aa92f6d..a4620bf9 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 6c65a206..eeeddfa5 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 b0cd4d55..8eb7bc91 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 fe052a3c..835fe96f 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 8e433fb9..367b4e7b 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 5050ec6f..377ddcce 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 85087214..fb0a25b9 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 a082f2f4..0b530a26 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 723e3bbc..5937474e 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 f0992031..68fb2738 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 843767aa..6145dcf1 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 da8e3632..b5e46a9a 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 879dbc33..1bb27585 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 5e1d997a..39e2336d 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 450b066c..7beadc9d 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 5bb15463..0beea813 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 0eefbf3b..ecf09693 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 0f900250..bbc86adb 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 901fa26e..f116174b 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 b2e60f8f..39125e2c 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