openstack
/
murano
Code Issues Proposed changes

Resolved issues with Environment::Get 

Change-Id: I1b0ecc93fbda1282190df56710156442d9e2e21e
This commit is contained in:
Serg Melikyan 2013-05-27 15:31:21 +04:00
parent a1dc81294a
commit 5de62b6033
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
muranoapi/api/v1/environments.py
View File

@ -65,7 +65,7 @@ class Controller(object):
session_id = request.context.session
#add services to env
get = SystemServices.get_service
get = SystemServices.get_services
ad = get(environment_id, 'activeDirectories', session_id)
webServers = get(environment_id, 'webServers', session_id)

3
muranoapi/db/services/systemservices.py
View File

@ -98,6 +98,9 @@ class SystemServices(object):
if 'webServers' in env_description['services']:
services += env_description['services']['webServers']
if 'aspNetApps' in env_description['services']:
services += env_description['services']['aspNetApps']
services = filter(lambda s: s.id == service_id, services)
if len(services) > 0: