From: Javier GarcĂ­a Date: Thu, 31 Jul 2014 09:51:16 +0000 (+0200) Subject: SLA Application: X-Git-Tag: myslice-1.1~27^2~7 X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=5ffff912caffe3c68f1cb76031e21a524c3f51e5 SLA Application: - Fixed GET violations against sla-collector module --- diff --git a/myslice/settings.py b/myslice/settings.py index 17effaca..e72d01b0 100644 --- a/myslice/settings.py +++ b/myslice/settings.py @@ -296,6 +296,6 @@ CSRF_FAILURE_VIEW = 'manifoldapi.manifoldproxy.csrf_failure' #SLA_MANAGER_URL = "http://157.193.215.125:4000/sla-service" # SLA_MANAGER_USER = "normal_user" # SLA_MANAGER_PASSWORD = "password" -SLA_MANAGER_URL = "http://172.24.76.38:8000/sla" +SLA_MANAGER_URL = "http://172.24.76.49:8000/sla" SLA_MANAGER_USER = "" SLA_MANAGER_PASSWORD = "" diff --git a/sla/slaclient/restclient.py b/sla/slaclient/restclient.py index 602c9272..879c7a1b 100755 --- a/sla/slaclient/restclient.py +++ b/sla/slaclient/restclient.py @@ -346,7 +346,7 @@ class Templates(object): :rtype: wsag_model.Template """ - return self.res.getbyid(provider_id) + return self.res.getbyid(provider_id, None) def create(self, template): """Create a new template @@ -426,8 +426,9 @@ class Violations(object): violations from all terms will be returned :rtype: list[wsag_model.Violation] """ - path = _buildpath_(agreement_id, term) - return self.res.get(path, params={"testbed": testbed}) + return self.res.get("", params={"agreementId": agreement_id, + "guaranteeTerm": term, + "testbed": testbed}) class Enforcements(object): diff --git a/sla/slicetabsla.py b/sla/slicetabsla.py index 564079be..73863083 100755 --- a/sla/slicetabsla.py +++ b/sla/slicetabsla.py @@ -106,8 +106,6 @@ class SLAView (FreeAccessView, ThemeView): #agreements = _get_agreements(agreement_id, consumer_id=consumer_id, filter_=filter_) agreements = _get_agreements(agreement_id, slice=slicename) - print "--- AGREEMENTS ---" - print agreements for agreement in agreements: row = []