Merge "osc-lib: command"

16 files changed, 16 insertions, 19 deletions

diff --git a/openstackclient/compute/v2/agent.py b/openstackclient/compute/v2/agent.py
index 5f705076..ce6898c1 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 9e44615d..8000c93a 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 ff7f1af6..97d3f318 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 e3b80c5f..8bd72ca3 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 439818eb..ab2bc85d 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 780ea684..98079fbc 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 eb7c9e86..0d46e32b 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 15396d0c..620b4abb 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 b13cdb47..a34f2e1d 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 290f5418..a70f0ce1 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 acf467b3..13c0a99c 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 99429c5a..eb954c36 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 972db660..c0e2e5ee 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 5763ba2f..955b147e 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 206344dc..30465783 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 cc24346f..2f35b01b 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 _