X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fbonfire%2Fbonfire.py;h=cdaf089e409976b34db32f3dd72038998e17c7f7;hb=f8b8f02323bf0c88852dec05f3c2b21ded587335;hp=15fb3d6042d0d67b3f533ede1662a0a5858f9d0a;hpb=e7605f6cb1ebbdb7cd4c6e7495d58d03aeda863b;p=sfa.git

diff --git a/sfa/bonfire/bonfire.py b/sfa/bonfire/bonfire.py
index 15fb3d60..cdaf089e 100644
--- a/sfa/bonfire/bonfire.py
+++ b/sfa/bonfire/bonfire.py
@@ -11,28 +11,74 @@ import time
 # inspired by the following documenation :
 # https://svn.planet-lab.org/wiki/SfaDeveloperDummyTutorial#RunningSFAinDummyflavour
 
-# 1) list all the resources from bonfire's point of view
+# 1) list all the resources  of bonfire from sfa's point of view
 # python -c 'import bonfire; print bonfire.bonsources()'
 
 # 2) retrieve the url, the name and the key that will currently use by sfa for a compute N°3656 located at fr-inria
-# python -c 'import bonfire; print bonfire.rsa_user_bonfire("fr-inria", "3656")
+# python -c 'import bonfire; print bonfire.rsa_user_bonfire("fr-inria", "3656")'
 
 # 3) create a new user and slice for sfa wrap
-# python -c 'import bonfire; print bonfire.new_user_slice()
+# python -c 'import bonfire; print bonfire.new_user_slice()'
 
 # 4) changing the status to running status for the experiment 2911
-# python -c 'import bonfire; print bonfire.provisioning("2911")
+# python -c 'import bonfire; print bonfire.provisioning("2911")'
 
 # 5) stop virtual machine n°3756  at fr-inira testbed
-# python -c 'import bonfire; print bonfire.stop_vm("fr-inria", "3756")
+# python -c 'import bonfire; print bonfire.stop_vm("fr-inria", "3756")'
 
-# 6) create an experiment bonfire with the slice id n°2345423 and the experiment owner : foo+bar.stuff+emulab+professor
-# python -c 'import bonfire; print bonfire.create_fed4fire_exp("nlebreto", "nlebreto", "desc", "300", "2345423", "foo+bar.stuff+emulab+professor")
+# 6) allocation : create an experiment bonfire with slice information
+# python -c 'import bonfire; print bonfire.allocate("nlebreto", "nlebreto", "tdes", "125", "topdomain.dummy.nicolasi", "https://api.integration.bonfire.grid5000.fr/experiments")'
 
+# 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):
+    cmdremove    = "sfaadmin.py reg remove {0}".format(name)
+    removeaction = subprocess.Popen(cmdremove, shell=True)
+
+# show specific credential of a slice    
+def show_slice_credential(slice_name):
+    path = "/root/.sfi/{0}.slice.cred".format(slice_name)
+    tree = ET.parse(path)
+    root = tree.getroot()
+    hash = {}
+    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["serial"] = target.find('serial').text
+    return hash
+
+# create a bonfire experiment from a sfa point of view
+def allocate(user_name, groups, description, walltime, slice_name):
+    hash ={}
+    hash = show_slice_credential(slice_name)
+    create_fed4fire_exp(user_name, groups, description, walltime, hash["slice_urn"], hash["slice_user_urn"], hash["slice_native"])
+    
+
 
 # retrieve the url, the name and the key that will currently use by sfa
 def rsa_user_bonfire(testbed, num_compute):
@@ -62,16 +108,16 @@ def new_user_slice():
     txtslice = "sfaadmin.py reg register -x {0} -t slice -r {1}".format(slice, url)
     createslice = subprocess.Popen(txtslice, shell=True)
 
-# create a experiment bonfire with the slice id and the experiment owner 
-def create_fed4fire_exp(name, groups, description, walltime, slice_id, exp_owner):
-   # fix this to have the exact mapping to retrieve slice 	
-   # xmldescription='<experiment xmlns="http://api.bonfire-project.eu/doc/schemas/occi"><name>' + name +'</name><groups>' + groups + '</groups><description>' + description + '</description><walltime>' + walltime + '</walltime><status>ready</status><fed4fire><slice_id>' + slice_id + '</slice_id><exp_owner>' + exp_owner + '<exp_owner></fed4fire></experiment>'
-    postexp("https://api.integration.bonfire.grid5000.fr/experiments", '<experiment xmlns="http://api.bonfire-project.eu/doc/schemas/occi"><name>testnlebreto</name><groups>nlebreto</groups><description>sdg</description><walltime>3000</walltime><status>ready</status><fed4fire><slice_id>2345423</slice_id><exp_owner>foo+bar.stuff+emulab+professor<exp_owner></fed4fire></experiment>')
+# create a experiment bonfire with the slice urn and the experiment owner 
+def create_fed4fire_exp(name, groups, description, walltime, slice_urn, slice_user_urn, slice_native, url_experiment_bonfire):
+    xmldescription='<experiment xmlns="http://api.bonfire-project.eu/doc/schemas/occi"><name>' + name +'</name><groups>' + groups + '</groups><description>' + description + '</description><walltime>' + walltime + '</walltime><status>ready</status><slice_urn>' + slice_urn + '</slice_urn><slice_usr_urn>' + slice_user_urn + '<slice_usr_urn><slice_native>' + slice_native + '</slice_native></experiment>'
+    postexp(url_experiment_bonfire, xmldescription)
 
 # 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
@@ -79,15 +125,17 @@ def stop_vm(testbed, num_compute):
     url = "https://api.integration.bonfire.grid5000.fr/" + "locations/" + testbed + "/computes/" + num_compute
     xmldescription = '<compute xmlns="http://api.bonfire-project.eu/doc/schemas/occi"><state>stopped</state></compute>'
     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 an experiment to running  
+# provisioning : set a bonfire's experiment to running  
 # changing the status to running status
 def provisioning(num_experiment):
     url = "https://api.integration.bonfire.grid5000.fr/experiments/" + num_experiment
     xmldescription = '<experiment xmlns="http://api.bonfire-project.eu/doc/schemas/occi"><status>running</status></experiment>'
     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):
@@ -106,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