stackforge-attic/murano-conductor
Code Issues Proposed changes

Another Issue with sessions

Browse Source
This commit is contained in:
Serg Melikyan 2013-03-12 20:27:11 +04:00
parent 4143081a89
commit 56633295b6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ from portas.db.models import Session, Environment
from portas.db.session import get_session
def get_draft(environment_id, session_id):
def get_draft(environment_id=None, session_id=None):
unit = get_session()
#TODO: When session is deployed should be returned env.description
if session_id:

2
portas/portas/api/v1/active_directories.py
View File

@ -19,7 +19,7 @@ class Controller(object):
def create(self, request, environment_id, body):
log.debug(_('ActiveDirectory:Create <EnvId: {0}, Body: {1}>'.format(environment_id, body)))
draft = get_draft(request.context.session)
draft = get_draft(session_id=request.context.session)
active_directory = body.copy()
active_directory['id'] = uuidutils.generate_uuid()

4
portas/portas/api/v1/webservers.py
View File

@ -19,7 +19,7 @@ class Controller(object):
def create(self, request, environment_id, body):
log.debug(_('WebServer:Create <EnvId: {0}, Body: {1}>'.format(environment_id, body)))
draft = get_draft(request.context.session)
draft = get_draft(session_id=request.context.session)
webServer = body.copy()
webServer['id'] = uuidutils.generate_uuid()
@ -42,7 +42,7 @@ class Controller(object):
def delete(self, request, environment_id, web_server_id):
log.debug(_('WebServer:Delete <EnvId: {0}, Id: {1}>'.format(environment_id, web_server_id)))
draft = get_draft(request.context.session)
draft = get_draft(session_id=request.context.session)
draft['services']['webServers'] = [service for service in draft['services']['webServers'] if
service['id'] != web_server_id]
save_draft(request.context.session, draft)