X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sla%2Fslaclient%2Frestclient.py;h=4b8614bed88730e66f8ea92754ebbbc95c91bd2e;hb=26b2d32f6132a3e619f47411adeccfa693b71162;hp=5d1641f7fcc040dbbee4436507eda86c7c1f5094;hpb=f320a65ac7928a4a1c8315443880dce1d7afc997;p=myslice.git diff --git a/sla/slaclient/restclient.py b/sla/slaclient/restclient.py index 5d1641f7..4b8614be 100755 --- a/sla/slaclient/restclient.py +++ b/sla/slaclient/restclient.py @@ -3,6 +3,7 @@ import requests from requests.auth import HTTPBasicAuth +from myslice.settings import logger import xmlconverter import wsag_model @@ -38,7 +39,7 @@ _TEMPLATES_PATH = "templates" _VIOLATIONS_PATH = "violations" _ENFORCEMENTJOBS_PATH = "enforcements" -rooturl = settings.SLA_MANAGER_URL +rooturl = settings.SLA_COLLECTOR_URL class Factory(object): @@ -111,17 +112,25 @@ class Client(object): c = Client("http://localhost:8080/service") c.get("/resource", headers = { "accept": "application/json" }) """ - url = _buildpath_(self.rooturl, path) - url = url + "?testbed=iminds" # TODO remove hardcoded string - #kwargs['params']['testbed'] = 'iminds' + url = _buildpath(self.rooturl, path) + if "testbed" in kwargs: + url = url + "?testbed=" + kwargs["testbed"] if "headers" not in kwargs: kwargs["headers"] = {"accept": "application/xml"} - # kwargs["auth"] = HTTPBasicAuth(settings.SLA_MANAGER_USER, - # settings.SLA_MANAGER_PASSWORD) - result = requests.get(url, **kwargs) - #print "GET {} {} {}".format( - # result.url, result.status_code, result.text[0:70]) + + + kwargs["auth"] = HTTPBasicAuth(settings.SLA_COLLECTOR_USER, + settings.SLA_COLLECTOR_PASSWORD) + + # for key, values in kwargs.iteritems(): + # print key, values + + 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]) + # print result.encoding return result @@ -144,17 +153,23 @@ class Client(object): } ) """ - url = _buildpath_(self.rooturl, path) - url = url + "?testbed=iminds" # TODO remove hardcoded string - # kwargs["auth"] = HTTPBasicAuth(settings.SLA_MANAGER_USER, - # settings.SLA_MANAGER_PASSWORD) + url = _buildpath(self.rooturl, path) + + if "testbed" in kwargs: + url = url + "?testbed=" + kwargs["testbed"] + del kwargs["testbed"] + if "headers" not in kwargs: - kwargs = {"accept": "application/xml", - "content-type": "application/xml"} + kwargs["headers"] = {"accept": "application/xml", + "content-type": "application/xml"} + + kwargs["auth"] = HTTPBasicAuth(settings.SLA_COLLECTOR_USER, + settings.SLA_COLLECTOR_PASSWORD) + 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 @@ -211,18 +226,19 @@ class _Resource(object): resources = self._processresult(r, self.listconverter) return resources, r - def getbyid(self, id): + def getbyid(self, id, params): """Get resource 'id'""" - r = self.client.get(id) + r = self.client.get(id, params=params) resource = _Resource._processresult(r, self.converter) return resource, r - def get(self, params): + def get(self, path="", params={}): """Generic query over resource: GET /resource?q1=v1&q2=v2... :param dict[str,str] params: values to pass as get parameters """ - r = self.client.get("", params=params) + + r = self.client.get(path, params=params) resources = self._processresult(r, self.listconverter) return resources, r @@ -248,9 +264,9 @@ class Agreements(object): The final url to the resource is root_url + "/" + path """ - resourceurl = _buildpath_(root_url, path) - converter = xmlconverter.AgreementConverter() - self.res = _Resource(resourceurl, converter) + self.resourceurl = _buildpath(root_url, path) + self.converter = xmlconverter.AgreementConverter() + self.res = _Resource(self.resourceurl, self.converter) def getall(self): """ @@ -281,27 +297,37 @@ class Agreements(object): """ return self.res.get(dict(providerId=providerid)) - def getstatus(self, agreementid): + def getstatus(self, agreementid, testbed): """Get guarantee status of an agreement :param str agreementid : :rtype : wsag_model.AgreementStatus """ - path = _buildpath_(agreementid, "guaranteestatus") - r = self.res.client.get(path, headers={'accept': 'application/json'}) + # path = _buildpath(_AGREEMENTS_PATH, agreementid, "guaranteestatus") + path = _buildpath(agreementid, "guaranteestatus") + r = self.res.client.get(path, headers={'accept': 'application/json'}, + params={'testbed': testbed}) json_obj = r.json() - status = wsag_model.AgreementStatus.json_decode(json_obj) return status, r - def create(self, agreement): + def getbyslice(self, slicename): + """Get the agreements corresponding to a slice + + :rtype : list[wsag_model.Agreement] + """ + self.resourceurl = _buildpath(rooturl, 'slice') + self.res = _Resource(self.resourceurl, self.converter) + return self.res.get(slicename) + + def create(self, agreement, testbed): """Create a new agreement :param str agreement: sla template in ws-agreement format. """ - return self.res.create(agreement) + return self.res.create(agreement, params={'testbed': testbed}) class Templates(object): @@ -313,23 +339,23 @@ class Templates(object): The final url to the resource is root_url + "/" + path """ - resourceurl = _buildpath_(root_url, path) + resourceurl = _buildpath(root_url, path) 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 :rtype: wsag_model.Template """ - return self.res.getbyid(provider_id) + return self.res.getbyid(provider_id, {"testbed": provider_id}) def create(self, template): """Create a new template @@ -348,7 +374,7 @@ class Providers(object): The final url to the resource is root_url + "/" + path """ - resourceurl = _buildpath_(root_url, path) + resourceurl = _buildpath(root_url, path) converter = xmlconverter.ProviderConverter() self.res = _Resource(resourceurl, converter) @@ -384,7 +410,7 @@ class Violations(object): The final url to the resource is root_url + "/" + path """ - resourceurl = _buildpath_(root_url, path) + resourceurl = _buildpath(root_url, path) converter = xmlconverter.ViolationConverter() self.res = _Resource(resourceurl, converter) @@ -401,7 +427,7 @@ class Violations(object): """ return self.res.getbyid(violationid) - def getbyagreement(self, agreement_id, term=None): + def getbyagreement(self, agreement_id, testbed, term=None): """Get the violations of an agreement. :param str agreement_id: @@ -409,9 +435,9 @@ class Violations(object): violations from all terms will be returned :rtype: list[wsag_model.Violation] """ - - return self.res.get( - {"agreementId": agreement_id, "guaranteeTerm": term}) + return self.res.get("", params={"agreementId": agreement_id, + "guaranteeTerm": term, + "testbed": testbed}) class Enforcements(object): @@ -423,7 +449,7 @@ class Enforcements(object): The final url to the resource is root_url + "/" + path """ - resourceurl = _buildpath_(root_url, path) + resourceurl = _buildpath(root_url, path) converter = xmlconverter.EnforcementConverter() self.res = _Resource(resourceurl, converter) @@ -433,17 +459,20 @@ class Enforcements(object): """ return self.res.getall() - def getbyagreement(self, agreement_id): + def getbyagreement(self, agreement_id, testbed): """Get the enforcement of an agreement. :param str agreement_id: :rtype: list[wsag_model.Enforcement] """ - return self.res.getbyid(agreement_id) + return self.res.getbyid(agreement_id, params={"testbed": testbed}) + +def _buildpath(*paths): + if "" in paths: + paths = [path for path in paths if path != ""] -def _buildpath_(*paths): return "/".join(paths)