Bugfix, wrong node attribute were used to create sliver info in get_nodes_and_links. NT

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

diff --git a/sfa/senslab/slabaggregate.py b/sfa/senslab/slabaggregate.py
index fb4e746..7063f66 100644 (file)
--- a/sfa/senslab/slabaggregate.py
+++ b/sfa/senslab/slabaggregate.py
@@ -66,11 +66,14 @@ class SlabAggregate:
         slice_hrn, _ = urn_to_hrn(slice_xrn)
         slice_name = slice_hrn
         print >>sys.stderr,"\r\n \r\n \t\t_____________ Slabaggregate api get_slice_and_slivers "
-        slices = self.driver.GetSlices({'slice_hrn':str(slice_name)})
+        slices = self.driver.GetSlices(slice_filter= str(slice_name), filter_type = 'slice_hrn')
         print >>sys.stderr,"\r\n \r\n \t\t_____________ Slabaggregate api get_slice_and_slivers  slices %s " %(slices)
         if not slices:
             return (slice, slivers)
-        slice = slices[0]
+        if isinstance(slice, list):
+            slice = slices[0]
+        else:
+           slice =slices
 
         # sort slivers by node id , if there is a job
         #and therfore, node allocated to this slice
@@ -140,19 +143,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()
         
+        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)
+        #nodes = self.driver.GetNodes(filter['hostname'])
+        #print>>sys.stderr, "\r\n \r\n \t get_nodes_and_links nodes %s" %(nodes)
         
         #site_ids = []
         #interface_ids = []
@@ -183,11 +201,11 @@ class SlabAggregate:
             # xxx how to retrieve site['login_base']
             #site_id=node['site_id']
             #site=sites_dict[site_id]
-            rspec_node['component_id'] = hostname_to_urn(self.driver.root_auth, node['site_login_base'], node['hostname'])
+            rspec_node['component_id'] = hostname_to_urn(self.driver.root_auth, node['site'], node['hostname'])
             rspec_node['component_name'] = node['hostname']  
             rspec_node['component_manager_id'] = hrn_to_urn(self.driver.root_auth, 'authority+sa')
             #rspec_node['component_manager_id'] = Xrn(self.driver.root_auth, 'authority+sa').get_urn()
-            rspec_node['authority_id'] = hrn_to_urn(PlXrn.site_hrn(self.driver.root_auth, node['site_login_base']), 'authority+sa')
+            rspec_node['authority_id'] = hrn_to_urn(PlXrn.site_hrn(self.driver.root_auth, node['site']), 'authority+sa')
             # do not include boot state (<available> element) in the manifest rspec
             if not slice:     
                 rspec_node['boot_state'] = node['boot_state']
@@ -220,9 +238,9 @@ class SlabAggregate:
         
             #tags = [PLTag(node_tags[tag_id]) for tag_id in node['node_tag_ids']]
             rspec_node['tags'] = []
-            if node['hrn'] in slivers:
+            if node['hostname'] in slivers:
                 # add sliver info
-                sliver = slivers[node['node_id']]
+                sliver = slivers[node['hostname']]
                 rspec_node['sliver_id'] = sliver['sliver_id']
                 rspec_node['client_id'] = node['hostname']
                 rspec_node['slivers'] = [sliver]
@@ -240,13 +258,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']))