Adding sfi tests in TestSuite.

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

diff --git a/sfa/senslab/slabaggregate.py b/sfa/senslab/slabaggregate.py
index 6ade147..52c76bc 100644 (file)
--- a/sfa/senslab/slabaggregate.py
+++ b/sfa/senslab/slabaggregate.py
@@ -1,10 +1,7 @@
-#import httplib
-#import json
 import time
 
 
-#from sfa.util.config import Config
-from sfa.util.xrn import hrn_to_urn, urn_to_hrn, urn_to_sliver_id
+from sfa.util.xrn import hrn_to_urn, urn_to_hrn
 
 from sfa.rspecs.rspec import RSpec
 from sfa.rspecs.elements.versions.slabv1Node import SlabPosition
@@ -17,7 +14,6 @@ from sfa.rspecs.elements.lease import Lease
 from sfa.rspecs.elements.granularity import Granularity
 from sfa.rspecs.version_manager import VersionManager
 
-#from sfa.util.sfatime import datetime_to_epoch
 
 from sfa.rspecs.elements.versions.slabv1Node import SlabNode
 from sfa.util.sfalogging import logger
@@ -77,15 +73,15 @@ class SlabAggregate:
         #and therfore, node allocated to this slice
         for sfa_slice in slices:
             try:
-                    
-                for node_id in sfa_slice['node_ids']:
+                   
+                for node in sfa_slice['node_ids']:
                     #node_id = self.driver.root_auth + '.' + node_id
-                    sliver = Sliver({'sliver_id': urn_to_sliver_id(slice_urn, \
-                                    sfa_slice['record_id_slice'], node_id),
+                    sliver = Sliver({'sliver_id': Xrn(slice_urn, type='slice', id=node['hostname'], authority=self.driver.hrn).urn, 
                                     'name': sfa_slice['slice_hrn'],
                                     'type': 'slab-node', 
                                     'tags': []})
-                    slivers[node_id] = sliver
+                   
+                    slivers[node['hostname']] = sliver
             except KeyError:
                 logger.log_exc("SLABAGGREGATE \t \
                                         get_slice_and_slivers KeyError ")
@@ -155,9 +151,7 @@ class SlabAggregate:
         #tag_ids = []
         nodes_dict = {}
         for node in nodes:
-            #site_ids.append(node['site_id'])
-            #interface_ids.extend(node['interface_ids'])
-            #tag_ids.extend(node['node_tag_ids'])
+           
             nodes_dict[node['node_id']] = node
         
         # get sites
@@ -173,8 +167,8 @@ class SlabAggregate:
         slice_nodes_list = []
         if slices:
             for one_slice in slices:
-                for node_id in one_slice['node_ids']:
-                    slice_nodes_list.append(node_id)
+                for node in one_slice['node_ids']:
+                    slice_nodes_list.append(node['hostname'])
                    
         reserved_nodes = self.driver.GetNodesCurrentlyInUse()
         logger.debug("SLABAGGREGATE api get_rspec slice_nodes_list  %s "\
@@ -214,7 +208,7 @@ class SlabAggregate:
                 rspec_node['boot_state'] = node['boot_state']
                 if node['hostname'] in reserved_nodes:
                     rspec_node['boot_state'] = "Reserved"
-                rspec_node['exclusive'] = 'True'
+                rspec_node['exclusive'] = 'true'
                 rspec_node['hardware_types'] = [HardwareType({'name': 'slab-node'})]
     
                 # only doing this because protogeni rspec needs
@@ -262,7 +256,7 @@ class SlabAggregate:
         now = int(time.time())
         lease_filter = {'clip': now }
         
-        self.driver.synchronize_oar_and_slice_table()
+        #self.driver.synchronize_oar_and_slice_table()
         #if slice_record:
             #lease_filter.update({'name': slice_record['name']})
         return_fields = ['lease_id', 'hostname', 'site_id', \
@@ -349,6 +343,8 @@ class SlabAggregate:
         if lease_option in ['all', 'resources']:
         #if not options.get('list_leases') or options.get('list_leases') and options['list_leases'] != 'leases':
             nodes = self.get_nodes(slices, slivers) 
+            logger.debug("SlabAggregate \tget_rspec **** \
+                        nodes %s \r\n" %(nodes))
             #In case creating a job,  slice_xrn is not set to None
             rspec.version.add_nodes(nodes)
             if slice_xrn :