import requests
from requests.auth import HTTPBasicAuth
+from myslice.settings import logger
import xmlconverter
import wsag_model
_VIOLATIONS_PATH = "violations"
_ENFORCEMENTJOBS_PATH = "enforcements"
-rooturl = settings.SLA_MANAGER_URL
+rooturl = settings.SLA_COLLECTOR_URL
class Factory(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
}
)
"""
- 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 "<null>"
- print "POST {} {} Location: {}".format(
+ print "POST {} {} - Location: {}".format(
result.url, result.status_code, location)
return result
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
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):
"""
"""
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):
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
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)
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)
"""
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:
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):
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)
"""
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)
git://git.onelab.eu / myslice.git / blobdiff