stackforge-attic/murano-docs
Code Issues Proposed changes

Fix PEP8 errors

Browse Source
This commit is contained in:
Serg Melikyan 2013-03-28 17:28:39 +04:00
parent e6801a9edd
commit 4d4d03d2c0
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
portas/portas/api/v1/__init__.py
View File

@ -28,10 +28,10 @@ def get_env_status(environment_id, session_id):
if not session_id: if not session_id:
variants = ['open', 'deploying'] variants = ['open', 'deploying']
session = unit.query(Session).filter(Session.environment_id == session = unit.query(Session).filter(
environment_id and Session.environment_id == environment_id and
Session.state.in_(variants) Session.state.in_(variants)
).first() ).first()
if session: if session:
session_id = session.id session_id = session.id
else: else:
@ -79,10 +79,10 @@ def get_service_status(environment_id, session_id, service):
entities = [u['id'] for u in service['units']] entities = [u['id'] for u in service['units']]
reports_count = unit.query(Status).filter( reports_count = unit.query(Status).filter(
Status.environment_id == environment_id Status.environment_id == environment_id
and Status.session_id == session_id and Status.session_id == session_id
and Status.entity_id.in_(entities) and Status.entity_id.in_(entities)
).count() ).count()
if session_state == 'deployed': if session_state == 'deployed':
status = 'finished' status = 'finished'

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

@ -37,9 +37,9 @@ class Controller(object):
session.update(params) session.update(params)
unit = get_session() unit = get_session()
if unit.query(Session).filter(Session.environment_id == environment_id if unit.query(Session).filter(
and Session.environment_id == environment_id and
Session.state.in_(['open', 'deploing']) Session.state.in_(['open', 'deploying'])
).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
@ -54,8 +54,8 @@ class Controller(object):
return session.to_dict() return session.to_dict()
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}, '
format(environment_id, session_id))) 'SessionId: {1}>'.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)
@ -67,8 +67,8 @@ class Controller(object):
return session.to_dict() return session.to_dict()
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}, '
format(environment_id, session_id))) 'SessionId: {1}>'.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)
@ -84,8 +84,8 @@ class Controller(object):
return None return None
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}, '
format(environment_id, session_id))) 'SessionId: {1}>'.format(environment_id, session_id)))
unit = get_session() unit = get_session()
statuses = unit.query(Status).filter_by(session_id=session_id).all() statuses = unit.query(Status).filter_by(session_id=session_id).all()
@ -96,12 +96,12 @@ class Controller(object):
environment = unit.query(Session).get(session_id).description environment = unit.query(Session).get(session_id).description
services = [] services = []
if 'services' in environment and \ if 'services' in environment and 'activeDirectories' in\
'activeDirectories' in environment['services']: environment['services']:
services += environment['services']['activeDirectories'] services += environment['services']['activeDirectories']
if 'services' in environment and \ if 'services' in environment and 'webServers' in\
'webServers' in environment['services']: environment['services']:
services += environment['services']['webServers'] services += environment['services']['webServers']
service = [service for service in services service = [service for service in services
@ -118,8 +118,8 @@ class Controller(object):
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}, '
format(environment_id, session_id))) 'SessionId: {1}>'.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)