git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changing iotlabapi to iotlabshell - propagating the changes
[sfa.git]
/
sfa
/
cortexlab
/
cortexlabshell.py
diff --git
a/sfa/cortexlab/cortexlabapi.py
b/sfa/cortexlab/cortexlabshell.py
similarity index 99%
rename from
sfa/cortexlab/cortexlabapi.py
rename to
sfa/cortexlab/cortexlabshell.py
index
8b976ed
..
94cb7d9
100644
(file)
--- a/
sfa/cortexlab/cortexlabapi.py
+++ b/
sfa/cortexlab/cortexlabshell.py
@@
-23,7
+23,7
@@
from sfa.trust.hierarchy import Hierarchy
from sfa.cortexlab.iotlabaggregate import iotlab_xrn_object
from sfa.cortexlab.iotlabaggregate import iotlab_xrn_object
-class Cortexlab
TestbedAPI
():
+class Cortexlab
Shell
():
""" Class enabled to use LDAP and OAR api calls. """
_MINIMUM_DURATION = 10 # 10 units of granularity 60 s, 10 mins
""" 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 CortexlabTestbedAPI():
testbed. In seconds.
"""
testbed. In seconds.
"""
- return Cortexlab
TestbedAPI
._MINIMUM_DURATION
+ return Cortexlab
Shell
._MINIMUM_DURATION
@staticmethod
def GetPeers(peer_filter=None ):
@staticmethod
def GetPeers(peer_filter=None ):
@@
-923,8
+923,8
@@
class CortexlabTestbedAPI():
\r\n leasefilter %s" % ( lease_filter_dict))
filter_dict_functions = {
\r\n leasefilter %s" % ( lease_filter_dict))
filter_dict_functions = {
- 'slice_hrn' : Cortexlab
TestbedAPI
.filter_lease_name,
- 't_from' : Cortexlab
TestbedAPI
.filter_lease_start_time
+ 'slice_hrn' : Cortexlab
Shell
.filter_lease_name,
+ 't_from' : Cortexlab
Shell
.filter_lease_start_time
}
reservation_list = list(unfiltered_reservation_list)
}
reservation_list = list(unfiltered_reservation_list)