Merge "osc-lib: command"

8 files changed, 9 insertions, 9 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 _