SLA Application:

- Fixed GET violations against sla-collector module

diff --git a/myslice/settings.py b/myslice/settings.py
index 17effac..e72d01b 100644 (file)
--- 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 602c927..879c7a1 100755 (executable)
--- 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 564079b..7386308 100755 (executable)
--- 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 = []