X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sla%2Fslaclient%2Frestclient.py;h=4b8614bed88730e66f8ea92754ebbbc95c91bd2e;hb=26b2d32f6132a3e619f47411adeccfa693b71162;hp=e6c516d2becdbd76c372749162b042a0c0e7c17f;hpb=d4c7a1675af736fb03828d8a09a2a68a871954e0;p=myslice.git diff --git a/sla/slaclient/restclient.py b/sla/slaclient/restclient.py index e6c516d2..4b8614be 100755 --- a/sla/slaclient/restclient.py +++ b/sla/slaclient/restclient.py @@ -126,8 +126,7 @@ class Client(object): # for key, values in kwargs.iteritems(): # print key, values - logger.debug('SLA GET {}'.format(url)) - 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]) @@ -170,7 +169,7 @@ class Client(object): result = requests.post(url, data, **kwargs) location = result.headers["location"] \ if "location" in result.headers else "" - print "POST {} {} Location: {}".format( + print "POST {} {} - Location: {}".format( result.url, result.status_code, location) return result @@ -344,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