Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3

[sfa.git] / testbeds / iotlab / tests / sfi_client_tests.py

diff --git a/testbeds/iotlab/tests/sfi_client_tests.py b/testbeds/iotlab/tests/sfi_client_tests.py
index 2dc59a6..b1e59ff 100755 (executable)
--- a/testbeds/iotlab/tests/sfi_client_tests.py
+++ b/testbeds/iotlab/tests/sfi_client_tests.py
@@ -63,30 +63,28 @@ rspec_filename_dict = {
                'iotlab_avakian_slice_all.rspec',
 
     ('iotlab_avakian', 'iotlab', 'provision' ):
-        "sfi.py provision iotlab.avakian_slice \
-                            iotlab_avakian_slice_iotlab.rspec",
+        "sfi.py provision iotlab.avakian_slice",
 
     ('iotlab_avakian', 'iotlab2', 'provision'):
-        "sfi.py provision iotlab.avakian_slice \
-                            iotlab_avakian_slice_iotlab2.rspec",
+        "sfi.py provision iotlab.avakian_slice",
 
     ('firexp_user','iotlab', 'provision'):
-        "sfi.py provision firexp.flab.iotlab_slice firexp_iotlab_slice_iotlab.rspec",
+        "sfi.py provision firexp.flab.iotlab_slice",
 
     ('firexp_user', 'all', 'provision'):
-            "sfi.py provision firexp.flab.iotlab_slice firexp_iotlab_slice_all.rspec",
+            "sfi.py provision firexp.flab.iotlab_slice",
 
     ('iotlab_user', 'iotlab', 'provision'):
-        "sfi.py provision iotlab.user_slice iotlab_user_slice_iotlab.rspec",
+        "sfi.py provision iotlab.user_slice",
 
     ('firexp_avakian','iotlab', 'provision'):
-        "sfi.py provision firexp.flab.avakian_slice firexp_avakian_slice_iotlab.rspec",
+        "sfi.py provision firexp.flab.avakian_slice",
 
     ('iotlab_avakian', 'plab', 'provision') :
-            "sfi.py provision iotlab.avakian_slice iotlab_avakian_slice_plab.rspec",
+            "sfi.py provision iotlab.avakian_slice",
 
     ('iotlab_avakian', 'all', 'provision') :
-     "sfi.py provision iotlab.avakian_slice iotlab_avakian_slice_all.rspec",
+     "sfi.py provision iotlab.avakian_slice",
 
     ('iotlab_avakian', 'iotlab', 'describe' ):
         "sfi.py describe iotlab.avakian_slice iotlab_avakian_slice_iotlab.rspec",
@@ -124,7 +122,8 @@ if result != []:
        retval = ldap_server.LdapDelete(dn)
        print "deleting firexp user : ", retval
 
-
+# Change the sfi config file to be able to start the experiment on the federated
+# testbed with another identity and another slice
 print "config sfi"
 with open ("/root/.sfi/sfi_config", "r") as sfi_config:
        sfi_config_txt = [line for line in sfi_config]