openstack/python-manilaclient
Code Issues Proposed changes

Merge "Fix for displaying export locations for share snapshot."

Browse Source
This commit is contained in:
Zuul
2022-05-19 14:57:52 +00:00
committed by Gerrit Code Review
parent c3bdc39434 af35d25900
commit 91c0d79807
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manilaclient/osc/v2/share_snapshots.py
View File

@@ -177,11 +177,17 @@ class ShowShareSnapshot(command.ShowOne):
share_client.share_snapshot_export_locations.list( share_client.share_snapshot_export_locations.list(
share_snapshot)) share_snapshot))
export_locations = cliutils.convert_dict_list_to_string( locations = []
export_locations, ignored_keys=['links']) for location in export_locations:
location._info.pop('links', None)
locations.append(location._info)
if parsed_args.formatter == 'table':
locations = cliutils.convert_dict_list_to_string(
locations)
data = share_snapshot._info data = share_snapshot._info
data['export_locations'] = export_locations data['export_locations'] = locations
data.pop('links', None) data.pop('links', None)
return self.dict2columns(data) return self.dict2columns(data)

1
manilaclient/tests/unit/osc/v2/test_share_snapshots.py
View File

@@ -362,6 +362,7 @@ class TestShareSnapshotShow(TestShareSnapshot):
self.data = self.share_snapshot._info.values() self.data = self.share_snapshot._info.values()
self.columns = self.share_snapshot._info.keys() self.columns = self.share_snapshot._info.keys()
self.export_locations_mock.list.return_value = [self.export_location]
def test_share_snapshot_show_missing_args(self): def test_share_snapshot_show_missing_args(self):
arglist = [] arglist = []