Skip to content

Commit 8aee1a2

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Adds command image metadef object show"
2 parents 71f232a + 78ef009 commit 8aee1a2

5 files changed

Lines changed: 84 additions & 4 deletions

File tree

doc/source/cli/data/glance.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ md-object-create,image metadef object create,Create a new metadata definitions o
3636
md-object-delete,,Delete a specific metadata definitions object inside a namespace.
3737
md-object-list,,List metadata definitions objects inside a specific namespace.
3838
md-object-property-show,,Describe a specific metadata definitions property inside an object.
39-
md-object-show,,Describe a specific metadata definitions object inside a namespace.
39+
md-object-show,image metadef object show,Describe a specific metadata definitions object inside a namespace.
4040
md-object-update,,Update metadata definitions object inside a namespace.
4141
md-property-create,image metadef property create,Create a new metadata definitions property inside a namespace.
4242
md-property-delete,image metadef property delete,Delete a specific metadata definitions property inside a namespace.

openstackclient/image/v2/metadef_objects.py

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2012-2013 OpenStack Foundation
1+
# Copyright 2023 Red Hat
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License"); you may
44
# not use this file except in compliance with the License. You may obtain
@@ -73,3 +73,35 @@ def take_action(self, parsed_args):
7373
fields, value = _format_object(data)
7474

7575
return fields, value
76+
77+
78+
class ShowMetadefObjects(command.ShowOne):
79+
_description = _(
80+
"Describe a specific metadata definitions" "object inside a namespace"
81+
)
82+
83+
def get_parser(self, prog_name):
84+
parser = super().get_parser(prog_name)
85+
parser.add_argument(
86+
"namespace_name",
87+
metavar="<namespace_name>",
88+
help=_("Namespace (name) for the namespace"),
89+
)
90+
parser.add_argument(
91+
"object_name",
92+
metavar="<object_name>",
93+
help=_("Name of an object."),
94+
)
95+
return parser
96+
97+
def take_action(self, parsed_args):
98+
image_client = self.app.client_manager.image
99+
100+
namespace_name = parsed_args.namespace_name
101+
object_name = parsed_args.object_name
102+
103+
data = image_client.get_metadef_object(object_name, namespace_name)
104+
105+
fields, value = _format_object(data)
106+
107+
return fields, value

openstackclient/tests/unit/image/v2/test_metadef_objects.py

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2012-2013 OpenStack Foundation
1+
# Copyright 2023 Red Hat
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License"); you may
44
# not use this file except in compliance with the License. You may obtain
@@ -41,7 +41,6 @@ class TestMetadefObjectsCreate(fakes.TestImagev2):
4141

4242
def setUp(self):
4343
super().setUp()
44-
4544
self.image_client.create_metadef_object.return_value = (
4645
self._metadef_objects
4746
)
@@ -55,6 +54,49 @@ def test_namespace_create(self):
5554
]
5655
verifylist = []
5756
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
57+
columns, data = self.cmd.take_action(parsed_args)
58+
self.assertEqual(self.expected_columns, columns)
59+
self.assertEqual(self.expected_data, data)
60+
61+
62+
class TestMetadefObjectsShow(fakes.TestImagev2):
63+
_metadef_namespace = fakes.create_one_metadef_namespace()
64+
_metadef_objects = fakes.create_one_metadef_object()
65+
66+
expected_columns = (
67+
'created_at',
68+
'description',
69+
'name',
70+
'namespace_name',
71+
'properties',
72+
'required',
73+
'updated_at',
74+
)
75+
expected_data = (
76+
_metadef_objects.created_at,
77+
_metadef_objects.description,
78+
_metadef_objects.name,
79+
_metadef_objects.namespace_name,
80+
_metadef_objects.properties,
81+
_metadef_objects.required,
82+
_metadef_objects.updated_at,
83+
)
84+
85+
def setUp(self):
86+
super().setUp()
87+
88+
self.image_client.get_metadef_object.return_value = (
89+
self._metadef_objects
90+
)
91+
self.cmd = metadef_objects.ShowMetadefObjects(self.app, None)
92+
93+
def test_object_show(self):
94+
arglist = [
95+
self._metadef_namespace.namespace,
96+
self._metadef_objects.name,
97+
]
98+
verifylist = []
99+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
58100

59101
columns, data = self.cmd.take_action(parsed_args)
60102

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
features:
3+
- |
4+
Add ``image metadef object show`` command to show the
5+
metadata definitions objects inside a specific namespace

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,7 @@ openstack.image.v2 =
398398
image_metadef_namespace_show = openstackclient.image.v2.metadef_namespaces:ShowMetadefNameSpace
399399

400400
image_metadef_object_create = openstackclient.image.v2.metadef_objects:CreateMetadefObjects
401+
image_metadef_object_show = openstackclient.image.v2.metadef_objects:ShowMetadefObjects
401402

402403
image_metadef_property_create = openstackclient.image.v2.metadef_properties:CreateMetadefProperty
403404
image_metadef_property_delete = openstackclient.image.v2.metadef_properties:DeleteMetadefProperty

0 commit comments

Comments
 (0)