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

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

@@ -38,9 +38,9 @@ class Controller(object):
unit = get_session() unit = get_session()
if unit.query(Session).filter(Session.environment_id == environment_id if unit.query(Session).filter(Session.environment_id == environment_id
and and
Session.state.in_(['open', 'deploing']) Session.state.in_(['open', 'deploing'])
).first(): ).first():
log.info('There is already open session for this environment') log.info('There is already open session for this environment')
raise exc.HTTPConflict raise exc.HTTPConflict
@@ -55,7 +55,7 @@ class Controller(object):
def show(self, request, environment_id, session_id): def show(self, request, environment_id, session_id):
log.debug(_('Session:Show <EnvId: {0}, SessionId: {1}>'. log.debug(_('Session:Show <EnvId: {0}, SessionId: {1}>'.
format(environment_id, session_id))) format(environment_id, session_id)))
unit = get_session() unit = get_session()
session = unit.query(Session).get(session_id) session = unit.query(Session).get(session_id)
@@ -68,7 +68,7 @@ class Controller(object):
def delete(self, request, environment_id, session_id): def delete(self, request, environment_id, session_id):
log.debug(_('Session:Delete <EnvId: {0}, SessionId: {1}>'. log.debug(_('Session:Delete <EnvId: {0}, SessionId: {1}>'.
format(environment_id, session_id))) format(environment_id, session_id)))
unit = get_session() unit = get_session()
session = unit.query(Session).get(session_id) session = unit.query(Session).get(session_id)
@@ -85,18 +85,24 @@ class Controller(object):
def reports(self, request, environment_id, session_id): def reports(self, request, environment_id, session_id):
log.debug(_('Session:Reports <EnvId: {0}, SessionId: {1}>'. log.debug(_('Session:Reports <EnvId: {0}, SessionId: {1}>'.
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 = []
services += environment['services']['webServers'] 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']
service = [service for service in services service = [service for service in services
if service['id'] == service_id][0] if service['id'] == service_id][0]
@@ -106,14 +112,14 @@ 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]}
def deploy(self, request, environment_id, session_id): def deploy(self, request, environment_id, session_id):
log.debug(_('Session:Deploy <EnvId: {0}, SessionId: {1}>'. log.debug(_('Session:Deploy <EnvId: {0}, SessionId: {1}>'.
format(environment_id, session_id))) format(environment_id, session_id)))
unit = get_session() unit = get_session()
session = unit.query(Session).get(session_id) session = unit.query(Session).get(session_id)