From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Thu, 14 Nov 2013 13:35:20 +0000 (+0100)
Subject: Bug fix in test scipt.
X-Git-Tag: geni-v2-broken-and-discontinued~11^2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=31661534f8b5e9a4cfef566a3d75384bba4ba529

Bug fix in test scipt.
---

diff --git a/testbeds/iotlab/tests/driver_tests.py b/testbeds/iotlab/tests/driver_tests.py
index bd5d571e..38232243 100644
--- a/testbeds/iotlab/tests/driver_tests.py
+++ b/testbeds/iotlab/tests/driver_tests.py
@@ -250,8 +250,8 @@ def TestOAR(job_id = None):
 def TestImporter(arg=None):
     iotlabdriver = IotlabDriver(Config())
 
-    nodes_listdict = iotlabdriver.iotlab_api.GetNodes()
-    sites_listdict = iotlabdriver.iotlab_api.GetSites()
+    nodes_listdict = iotlabdriver.testbed_shell.GetNodes()
+    sites_listdict = iotlabdriver.testbed_shell.GetSites()
     nodes_by_id = dict([(node['node_id'], node) for node in nodes_listdict])
 
     # from sfa.importer.iotlabimporter import IotlabImporter
@@ -265,29 +265,29 @@ def TestIotlabDriver(job_id = None):
         job_id = job_id[0]
     iotlabdriver = IotlabDriver(Config())
 
-    #nodes = iotlabdriver.iotlab_api.GetReservedNodes()
+    #nodes = iotlabdriver.testbed_shell.GetReservedNodes()
     #print " \r\n \r\n GetReservedNodes", nodes
 
-    sl = iotlabdriver.iotlab_api.GetSlices(slice_filter='iotlab.avakian_slice', slice_filter_type='slice_hrn')
+    sl = iotlabdriver.testbed_shell.GetSlices(slice_filter='iotlab.avakian_slice', slice_filter_type='slice_hrn')
     print "\r\n \r\nGetSlices", sl[0]
 
-    #sl = iotlabdriver.iotlab_api.GetSlices(slice_filter='20', slice_filter_type='record_id_user')
+    #sl = iotlabdriver.testbed_shell.GetSlices(slice_filter='20', slice_filter_type='record_id_user')
     #print "\r\n \r\nGetSlices", sl
 
-    #sl = iotlabdriver.iotlab_api.GetSlices()
+    #sl = iotlabdriver.testbed_shell.GetSlices()
     #print "\r\n \r\nGetSlices", sl
 
-    persons = iotlabdriver.iotlab_api.GetPersons()
+    persons = iotlabdriver.testbed_shell.GetPersons()
     print "\r\n \r\n  GetPersons", persons
 
-    leases = iotlabdriver.iotlab_api.GetLeases(login='avakian')
+    leases = iotlabdriver.testbed_shell.GetLeases(login='avakian')
     print "\r\n \r\n  GetLeases", leases
 
-    leases = iotlabdriver.iotlab_api.GetLeases(lease_filter_dict={'slice_hrn':'iotlab.avakian_slice'})
+    leases = iotlabdriver.testbed_shell.GetLeases(lease_filter_dict={'slice_hrn':'iotlab.avakian_slice'})
     print "\r\n \r\n  GetLeases", leases
 
 
-    leases = iotlabdriver.iotlab_api.GetLeases(lease_filter_dict={'t_from':1405070000})
+    leases = iotlabdriver.testbed_shell.GetLeases(lease_filter_dict={'t_from':1405070000})
     print "\r\n \r\n  GetLeases", leases
 def  TestSfi(filename = None):
 
diff --git a/testbeds/iotlab/tests/sfi_client_tests.py b/testbeds/iotlab/tests/sfi_client_tests.py
index 634707de..0bff16ce 100755
--- a/testbeds/iotlab/tests/sfi_client_tests.py
+++ b/testbeds/iotlab/tests/sfi_client_tests.py
@@ -116,8 +116,8 @@ print " ================= SFI.PY RESOURCES -R IOTLAB -L ALL ============="
 raw_input("Press Enter to continue...")
 os.system('sfi.py resources -r iotlab -l all')
 
-print " ================= SFI.PY RESOURCES -O  output rspec ==========="
-os.system('sfi.py resources -o /root/tests_rspecs/iotlab_devlille_OUTPUT.rspec')
+# print " ================= SFI.PY RESOURCES -O  output rspec ==========="
+# os.system('sfi.py resources -o /root/tests_rspecs/iotlab_devlille_OUTPUT.rspec')
 
 print " ================= SFI.PY RESOURCES -L LEASES  ============="
 raw_input("Press Enter to continue...")
@@ -129,7 +129,7 @@ raw_input("Press Enter to continue...")
 os.system('sfi.py show iotlab.avakian')
 
 print " =================    SFI.PY SHOW NODE   ============="
-os.system('sfi.py show m3-3.devgrenoble.iot-lab.info')
+os.system('sfi.py show iotlab.m3-3.devgrenoble.iot-lab.info')
 
 print " =================    SFI.PY SLICES       ============="
 raw_input("Press Enter to continue...")