From: Javier García Date: Thu, 2 Oct 2014 08:32:56 +0000 (+0200) Subject: Updated Service Directory url and cleaned some comments X-Git-Tag: myslice-1.1~27^2 X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=de6f0bbb7cd3ae3086a6485072803b53f2c4d9f6 Updated Service Directory url and cleaned some comments --- diff --git a/portal/servicedirectory.py b/portal/servicedirectory.py index c6455389..ad4967d7 100644 --- a/portal/servicedirectory.py +++ b/portal/servicedirectory.py @@ -18,7 +18,7 @@ import json 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): diff --git a/sla/slaclient/templates/fed4fire/fed4fire.py b/sla/slaclient/templates/fed4fire/fed4fire.py index 572d9b4e..2de52012 100755 --- 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() ) - #print self.guarantee_terms[0], "\nVVVVVVVVVVVVVVVVV" - #print slatemplate.guaranteeterms['GT_CPULoad'], "\nVVVVVVVVVVVVVVVVV" - #print self.guarantee_terms[0].guarantee_scopes.scope, "\nVVVVVVVVVVVVVVVVV" - #print "TIPO: ", type(self.guarantee_terms[0]) - #print "TIPO 2", type(slatemplate.guaranteeterms['GT_CPULoad']), "\nVVVVVVVVVVVVVVVVV" - #print slatemplate.guaranteeterms['GT_CPULoad'].scopes, "\nVVVVVVVVVVVVVVVVV" - #print result.guarantee_terms[0], "\nVVVVVVVVVVVVVVVVV" return result