openstack
/
murano
Code Issues Proposed changes

Fix extracting services from deployment.description 

This is the first step on fixing Environment -> Component -> Logs
(which are empty now). The second step is to fix bug #1311534.

Change-Id: I268ff8e383e406ce1d7e76d73931e66550ec1286
Partial-Bug: #1311769
This commit is contained in:
Timur Sufiev 2014-04-23 20:15:18 +04:00
parent 9c7fc4adde
commit 167b48a110
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,11 +54,10 @@ class Controller(object):
service_id_set = set(request.GET.getall('service_id'))
environment = deployment.description
entity_ids = []
if 'services' in environment:
for service in environment['services']:
if service['?']['id'] in service_id_set:
id_map = utils.build_entity_map(service)
entity_ids = entity_ids + id_map.keys()
for service in environment.get('services', []):
if service['?']['id'] in service_id_set:
id_map = utils.build_entity_map(service)
entity_ids = entity_ids + id_map.keys()
if entity_ids:
query = query.filter(models.Status.entity_id.in_(entity_ids))
else:
@ -80,6 +79,11 @@ def verify_and_get_env(db_session, environment_id, request):
return environment
def _patch_description(description):
description['services'] = description.get('applications', [])
del description['applications']
def verify_and_get_deployment(db_session, environment_id, deployment_id):
deployment = db_session.query(models.Deployment).get(deployment_id)
if not deployment:
@ -90,6 +94,8 @@ def verify_and_get_deployment(db_session, environment_id, deployment_id):
' in environment {1}').format(deployment_id,
environment_id))
raise exc.HTTPBadRequest
_patch_description(deployment.description)
return deployment
@ -121,7 +127,5 @@ def set_dep_state(deployment, unit):
else:
deployment.state = 'running'
deployment.description['services'] = deployment.description.get(
'applications', [])
del deployment.description['applications']
_patch_description(deployment.description)
return deployment