Updated Service Directory url and cleaned some comments

diff --git a/portal/servicedirectory.py b/portal/servicedirectory.py
index c645538..ad4967d 100644 (file)
--- a/portal/servicedirectory.py
+++ b/portal/servicedirectory.py
@@ -18,7 +18,7 @@ import json
 
 class ServiceDirectoryView (LoginRequiredAutoLogoutView, ThemeView):
     template_name = 'servicedirectory.html'
 
 class ServiceDirectoryView (LoginRequiredAutoLogoutView, ThemeView):
     template_name = 'servicedirectory.html'

-    server_url = "http://157.193.215.125:4001/"
+    server_url = "http://157.193.215.125:4001/service-directory/"

         
     # expose this so we can mention the backend URL on the welcome page
     def default_env (self):
         
     # expose this so we can mention the backend URL on the welcome page
     def default_env (self):

diff --git a/sla/slaclient/templates/fed4fire/fed4fire.py b/sla/slaclient/templates/fed4fire/fed4fire.py
index 572d9b4..2de5201 100755 (executable)
--- a/sla/slaclient/templates/fed4fire/fed4fire.py
+++ b/sla/slaclient/templates/fed4fire/fed4fire.py
@@ -325,11 +325,4 @@ class AgreementInput(object):
             guarantee_terms=slatemplate.guaranteeterms.values()\r
         )\r
 \r
             guarantee_terms=slatemplate.guaranteeterms.values()\r
         )\r
 \r

-        #print self.guarantee_terms[0], "\nVVVVVVVVVVVVVVVVV"\r
-        #print slatemplate.guaranteeterms['GT_CPULoad'], "\nVVVVVVVVVVVVVVVVV"\r
-        #print self.guarantee_terms[0].guarantee_scopes.scope, "\nVVVVVVVVVVVVVVVVV"\r
-        #print "TIPO: ", type(self.guarantee_terms[0])\r
-        #print "TIPO 2", type(slatemplate.guaranteeterms['GT_CPULoad']), "\nVVVVVVVVVVVVVVVVV"\r
-        #print slatemplate.guaranteeterms['GT_CPULoad'].scopes, "\nVVVVVVVVVVVVVVVVV"\r
-        #print result.guarantee_terms[0], "\nVVVVVVVVVVVVVVVVV"\r

         return result\r
         return result\r