Make unirom the return of get_leases in Nitos rspecs

diff --git a/sfa/nitos/nitosdriver.py b/sfa/nitos/nitosdriver.py
index aa87bcc..c936466 100644 (file)
--- a/sfa/nitos/nitosdriver.py
+++ b/sfa/nitos/nitosdriver.py
@@ -612,8 +612,17 @@ class NitosDriver (Driver):
         
         # add/remove leases (nodes and channels)
         # a lease in Nitos RSpec case is a reservation of nodes and channels grouped by (slice,timeslot)
         
         # add/remove leases (nodes and channels)
         # a lease in Nitos RSpec case is a reservation of nodes and channels grouped by (slice,timeslot)

-        rspec_requested_nodes, rspec_requested_channels = rspec.version.get_leases()
-  
+        rspec_requested_leases = rspec.version.get_leases()
+        rspec_requested_nodes = []
+        rspec_requested_channels = []
+        for lease in rspec_requested_leases:
+             if lease['type'] == 'node':
+                 lease.pop('type', None)
+                 rspec_requested_nodes = lease
+             else:
+                 lease.pop('type', None)
+                 rspec_requested_channels = lease                 
+        

         nodes = slices.verify_slice_leases_nodes(slice, rspec_requested_nodes)
         channels = slices.verify_slice_leases_channels(slice, rspec_requested_channels)
 
         nodes = slices.verify_slice_leases_nodes(slice, rspec_requested_nodes)
         channels = slices.verify_slice_leases_channels(slice, rspec_requested_channels)
 

diff --git a/sfa/rspecs/elements/versions/nitosv1Lease.py b/sfa/rspecs/elements/versions/nitosv1Lease.py
index 874b98c..adfefe3 100644 (file)
--- a/sfa/rspecs/elements/versions/nitosv1Lease.py
+++ b/sfa/rspecs/elements/versions/nitosv1Lease.py
@@ -88,6 +88,7 @@ class NITOSv1Lease:
                  lease['start_time'] = lease_elem.attrib['start_time']
                  lease['duration'] = lease_elem.attrib['duration']
                  lease['component_id'] = node_elem.attrib['component_id']
                  lease['start_time'] = lease_elem.attrib['start_time']
                  lease['duration'] = lease_elem.attrib['duration']
                  lease['component_id'] = node_elem.attrib['component_id']

+                 lease['type'] = 'node'

                  leases.append(lease)
             #get channels
             channel_elems = lease_elem.xpath('./default:channel | ./channel')
                  leases.append(lease)
             #get channels
             channel_elems = lease_elem.xpath('./default:channel | ./channel')


@@ -97,8 +98,8 @@ class NITOSv1Lease:
                  channel['start_time'] = lease_elem.attrib['start_time']
                  channel['duration'] = lease_elem.attrib['duration']
                  channel['component_id'] = channel_elem.attrib['component_id']
                  channel['start_time'] = lease_elem.attrib['start_time']
                  channel['duration'] = lease_elem.attrib['duration']
                  channel['component_id'] = channel_elem.attrib['component_id']

-                 
+                 channel['type'] = 'channel'

                  channels.append(channel)
 
                  channels.append(channel)
 

-        return (leases, channels)            
+        return leases + channels