diff --git a/cinder/api/v2/views/volumes.py b/cinder/api/v2/views/volumes.py index 41ba40bc9a..b4fde24cd4 100644 --- a/cinder/api/v2/views/volumes.py +++ b/cinder/api/v2/views/volumes.py @@ -66,7 +66,8 @@ def detail(self, request, volume): 'snapshot_id': volume.get('snapshot_id'), 'source_volid': volume.get('source_volid'), 'metadata': self._get_volume_metadata(volume), - 'links': self._get_links(request, volume['id']) + 'links': self._get_links(request, volume['id']), + 'user_id': volume.get('user_id') } } diff --git a/cinder/tests/api/v2/test_volumes.py b/cinder/tests/api/v2/test_volumes.py index 72f8974662..e2dbc17616 100644 --- a/cinder/tests/api/v2/test_volumes.py +++ b/cinder/tests/api/v2/test_volumes.py @@ -239,6 +239,7 @@ def test_volume_update(self): 'device': '/', } ], + 'user_id': 'fakeuser', 'volume_type': 'vol_type_name', 'snapshot_id': None, 'source_volid': None, @@ -280,6 +281,7 @@ def test_volume_update_metadata(self): 'host_name': None, 'device': '/', }], + 'user_id': 'fakeuser', 'volume_type': 'vol_type_name', 'snapshot_id': None, 'source_volid': None, @@ -373,6 +375,7 @@ def test_volume_list_detail(self): 'volume_id': '1' } ], + 'user_id': 'fakeuser', 'volume_type': 'vol_type_name', 'snapshot_id': None, 'source_volid': None, @@ -608,6 +611,7 @@ def test_volume_show(self): 'volume_id': '1' } ], + 'user_id': 'fakeuser', 'volume_type': 'vol_type_name', 'snapshot_id': None, 'source_volid': None, @@ -644,6 +648,7 @@ def stub_volume_get(self, context, volume_id): 'availability_zone': 'fakeaz', 'name': 'displayname', 'attachments': [], + 'user_id': 'fakeuser', 'volume_type': 'vol_type_name', 'snapshot_id': None, 'source_volid': None,