From ab84438f8c5d680748d096c40e240d3e8fd23ab6 Mon Sep 17 00:00:00 2001
From: Fabrizio Vanni <fabrizio.vanni@hpe.com>
Date: Mon, 14 Mar 2016 13:07:33 +0000
Subject: [PATCH] fix session-remove-job

Wrong values in job's json-schema prevented the
api from unlinking a job's document from the session.
This is fixed

Change-Id: I6be73b48f438982b040684e3316ba10dd16f3018
Closes-Bug: #1556933
---
 freezer_api/api/v1/sessions.py          |  6 ++++--
 freezer_api/common/json_schemas.py      | 14 ++++++--------
 freezer_api/tests/unit/test_sessions.py |  6 ++++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/freezer_api/api/v1/sessions.py b/freezer_api/api/v1/sessions.py
index 9fc24454..a422fbf8 100644
--- a/freezer_api/api/v1/sessions.py
+++ b/freezer_api/api/v1/sessions.py
@@ -335,8 +335,10 @@ class SessionsJob(resource.BaseResource):
                                 doc=session_doc)
         job_update_doc = {
             'session_id': '',
-            'session_tag': '',
-            'job_event': 'stop'
+            'session_tag': 0,
+            'job_schedule': {
+                'event': 'stop'
+            }
         }
         self.db.update_job(user_id=user_id,
                            job_id=job_id,
diff --git a/freezer_api/common/json_schemas.py b/freezer_api/common/json_schemas.py
index fe6f3667..9e17929b 100644
--- a/freezer_api/common/json_schemas.py
+++ b/freezer_api/common/json_schemas.py
@@ -193,12 +193,11 @@ job_schema = {
         },
         "session_id": {
             "id": "session_id",
-            "pattern": "^[\w-]+$",
+            "pattern": "^[\w-]*$",
             "type": "string"
         },
         "session_tag": {
             "id": "session_tag",
-            "pattern": "^[\w-]+$",
             "type": "integer"
         },
         "session_name": {
@@ -285,12 +284,11 @@ job_patch_schema = {
         },
         "session_id": {
             "id": "session_id",
-            "pattern": "^[\w-]+$",
+            "pattern": "^[\w-]*$",
             "type": "string"
         },
         "session_tag": {
             "id": "session_tag",
-            "pattern": "^[\w-]+$",
             "type": "integer"
         },
         "session_name": {
@@ -376,11 +374,11 @@ session_schema = {
             "type": "integer"
         },
         "time_started": {
-            "id": "session_tag",
+            "id": "time_started",
             "type": "integer"
         },
         "time_ended": {
-            "id": "session_tag",
+            "id": "time_ended",
             "type": "integer"
         },
     },
@@ -411,11 +409,11 @@ session_patch_schema = {
             "type": "integer"
         },
         "time_started": {
-            "id": "session_tag",
+            "id": "time_started",
             "type": "integer"
         },
         "time_ended": {
-            "id": "session_tag",
+            "id": "time_ended",
             "type": "integer"
         },
     },
diff --git a/freezer_api/tests/unit/test_sessions.py b/freezer_api/tests/unit/test_sessions.py
index b52e3faf..d9645afb 100644
--- a/freezer_api/tests/unit/test_sessions.py
+++ b/freezer_api/tests/unit/test_sessions.py
@@ -422,8 +422,10 @@ class TestSessionsJobs(unittest.TestCase):
 
         job_update_doc = {
             'session_id': '',
-            'session_tag': '',
-            'job_event': 'stop'
+            'session_tag': 0,
+            'job_schedule': {
+                'event': 'stop'
+            }
         }
 
         self.resource.on_delete(self.mock_req, self.mock_req,