git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed GUI
[myslice.git]
/
sla
/
slicetabsla.py
diff --git
a/sla/slicetabsla.py
b/sla/slicetabsla.py
index
1e36fcf
..
1dbb428
100755
(executable)
--- 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)
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 = []
templates, response = c.getall(testbed)
service_level_objectives = []
- #logger.debug("BBBBB templates: {}".format(templates))
-
for template in 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):
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()
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()))
data["SLIVER_INFO_EXPIRATION"] = dlocal
# logger.debug("SLA Agreement parameters: {}".format(data.dict()))