From 56633295b6ba7cce49acab67abd0d1a8da6da213 Mon Sep 17 00:00:00 2001 From: Serg Melikyan Date: Tue, 12 Mar 2013 20:27:11 +0400 Subject: [PATCH] Another Issue with sessions --- portas/portas/api/v1/__init__.py | 2 +- portas/portas/api/v1/active_directories.py | 2 +- portas/portas/api/v1/webservers.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/portas/portas/api/v1/__init__.py b/portas/portas/api/v1/__init__.py index f71dd4b..055e449 100644 --- a/portas/portas/api/v1/__init__.py +++ b/portas/portas/api/v1/__init__.py @@ -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: diff --git a/portas/portas/api/v1/active_directories.py b/portas/portas/api/v1/active_directories.py index 2f84cfe..a9dffbf 100644 --- a/portas/portas/api/v1/active_directories.py +++ b/portas/portas/api/v1/active_directories.py @@ -19,7 +19,7 @@ class Controller(object): def create(self, request, environment_id, body): log.debug(_('ActiveDirectory:Create '.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() diff --git a/portas/portas/api/v1/webservers.py b/portas/portas/api/v1/webservers.py index 16ff4c8..3b22c3d 100644 --- a/portas/portas/api/v1/webservers.py +++ b/portas/portas/api/v1/webservers.py @@ -19,7 +19,7 @@ class Controller(object): def create(self, request, environment_id, body): log.debug(_('WebServer:Create '.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 '.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)