git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added description of resources on each SLA agreement when they are created
[myslice.git]
/
sla
/
slaclient
/
service
/
fed4fire
/
fed4fireservice.py
diff --git
a/sla/slaclient/service/fed4fire/fed4fireservice.py
b/sla/slaclient/service/fed4fire/fed4fireservice.py
index
adec86b
..
9883098
100755
(executable)
--- a/
sla/slaclient/service/fed4fire/fed4fireservice.py
+++ b/
sla/slaclient/service/fed4fire/fed4fireservice.py
@@
-104,10
+104,13
@@
def createagreement(json_data, context):
\r
# Builds AgreementInput from json
\r
data = jsonparser.agreementinput_from_json(json_data)
\r
\r
# Builds AgreementInput from json
\r
data = jsonparser.agreementinput_from_json(json_data)
\r
+
\r
# Read template from manager
\r
# Read template from manager
\r
- slatemplate, request = client_templates.getbyid(data.template_id, data.template_id)
\r
+ # client_templates.getbyid(provider_id, testbed)
\r
+ slatemplate, request = client_templates.getbyid(data.template_id)
\r
# Copy (overriding if necessary) from template to AgreementInput
\r
final_data = data.from_template(slatemplate)
\r
# Copy (overriding if necessary) from template to AgreementInput
\r
final_data = data.from_template(slatemplate)
\r
+
\r
slaagreement = fed4fire.render_slaagreement(final_data)
\r
\r
client_agreements = context.restfactory.agreements()
\r
slaagreement = fed4fire.render_slaagreement(final_data)
\r
\r
client_agreements = context.restfactory.agreements()
\r
@@
-120,20
+123,23
@@
def createagreementsimplified(template_id, user, expiration_time, resources):
TemplateFactory()
\r
)
\r
\r
TemplateFactory()
\r
)
\r
\r
- print "Expiration time: ", expiration_time
\r
-
\r
- # time = dateutil.parser.parse(expiration_time)
\r
- # print "ISO FORMAT: ", time.strftime('%Y-%m-%dT%H:%M:%S%Z')
\r
- print "ISO FORMAT: ", expiration_time.strftime('%Y-%m-%dT%H:%M:%S%Z')
\r
-
\r
agreement = {
\r
"agreement_id": str(uuid.uuid4()),
\r
"template_id": template_id,
\r
"expiration_time": expiration_time.strftime('%Y-%m-%dT%H:%M:%S%Z'),
\r
"consumer": user,
\r
agreement = {
\r
"agreement_id": str(uuid.uuid4()),
\r
"template_id": template_id,
\r
"expiration_time": expiration_time.strftime('%Y-%m-%dT%H:%M:%S%Z'),
\r
"consumer": user,
\r
+ "guarantees": [
\r
+ {
\r
+ "name": "uptime",
\r
+ "bounds": ["0", "1"],
\r
+ "scope": {
\r
+ "service_name": "",
\r
+ "scope": resources[template_id]
\r
+ }
\r
+ }
\r
+ ]
\r
}
\r
\r
json_data = json.dumps(agreement)
\r
\r
return createagreement(json_data, context)
\r
}
\r
\r
json_data = json.dumps(agreement)
\r
\r
return createagreement(json_data, context)
\r
-
\ No newline at end of file