X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sla%2Fslaclient%2Fservice%2Ffed4fire%2Fjsonparser.py;h=d4a230085f27e925543f341ffccd52c1f52c57cc;hb=ca92509528a7ba32b74f9835896182fd7a8b22b2;hp=3dc8fca37d932f36906232537fc0d7c40876956b;hpb=c99f1bd98ff355bd3f63b4929739ea5bd92cd6a3;p=unfold.git

diff --git a/sla/slaclient/service/fed4fire/jsonparser.py b/sla/slaclient/service/fed4fire/jsonparser.py
index 3dc8fca3..d4a23008 100755
--- a/sla/slaclient/service/fed4fire/jsonparser.py
+++ b/sla/slaclient/service/fed4fire/jsonparser.py
@@ -69,8 +69,6 @@ def agreementinput_from_json(json_data):
     }
     """
     d = json.loads(json_data)
-    if "expiration_time" in d:
-        d["expiration_time"] = dateutil.parser.parse(d["expiration_time"])
 
     t = AgreementInput(
         agreement_id=d.get("agreement_id", None),
@@ -111,10 +109,18 @@ def _json_parse_guarantee_terms(d):
     """
     result = []
     for term in d.get("guarantees", None) or ():
+        gs = AgreementInput.GuaranteeTerm.GuaranteeScope(
+            term["scope"].get("service_name", ""),
+            term["scope"].get("scope", "")
+            )
+        print "*******GS****"
+        print gs
         result.append(
             AgreementInput.GuaranteeTerm(
                 metric_name=term["name"],
-                bounds=tuple(term["bounds"])
+                bounds=tuple(term["bounds"]),
+                guarantee_scopes=gs
             )
         )
-    return result
\ No newline at end of file
+
+    return result