x/compass-core
Code Issues Proposed changes

change networks format from list to dict

Browse Source 
Change-Id: I765be481a057824b2705c55da6adfde97da97e15
This commit is contained in:
xiaodongwang 2014-09-05 20:50:05 -07:00
parent 06e90df04a
commit a7a1fec019
2 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
compass/api/api.py
View File

@ -162,6 +162,19 @@ def _wrap_response(func, response_code):
return wrapped_func
def _reformat_host(host):
if isinstance(host, list):
return [_reformat_host(item) for item in host]
if 'networks' in host:
networks = host['networks']
network_mapping = {}
for network in networks:
if 'interface' in network:
network_mapping[network['interface']] = network
host['networks'] = network_mapping
return host
def _login(use_cookie):
"""User login helper function."""
data = _get_request_data()
@ -1434,9 +1447,9 @@ def list_cluster_hosts(cluster_id):
data = _get_request_args()
return utils.make_json_response(
200,
cluster_api.list_cluster_hosts(
_reformat_host(cluster_api.list_cluster_hosts(
current_user, cluster_id, **data
)
))
)
@ -1448,9 +1461,9 @@ def list_clusterhosts():
data = _get_request_args()
return utils.make_json_response(
200,
cluster_api.list_clusterhosts(
_reformat_host(cluster_api.list_clusterhosts(
current_user, **data
)
))
)
@ -1462,9 +1475,9 @@ def show_cluster_host(cluster_id, host_id):
data = _get_request_args()
return utils.make_json_response(
200,
cluster_api.get_cluster_host(
_reformat_host(cluster_api.get_cluster_host(
current_user, cluster_id, host_id, **data
)
))
)
@ -1476,9 +1489,9 @@ def show_clusterhost(clusterhost_id):
data = _get_request_args()
return utils.make_json_response(
200,
cluster_api.get_clusterhost(
_reformat_host(cluster_api.get_clusterhost(
current_user, clusterhost_id, **data
)
))
)
@ -1790,9 +1803,9 @@ def list_hosts():
data = _get_request_args()
return utils.make_json_response(
200,
host_api.list_hosts(
_reformat_host(host_api.list_hosts(
current_user, **data
)
))
)
@ -1804,9 +1817,9 @@ def show_host(host_id):
data = _get_request_args()
return utils.make_json_response(
200,
host_api.get_host(
_reformat_host(host_api.get_host(
current_user, host_id, **data
)
))
)
@ -1822,9 +1835,9 @@ def list_machines_or_hosts():
_filter_general(data, 'os_name')
return utils.make_json_response(
200,
host_api.list_machines_or_hosts(
_reformat_host(host_api.list_machines_or_hosts(
current_user, **data
)
))
)
@ -1836,9 +1849,9 @@ def show_machine_or_host(host_id):
data = _get_request_args()
return utils.make_json_response(
200,
host_api.get_machine_or_host(
_reformat_host(host_api.get_machine_or_host(
current_user, host_id, **data
)
))
)

2
compass/db/api/switch.py
View File

@ -88,7 +88,7 @@ RESP_MACHINES_HOSTS_FIELDS = [
'id', 'switch_id', 'switch_ip', 'machine_id', 'switch_machine_id',
'port', 'vlans', 'mac',
'ipmi_credentials', 'tag', 'location',
'name', 'os_name', 'clusters',
'name', 'hostname', 'os_name', 'clusters',
'created_at', 'updated_at'
]
RESP_CLUSTER_FIELDS = [