class Factory(object):
@staticmethod
- def agreements(path):
+ def agreements(path=_AGREEMENTS_PATH):
"""Returns a REST client for Agreements
:rtype : Agreements
if "headers" not in kwargs:
kwargs["headers"] = {"accept": "application/xml"}
+
kwargs["auth"] = HTTPBasicAuth(settings.SLA_MANAGER_USER,
settings.SLA_MANAGER_PASSWORD)
- for key, values in kwargs.iteritems():
- print key, values
+ # for key, values in kwargs.iteritems():
+ # print key, values
result = requests.get(url, **kwargs)
print "GET {} {} {}".format(
)
"""
url = _buildpath_(self.rooturl, path)
- url = url + "?testbed=iminds" # TODO remove hardcoded string
+
+ if "testbed" in kwargs:
+ url = url + "?testbed=" + kwargs["testbed"]
+
+ if "headers" not in kwargs:
+ kwargs["headers"] = {"accept": "application/xml",
+ "content-type": "application/xml"}
+
kwargs["auth"] = HTTPBasicAuth(settings.SLA_MANAGER_USER,
settings.SLA_MANAGER_PASSWORD)
- if "headers" not in kwargs:
- kwargs = {"accept": "application/xml",
- "content-type": "application/xml"}
+
result = requests.post(url, data, **kwargs)
location = result.headers["location"] \
if "location" in result.headers else "<null>"
"""
return self.res.get(slicename, dict())
- def create(self, agreement):
+ 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):
:rtype: wsag_model.Template
"""
- return self.res.getbyid(provider_id, None)
+ return self.res.getbyid(provider_id, {"testbed": provider_id})
def create(self, template):
"""Create a new template