Merge "osc-lib: command"

8 files changed, 8 insertions, 8 deletions

diff --git a/openstackclient/network/v2/address_scope.py b/openstackclient/network/v2/address_scope.py
index fc2ff3f3..bc1a96c3 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 6974a246..d429e86c 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 81e96fb2..4d01accd 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 e965d2eb..bedf15f7 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 a040f20f..1c5db706 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 db3a90e1..92ecf84d 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 6bdb9a54..ceb1cb14 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 7e0bb2c0..79f98fd9 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