openstack/deb-murano
Code Issues Proposed changes

Fixed a bug with error and warning state count

Browse Source 
Change-Id: I79495ecee3816737e9c31768af6c210906e136eb
This commit is contained in:
Alexander Tivelkov
2013-07-31 20:00:27 +04:00
parent 17853238a3
commit 0b0b09cf4e
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
muranoapi/api/v1/deployments.py
View File

@@ -90,8 +90,12 @@ def create_resource():
def set_dep_state(deployment, unit): def set_dep_state(deployment, unit):
num_errors = unit.query(Status).filter_by(level='error').count() num_errors = unit.query(Status).filter_by(level='error',
num_warnings = unit.query(Status).filter_by(level='warning').count() deployment_id=deployment.id). \
count()
num_warnings = unit.query(Status).filter_by(level='warning',
deployment_id=deployment.id). \
count()
if deployment.finished: if deployment.finished:
if num_errors: if num_errors:
deployment.state = 'completed_w_errors' deployment.state = 'completed_w_errors'

8
muranoapi/common/service.py
View File

@@ -113,8 +113,12 @@ def handle_result(message):
deployment = get_last_deployment(session, environment.id) deployment = get_last_deployment(session, environment.id)
deployment.finished = timeutils.utcnow() deployment.finished = timeutils.utcnow()
num_errors = session.query(Status).filter_by(level='error').count() num_errors = session.query(Status).filter_by(level='error',
num_warnings = session.query(Status).filter_by(level='warning').count() deployment_id=deployment.
id).count()
num_warnings = session.query(Status).filter_by(level='warning',
deployment_id=
deployment.id).count()
final_status_text = "Deployment finished" final_status_text = "Deployment finished"
if num_errors: if num_errors: