Skip to content

Commit 46f1676

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "Fix issue when displaying image_member"
2 parents daf1e09 + 12668b3 commit 46f1676

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

openstackclient/image/v2/image.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def take_action(self, parsed_args):
105105
project_id,
106106
)
107107

108-
return zip(*sorted(six.iteritems(image_member._info)))
108+
return zip(*sorted(six.iteritems(image_member)))
109109

110110

111111
class CreateImage(show.ShowOne):

openstackclient/tests/fakes.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,3 +150,11 @@ def __init__(self, headers={}, status_code=200, data=None, encoding=None):
150150
self._content = json.dumps(data)
151151
if not isinstance(self._content, six.binary_type):
152152
self._content = self._content.encode()
153+
154+
155+
class FakeModel(dict):
156+
def __getattr__(self, key):
157+
try:
158+
return self[key]
159+
except KeyError:
160+
raise AttributeError(key)

openstackclient/tests/image/v2/test_image.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,8 @@ def setUp(self):
238238
copy.deepcopy(image_fakes.IMAGE),
239239
loaded=True,
240240
)
241-
self.image_members_mock.create.return_value = fakes.FakeResource(
242-
None,
241+
self.image_members_mock.create.return_value = fakes.FakeModel(
243242
copy.deepcopy(image_fakes.MEMBER),
244-
loaded=True,
245243
)
246244
self.project_mock.get.return_value = fakes.FakeResource(
247245
None,

0 commit comments

Comments
 (0)