Cleaned code and improved communication with SLA Collector

[unfold.git] / sla / slaclient / service / fed4fire / fed4fireservice.py

diff --git a/sla/slaclient/service/fed4fire/fed4fireservice.py b/sla/slaclient/service/fed4fire/fed4fireservice.py
index f11e8a1..adec86b 100755 (executable)
--- a/sla/slaclient/service/fed4fire/fed4fireservice.py
+++ b/sla/slaclient/service/fed4fire/fed4fireservice.py
@@ -105,16 +105,16 @@ def createagreement(json_data, context):
     # Builds AgreementInput from json\r
     data = jsonparser.agreementinput_from_json(json_data)\r
     # Read template from manager\r
-    slatemplate, request = client_templates.getbyid(data.template_id)\r
+    slatemplate, request = client_templates.getbyid(data.template_id, data.template_id)\r
     # Copy (overriding if necessary) from template to AgreementInput\r
     final_data = data.from_template(slatemplate)\r
     slaagreement = fed4fire.render_slaagreement(final_data)\r
 \r
     client_agreements = context.restfactory.agreements()\r
-    return client_agreements.create(slaagreement)\r
+    return client_agreements.create(slaagreement, data.template_id)\r
 \r
 \r
-def createagreementsimplified(template_id, user, expiration_time):\r
+def createagreementsimplified(template_id, user, expiration_time, resources):\r
     context = ServiceContext(\r
         restclient.Factory(),\r
         TemplateFactory()\r
@@ -122,26 +122,18 @@ def createagreementsimplified(template_id, user, expiration_time):
 \r
     print "Expiration time: ", expiration_time\r
 \r
-    time = dateutil.parser.parse(expiration_time)\r
-    print "ISO FORMAT: ", time.strftime('%Y-%m-%dT%H:%M:%S%Z')\r
+    # time = dateutil.parser.parse(expiration_time)\r
+    # print "ISO FORMAT: ", time.strftime('%Y-%m-%dT%H:%M:%S%Z')\r
+    print "ISO FORMAT: ", expiration_time.strftime('%Y-%m-%dT%H:%M:%S%Z')\r
 \r
     agreement = {\r
         "agreement_id": str(uuid.uuid4()),\r
         "template_id": template_id,\r
-        "expiration_time": time.strftime('%Y-%m-%dT%H:%M:%S%Z'),\r
+        "expiration_time": expiration_time.strftime('%Y-%m-%dT%H:%M:%S%Z'),\r
         "consumer": user,\r
     }\r
 \r
     json_data = json.dumps(agreement)\r
 \r
     return createagreement(json_data, context)\r
-\r
-\r
-def main():\r
-    createagreementsimplified("iMindsServiceWiLab2",\r
-                              "virtualwall",\r
-                              "2014-04-34T23:12:12")\r
-\r
-\r
-if __name__ == "__main__":\r
-    main()\r
+    
\ No newline at end of file