Make unirom the return of get_leases in Nitos rspecs

[sfa.git] / sfa / rspecs / elements / versions / nitosv1Lease.py

diff --git a/sfa/rspecs/elements/versions/nitosv1Lease.py b/sfa/rspecs/elements/versions/nitosv1Lease.py
index 5d175e6..adfefe3 100644 (file)
--- a/sfa/rspecs/elements/versions/nitosv1Lease.py
+++ b/sfa/rspecs/elements/versions/nitosv1Lease.py
@@ -18,7 +18,6 @@ from sfa.rspecs.elements.lease import Lease
 from sfa.rspecs.elements.channel import Channel
 
 
-from sfa.nitos.nitosxrn import xrn_to_hostname
 
 class NITOSv1Lease:
 
@@ -54,7 +53,7 @@ class NITOSv1Lease:
          
         lease_elems = []       
         for lease in grouped_leases:
-            #lease_fields = ['lease_id', 'component_id', 'slice_id', 'start_time', 'duration']
+
             lease_fields = ['slice_id', 'start_time', 'duration']
             lease_elem = network_elem.add_instance('lease', lease[0], lease_fields)
             lease_elems.append(lease_elem)
@@ -67,7 +66,7 @@ class NITOSv1Lease:
             #channels = [{'channel_id': 1}, {'channel_id': 2}]
             for channel in channels:
                  if channel['slice_id'] == lease[0]['slice_id'] and channel['start_time'] == lease[0]['start_time'] and channel['duration'] == lease[0]['duration']:
-                     lease_elem.add_instance('channel', channel, ['channel_num'])
+                     lease_elem.add_instance('channel', channel, ['component_id'])
             
 
     @staticmethod
@@ -89,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['type'] = 'node'
                  leases.append(lease)
             #get channels
             channel_elems = lease_elem.xpath('./default:channel | ./channel')
@@ -97,8 +97,9 @@ class NITOSv1Lease:
                  channel['slice_id'] = lease_elem.attrib['slice_id']
                  channel['start_time'] = lease_elem.attrib['start_time']
                  channel['duration'] = lease_elem.attrib['duration']
-                 channel['channel_num'] = channel_elem.attrib['channel_num']
+                 channel['component_id'] = channel_elem.attrib['component_id']
+                 channel['type'] = 'channel'
                  channels.append(channel)
 
-        return (leases, channels)            
+        return leases + channels