X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sla%2Fslaclient%2Frestclient.py;h=0f08a993f4a3ccacd8f0f8487d3a0f9ef6a3d629;hb=ddcdaf8d61df7f4a2a0da11c23190b56ed914464;hp=a3445548aca2b4e27ea27d25c66f8e5cb55ae498;hpb=6eb98c83dccb555e576740d8000d6fad8044763f;p=myslice.git diff --git a/sla/slaclient/restclient.py b/sla/slaclient/restclient.py index a3445548..0f08a993 100755 --- a/sla/slaclient/restclient.py +++ b/sla/slaclient/restclient.py @@ -126,7 +126,7 @@ class Client(object): # for key, values in kwargs.iteritems(): # print key, values - result = requests.get(url, **kwargs) + result = requests.get(url, verify=False, **kwargs) logger.debug('SLA GET {} - result: {}'.format(result.url, result.status_code)) # print "GET {} {} {}".format( # result.url, result.status_code, result.text[0:70]) @@ -166,7 +166,7 @@ class Client(object): kwargs["auth"] = HTTPBasicAuth(settings.SLA_COLLECTOR_USER, settings.SLA_COLLECTOR_PASSWORD) - result = requests.post(url, data, **kwargs) + result = requests.post(url, data, verify=False, **kwargs) location = result.headers["location"] \ if "location" in result.headers else "" print "POST {} {} - Location: {}".format( @@ -343,12 +343,12 @@ class Templates(object): converter = xmlconverter.AgreementConverter() self.res = _Resource(resourceurl, converter) - def getall(self): + def getall(self, provider_id): """ Get all templates :rtype : list[wsag_model.Template] """ - return self.res.getall() + return self.res.get(path="", params={"testbed": provider_id}) def getbyid(self, provider_id): """Get a template