stackforge-attic/murano-docs
Code Issues Proposed changes

Fix issue with statuses

Browse Source
This commit is contained in:
Serg Melikyan
2013-03-28 16:53:50 +04:00
parent e033d096aa
commit abb80e7787
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
portas/portas/api/v1/sessions.py
View File

@@ -88,14 +88,20 @@ class Controller(object):
format(environment_id, session_id))) format(environment_id, session_id)))
unit = get_session() unit = get_session()
statuses = unit.query(Status).filter_by(session_id=session_id) statuses = unit.query(Status).filter_by(session_id=session_id).all()
result = statuses result = statuses
if request.GET['service_id']: if 'service_id' in request.GET:
service_id = request.GET['service_id'] service_id = request.GET['service_id']
environment = unit.query(Session).get(session_id).description environment = unit.query(Session).get(session_id).description
services = environment['services']['activeDirectories'] services = []
if 'services' in environment and \
'activeDirectories' in environment['services']:
services += environment['services']['activeDirectories']
if 'services' in environment and \
'webServers' in environment['services']:
services += environment['services']['webServers'] services += environment['services']['webServers']
service = [service for service in services service = [service for service in services
@@ -106,7 +112,7 @@ class Controller(object):
entities.append(service_id) entities.append(service_id)
result = [] result = []
for status in statuses: for status in statuses:
if status['id'] in entities: if status.entity_id in entities:
result.append(status) result.append(status)
return {'reports': [status.to_dict() for status in result]} return {'reports': [status.to_dict() for status in result]}