Added sliver_status in slabdriver.

[sfa.git] / sfa / senslab / slabaggregate.py

diff --git a/sfa/senslab/slabaggregate.py b/sfa/senslab/slabaggregate.py
index 6889985..959fc41 100644 (file)
--- a/sfa/senslab/slabaggregate.py
+++ b/sfa/senslab/slabaggregate.py
@@ -140,21 +140,34 @@ class SlabAggregate:
         return (rspec_nodes)
         
     def get_nodes_and_links(self, slice=None,slivers=[], options={}):
+        # NT: the semantic of this function is not clear to me :
+        # if slice is not defined, then all the nodes should be returned
+        # if slice is defined, we should return only the nodes that are part of this slice
+        # but what is the role of the slivers parameter ?
+        # So i assume that slice['node_ids'] will be the same as slivers for us
         filter = {}
         tags_filter = {}
-        if slice and 'node_ids' in slice and slice['node_ids']:
-            filter['hostname'] = slice['node_ids']
-            tags_filter=filter.copy()
-            nodes = self.driver.GetNodes(filter['hostname'])
+        
+        if slice :
+            if 'node_ids' in slice and slice['node_ids']:
+                #first case, a non empty slice was provided
+                filter['hostname'] = slice['node_ids']
+                tags_filter=filter.copy()
+                nodes = self.driver.GetNodes(filter['hostname'])
+            else :
+                #second case, a slice was provided, but is empty
+                nodes={}
         else :
+            #third case, no slice was provided
             nodes = self.driver.GetNodes()
+            
         #geni_available = options.get('geni_available')    
         #if geni_available:
             #filter['boot_state'] = 'boot'     
         print>>sys.stderr, "\r\n \r\n \t get_nodes_and_links filter %s \r\n \r\n \t slivers %s" %(filter, slivers)
         #filter.update({'peer_id': None})
         #nodes = self.driver.GetNodes(filter['hostname'])
-        print>>sys.stderr, "\r\n \r\n \t get_nodes_and_links nodes %s" %(nodes)
+        #print>>sys.stderr, "\r\n \r\n \t get_nodes_and_links nodes %s" %(nodes)
         
         #site_ids = []
         #interface_ids = []
@@ -242,13 +255,14 @@ class SlabAggregate:
         rspec = None
        version_manager = VersionManager()
        version = version_manager.get_version(version)
-        print>>sys.stderr, " \r\n SlabAggregate \t\t get_rspec ************** version %s version_manager %s \r\n" %(version,version_manager)
+        print>>sys.stderr, " \r\n SlabAggregate \t\t get_rspec ************** version %s version_manager %s options %s \r\n" %(version,version_manager,options)
        
        if not slice_xrn:
             rspec_version = version_manager._get_version(version.type, version.version, 'ad')
         else:
             rspec_version = version_manager._get_version(version.type, version.version, 'manifest')
         slice, slivers = self.get_slice_and_slivers(slice_xrn)
+        #at this point sliver my be {} if no senslab job is running for this user/slice.
         rspec = RSpec(version=rspec_version, user_options=options)
         #if slice and 'expires' in slice:
            #rspec.xml.set('expires',  datetime_to_epoch(slice['expires']))