X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sla%2Fslicetabsla.py;h=1dbb428aa45613e3e4c2847a02b3008e0c0d6ba4;hb=2616b13381f2201d67c5c551fce438817502e5b7;hp=1e36fcf1faa689f3b02d8e367bb1cef6b231effd;hpb=2d8a1033acff0a082160d11120bb6e24f54aad0a;p=myslice.git

diff --git a/sla/slicetabsla.py b/sla/slicetabsla.py
index 1e36fcf1..1dbb428a 100755
--- a/sla/slicetabsla.py
+++ b/sla/slicetabsla.py
@@ -242,19 +242,14 @@ class AgreementTemplates(FreeAccessView, ThemeView):
         c = restclient.Templates(SLA_COLLECTOR_URL)
         testbed = kwargs.get('testbed', None)
 
-        #logger.debug("AAAAA testbed: {}".format(testbed))
-
         templates, response = c.getall(testbed)
         service_level_objectives = []
 
-        #logger.debug("BBBBB templates: {}".format(templates))
-
         for template in templates:
-            service_level_objectives.append(template.GuaranteeTerm.ServiceLevelObjective)
-
-        #logger.debug("CCCCC slo: {}".format(service_level_objectives))
+            service_level_objectives.append(
+                [v.servicelevelobjective for v in template.guaranteeterms.values()])
 
-        return HttpResponse(service_level_objectives, content_type="application/xml")
+        return HttpResponse(service_level_objectives, content_type="application/json", status=response.status_code)
 
 class CreateAgreement(LoginRequiredView, ThemeView):
     def post(self, request, *args, **kwargs):
@@ -276,7 +271,7 @@ class CreateAgreement(LoginRequiredView, ThemeView):
         dt = datetime.fromtimestamp(float(tstmp))
         # gmt_2 = pytz.timezone("Etc/GMT-2")
         # dlocal = gmt_2.localize(dt).isoformat()
-        dlocal = dt.isoformat() + "CET" # FIXME: hardcoded for demo purposes
+        dlocal = dt.isoformat() + "CET"
         data["SLIVER_INFO_EXPIRATION"] = dlocal
 
         # logger.debug("SLA Agreement parameters: {}".format(data.dict()))