Changing iotlabapi to iotlabshell - propagating the changes

[sfa.git] / sfa / iotlab / iotlabshell.py

diff --git a/sfa/iotlab/iotlabapi.py b/sfa/iotlab/iotlabshell.py
similarity index 99%
rename from sfa/iotlab/iotlabapi.py
rename to sfa/iotlab/iotlabshell.py
index f50441d..8dd4d65 100644 (file)
--- a/sfa/iotlab/iotlabapi.py
+++ b/sfa/iotlab/iotlabshell.py
@@ -1,5 +1,5 @@
 """
-File containing the IotlabTestbedAPI, used to interact with nodes, users,
+File containing the IotlabShell, used to interact with nodes, users,
 slices, leases and keys,  as well as the dedicated iotlab database and table,
 holding information about which slice is running which job.
 
@@ -23,7 +23,7 @@ from sfa.trust.hierarchy import Hierarchy
 
 from sfa.iotlab.iotlabaggregate import iotlab_xrn_object
 
-class IotlabTestbedAPI():
+class IotlabShell():
     """ Class enabled to use LDAP and OAR api calls. """
 
     _MINIMUM_DURATION = 10  # 10 units of granularity 60 s, 10 mins
@@ -55,7 +55,7 @@ class IotlabTestbedAPI():
         testbed. In seconds.
 
         """
-        return IotlabTestbedAPI._MINIMUM_DURATION
+        return IotlabShell._MINIMUM_DURATION
 
     @staticmethod
     def GetPeers(peer_filter=None ):
@@ -719,7 +719,7 @@ class IotlabTestbedAPI():
 
 
         walltime, sleep_walltime = \
-                    IotlabTestbedAPI._process_walltime(\
+                    IotlabShell._process_walltime(\
                                      int(lease_dict['lease_duration']))
 
 
@@ -1018,8 +1018,8 @@ class IotlabTestbedAPI():
                     \r\n leasefilter %s" % ( lease_filter_dict))
 
             filter_dict_functions = {
-            'slice_hrn' : IotlabTestbedAPI.filter_lease_name,
-            't_from' : IotlabTestbedAPI.filter_lease_start_time
+            'slice_hrn' : IotlabShell.filter_lease_name,
+            't_from' : IotlabShell.filter_lease_start_time
             }
             reservation_list = list(unfiltered_reservation_list)
             for filter_type in lease_filter_dict: