From 0dc2954f71cf09568ddedeb19cd4d5f0c3451ea7 Mon Sep 17 00:00:00 2001 From: Mohamed Larabi Date: Wed, 26 Sep 2012 17:57:10 +0200 Subject: [PATCH] Nitos: Enforce slice check within get_leases_and_channels --- sfa/nitos/nitosaggregate.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sfa/nitos/nitosaggregate.py b/sfa/nitos/nitosaggregate.py index e37624fe..b626e7c7 100644 --- a/sfa/nitos/nitosaggregate.py +++ b/sfa/nitos/nitosaggregate.py @@ -127,7 +127,7 @@ class NitosAggregate: rspec_nodes.append(rspec_node) return rspec_nodes - def get_leases_and_channels(self, slice=None, options={}): + def get_leases_and_channels(self, slice=None, slice_xrn=None, options={}): slices = self.driver.shell.getSlices({}, []) nodes = self.driver.shell.getNodes({}, []) @@ -136,6 +136,9 @@ class NitosAggregate: reserved_channels = self.driver.shell.getReservedChannels() grain = self.driver.testbedInfo['grain'] + if slice_xrn and not slice: + return ([], []) + if slice: all_leases = [] all_leases.extend(leases) @@ -263,7 +266,7 @@ class NitosAggregate: rspec.version.add_channels(channels) if not options.get('list_leases') or options.get('list_leases') and options['list_leases'] != 'resources': - leases, channels = self.get_leases_and_channels(slice) + leases, channels = self.get_leases_and_channels(slice, slice_xrn) rspec.version.add_leases(leases, channels) return rspec.toxml() -- 2.47.0