From 396bca1bc02520934c2f72c23df9743025ef6f2a Mon Sep 17 00:00:00 2001
From: Lisa Zangrando <lisa.zangrando@pd.infn.it>
Date: Fri, 4 Nov 2016 11:45:46 +0100
Subject: [PATCH] Method deserialize() fixed

- wrong handling of datetime objects

Change-Id: I5889bdb2f8129f6abf6f02c0aa2264c5bc214a98
Sem-Ver: bugfix
---
 synergy_scheduler_manager/common/quota.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/synergy_scheduler_manager/common/quota.py b/synergy_scheduler_manager/common/quota.py
index 38a8431..02cfce1 100644
--- a/synergy_scheduler_manager/common/quota.py
+++ b/synergy_scheduler_manager/common/quota.py
@@ -540,9 +540,17 @@ class SharedQuota(SynergyObject):
 
         cls.resources = entity["resources"]
         cls.enabled = entity["enabled"]
-        cls.lastAllocationTime = datetime.strptime(
-            entity["lastAllocationTime"], "%Y-%m-%dT%H:%M:%S.%f")
-        cls.lastReleaseTime = datetime.strptime(
-            entity["lastReleaseTime"], "%Y-%m-%dT%H:%M:%S.%f")
+
+        if isinstance(entity["lastAllocationTime"], datetime):
+            cls.lastAllocationTime = entity["lastAllocationTime"]
+        else:
+            cls.lastAllocationTime = datetime.strptime(
+                entity["lastAllocationTime"], "%Y-%m-%dT%H:%M:%S.%f")
+
+        if isinstance(entity["lastReleaseTime"], datetime):
+            cls.lastReleaseTime = entity["lastReleaseTime"]
+        else:
+            cls.lastReleaseTime = datetime.strptime(
+                entity["lastReleaseTime"], "%Y-%m-%dT%H:%M:%S.%f")
 
         return quota