openstack/manila
Code Issues Proposed changes

Merge "Add share network id field in share server info"

Browse Source
This commit is contained in:
Jenkins 2014-10-12 16:08:30 +00:00 committed by Gerrit Code Review
commit c5e48b592b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manila/api/views/share_servers.py
View File

@ -46,6 +46,7 @@ class ViewBuilder(common.ViewBuilder):
'status': share_server.status,
'host': share_server.host,
'share_network_name': share_server.share_network_name,
'share_network_id': share_server.share_network_id,
}
if detailed:
share_server_dict['created_at'] = share_server.created_at

3
manila/tests/api/v1/test_share_servers.py
View File

@ -31,6 +31,7 @@ fake_share_server_list = {
'status': constants.STATUS_ACTIVE,
'updated_at': None,
'host': 'fake_host',
'share_network_id': 'fake_sn_id',
'share_network_name': 'fake_sn_name',
'project_id': 'fake_project_id',
'id': 'fake_server_id',
@ -39,6 +40,7 @@ fake_share_server_list = {
'status': constants.STATUS_ERROR,
'updated_at': None,
'host': 'fake_host_2',
'share_network_id': 'fake_sn_id_2',
'share_network_name': 'fake_sn_id_2',
'project_id': 'fake_project_id_2',
'id': 'fake_server_id_2',
@ -54,6 +56,7 @@ fake_share_server_get_result = {
'updated_at': None,
'host': 'fake_host',
'share_network_name': 'fake_sn_name',
'share_network_id': 'fake_sn_id',
'project_id': 'fake_project_id',
'id': 'fake_server_id',
'backend_details': {