From 03e7c33f7a3d62513a77149429b6cdd5e25cba75 Mon Sep 17 00:00:00 2001 From: Mohamed Larabi Date: Tue, 8 Oct 2013 19:45:48 +0200 Subject: [PATCH] Make unirom the return of get_leases in Nitos rspecs --- sfa/nitos/nitosdriver.py | 13 +++++++++++-- sfa/rspecs/elements/versions/nitosv1Lease.py | 5 +++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/sfa/nitos/nitosdriver.py b/sfa/nitos/nitosdriver.py index aa87bcc7..c936466d 100644 --- 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) - 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) diff --git a/sfa/rspecs/elements/versions/nitosv1Lease.py b/sfa/rspecs/elements/versions/nitosv1Lease.py index 9b2e8032..0e507b17 100644 --- a/sfa/rspecs/elements/versions/nitosv1Lease.py +++ b/sfa/rspecs/elements/versions/nitosv1Lease.py @@ -91,6 +91,7 @@ class NITOSv1Lease: lease['start_time'] = datetime_to_epoch(utcparse(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') @@ -100,8 +101,8 @@ class NITOSv1Lease: channel['start_time'] = datetime_to_epoch(utcparse(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) - return (leases, channels) + return leases + channels -- 2.43.0