X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sla%2Fslaclient%2Fservice%2Ffed4fire%2Ffed4fireservice.py;fp=sla%2Fslaclient%2Fservice%2Ffed4fire%2Ffed4fireservice.py;h=adec86bcd630af3fb12cb7102f39cf304bfcc3cf;hb=aed78ef2aa329dbc3d15aa9dca4795e5cc4464ed;hp=f11e8a1c8a9d700b788336bacb78526074b62abd;hpb=f7308899def626ccdb7218a2fc504bf50cd5cafc;p=unfold.git

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