summaryrefslogtreecommitdiff
path: root/openstackclient/image
diff options
context:
space:
mode:
Diffstat (limited to 'openstackclient/image')
-rw-r--r--openstackclient/image/v1/image.py13
-rw-r--r--openstackclient/image/v2/image.py7
2 files changed, 10 insertions, 10 deletions
diff --git a/openstackclient/image/v1/image.py b/openstackclient/image/v1/image.py
index 64aa3fcd..43ccf5d2 100644
--- a/openstackclient/image/v1/image.py
+++ b/openstackclient/image/v1/image.py
@@ -28,7 +28,6 @@ from osc_lib.cli import parseractions
from osc_lib.command import command
from osc_lib import utils
-from openstackclient.common import sdk_utils
from openstackclient.i18n import _
if os.name == "nt":
@@ -48,15 +47,17 @@ LOG = logging.getLogger(__name__)
def _get_columns(item):
- # Trick sdk_utils to return URI attribute
column_map = {
'is_protected': 'protected',
'owner_id': 'owner'
}
- hidden_columns = ['location', 'checksum',
- 'copy_from', 'created_at', 'status', 'updated_at']
- return sdk_utils.get_osc_show_columns_for_sdk_resource(
- item.to_dict(), column_map, hidden_columns)
+ hidden_columns = [
+ 'location', 'checksum', 'copy_from', 'created_at', 'status',
+ 'updated_at',
+ ]
+ return utils.get_osc_show_columns_for_sdk_resource(
+ item.to_dict(), column_map, hidden_columns,
+ )
_formatters = {
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
index c1f46d2d..becb54f4 100644
--- a/openstackclient/image/v2/image.py
+++ b/openstackclient/image/v2/image.py
@@ -31,7 +31,6 @@ from osc_lib import exceptions
from osc_lib import utils
from openstackclient.common import progressbar
-from openstackclient.common import sdk_utils
from openstackclient.i18n import _
from openstackclient.identity import common
@@ -99,13 +98,13 @@ _formatters = {
def _get_member_columns(item):
- # Trick sdk_utils to return URI attribute
column_map = {
'image_id': 'image_id'
}
hidden_columns = ['id', 'location', 'name']
- return sdk_utils.get_osc_show_columns_for_sdk_resource(
- item.to_dict(), column_map, hidden_columns)
+ return utils.get_osc_show_columns_for_sdk_resource(
+ item.to_dict(), column_map, hidden_columns,
+ )
def get_data_file(args):