X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fbonfire%2Fbonfire.py;h=cdaf089e409976b34db32f3dd72038998e17c7f7;hb=f8b8f02323bf0c88852dec05f3c2b21ded587335;hp=64fe2e15c77c90f39b1bc85e2909fcdf8c90cd59;hpb=e5a8707bb06af0746a861edd5410701a8911da76;p=sfa.git
diff --git a/sfa/bonfire/bonfire.py b/sfa/bonfire/bonfire.py
index 64fe2e15..cdaf089e 100644
--- a/sfa/bonfire/bonfire.py
+++ b/sfa/bonfire/bonfire.py
@@ -32,12 +32,27 @@ import time
# 7) remove slice or key
# python -c 'import bonfire; print bonfire.remove_slice("topdomain.dummy.alice_slice")'
+# 8) attach slice to a user (did not work)
+# python -c 'import bonfire; print bonfire.create_slice_attach_user("topdomain.dummy.alice")'
+# 9) verify bonfire authentication
+# # python -c 'import bonfire; print bonfire.callcurl("https://api.bonfire-project.eu/")'
+# ########################################################## #
# ########################################################## #
+# pseudo authentication for bonfire
+def bonfire_authenticate():
+ h = {}
+ h["user"] = "nlebreto"
+ h["user_pass"] = "GDRU_23tc$"
+ h["location"] = "https://api.integration.bonfire.grid5000.fr"
+ return h
-# ########################################################## #
+# create a slice and attach a specific user to it
+def create_slice_attach_user(user_slice):
+ call = "sfa.py add -x {0}_slice -t slice -r {0}@dummy.net".format(user_slice)
+ callcreateslice = subprocess.Popen(call, shell=True)
# remove slice or key
def remove_slice(name):
@@ -50,11 +65,11 @@ def show_slice_credential(slice_name):
tree = ET.parse(path)
root = tree.getroot()
hash = {}
-# hash["slice_native"] = ET.tostring(root)
+ hash["slice_native"] = root.findall(".//signatures//{http://www.w3.org/2000/09/xmldsig#}Signature//{http://www.w3.org/2000/09/xmldsig#}KeyInfo//{http://www.w3.org/2000/09/xmldsig#}X509Data//{http://www.w3.org/2000/09/xmldsig#}X509SubjectName")[0].text
for target in root.findall('credential'):
hash["slice_user_urn"] = target.find('owner_urn').text
hash["slice_urn"] = target.find('target_urn').text
- hash["slice_native"] = target.find('serial').text
+ hash["serial"] = target.find('serial').text
return hash
# create a bonfire experiment from a sfa point of view
@@ -101,7 +116,8 @@ def create_fed4fire_exp(name, groups, description, walltime, slice_urn, slice_us
# simple post method for request
def postexp(url, xmldescription):
headers = {'content-type': 'application/vnd.bonfire+xml'}
- r = requests.post(url, data=xmldescription, headers=headers, verify=False, auth=('nlebreto', 'GDRU_23tc$'))
+ h = bonfire_authenticate()
+ r = requests.post(url, data=xmldescription, headers=headers, verify=False, auth=(h["user"], h["user_pass"]))
# stop a virtual machine for bonfire
# changing the state to stopped state
@@ -109,7 +125,8 @@ def stop_vm(testbed, num_compute):
url = "https://api.integration.bonfire.grid5000.fr/" + "locations/" + testbed + "/computes/" + num_compute
xmldescription = 'stopped'
headers = {'content-type': 'application/vnd.bonfire+xml'}
- requests.put(url, data=xmldescription, headers=headers, verify=False, auth=('nlebreto', 'GDRU_23tc$'))
+ h = bonfire_authenticate()
+ r = requests.post(url, data=xmldescription, headers=headers, verify=False, auth=(h["user"], h["user_pass"]))
# provisioning : set a bonfire's experiment to running
# changing the status to running status
@@ -117,7 +134,8 @@ def provisioning(num_experiment):
url = "https://api.integration.bonfire.grid5000.fr/experiments/" + num_experiment
xmldescription = 'running'
headers = {'content-type': 'application/vnd.bonfire+xml'}
- requests.put(url, data=xmldescription, headers=headers, verify=False, auth=('nlebreto', 'GDRU_23tc$'))
+ h = bonfire_authenticate()
+ r = requests.post(url, data=xmldescription, headers=headers, verify=False, auth=(h["user"], h["user_pass"]))
# retrieving the url, the name and the keys for a specific compute
def rsa_user_bonfire(testbed, num_compute):
@@ -136,7 +154,10 @@ def rsa_user_bonfire(testbed, num_compute):
# do a curl request
def callcurl(url):
- r = requests.get(url, verify=False, auth=('nlebreto', 'GDRU_23tc$'))
+ h = bonfire_authenticate()
+ r = requests.get(url, verify=False, auth=(h["user"], h["user_pass"]))
+ if r.status_code == 401:
+ return "error 401, you need to be register to the portal f4f"
if r.status_code == 200:
return r.text