review uses of strftime to use a common central date format sfatime.SFATIME_FORMAT

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

diff --git a/sfa/iotlab/iotlabaggregate.py b/sfa/iotlab/iotlabaggregate.py
index 85f6a75..a08f822 100644 (file)
--- a/sfa/iotlab/iotlabaggregate.py
+++ b/sfa/iotlab/iotlabaggregate.py
@@ -70,10 +70,9 @@ class IotlabAggregate:
         slice_hrn, _ = urn_to_hrn(slice_xrn)
 
         # GetSlices always returns a list, even if there is only one element
-        slices = self.driver.testbed_shell.GetSlices(
-                                                slice_filter=str(slice_hrn),
-                                                slice_filter_type='slice_hrn',
-                                                login=login)
+        slices = self.driver.GetSlices(slice_filter=str(slice_hrn),
+                                        slice_filter_type='slice_hrn',
+                                        login=login)
 
         logger.debug("IotlabAggregate api \tget_slice_and_slivers \
                       slice_hrn %s \r\n slices %s self.driver.hrn %s"
@@ -367,7 +366,8 @@ class IotlabAggregate:
         :param sliver_allocations: dictionary of slivers
         :type sliver_allocations: dict
 
-        :returns: Node dictionary with all necessary data. .
+        :returns: Node dictionary with all necessary data.
+
         .. seealso:: node_to_rspec_node
         """
         rspec_node = self.node_to_rspec_node(sliver)
@@ -425,7 +425,7 @@ class IotlabAggregate:
 
         logger.debug("IOTLABAGGREGATE  get_all_leases ldap_username %s "
                      % (ldap_username))
-        leases = self.driver.testbed_shell.GetLeases(login=ldap_username)
+        leases = self.driver.GetLeases(login=ldap_username)
         grain = self.driver.testbed_shell.GetLeaseGranularity()
 
         rspec_leases = []
@@ -616,10 +616,9 @@ class IotlabAggregate:
         #     filter['slice_id'] = list(slice_ids)
         # # get slices
         if slice_hrn:
-            slices = self.driver.testbed_shell.GetSlices(slice_hrn,
+            slices = self.driver.GetSlices(slice_hrn,
                 slice_filter_type)
-            leases = self.driver.testbed_shell.GetLeases(
-                                                {'slice_hrn':slice_hrn})
+            leases = self.driver.GetLeases({'slice_hrn':slice_hrn})
         logger.debug("IotlabAggregate \t get_slivers \
                        slices %s leases %s\r\n" % (slices, leases ))
         if not slices: