From 5c045b46a111594764d8273e2fe8ec2ec332d5f2 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Thu, 30 Aug 2012 20:38:05 -0400 Subject: [PATCH] DeleteSliver returns a boolean instead of an int --- sfa/managers/aggregate_manager.py | 2 +- sfa/methods/Delete.py | 4 +--- sfa/openstack/nova_driver.py | 2 +- sfa/planetlab/pldriver.py | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py index 0ffedf2f..af7f18f3 100644 --- a/sfa/managers/aggregate_manager.py +++ b/sfa/managers/aggregate_manager.py @@ -126,7 +126,7 @@ class AggregateManager: def Delete(self, api, xrns, creds, options): call_id = options.get('call_id') if Callids().already_handled(call_id): return True - return self.driver.delete_sliver (xrns, options) + return self.driver.delete(xrns, options) def Renew(self, api, xrns, creds, expiration_time, options): call_id = options.get('call_id') diff --git a/sfa/methods/Delete.py b/sfa/methods/Delete.py index dd6cceb4..5982f713 100644 --- a/sfa/methods/Delete.py +++ b/sfa/methods/Delete.py @@ -30,6 +30,4 @@ class Delete(Method): origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn() self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, xrns, self.name)) - self.api.manager.Delete(self.api, xrns, creds, options) - - return 1 + return self.api.manager.Delete(self.api, xrns, creds, options) diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py index 2fbf6e06..44c4d36c 100644 --- a/sfa/openstack/nova_driver.py +++ b/sfa/openstack/nova_driver.py @@ -368,7 +368,7 @@ class NovaDriver(Driver): project_name = xrn.get_slicename() id = xrn.id aggregate.delete_instance(tenant_name, project_name, id) - return 1 + return True def renew (self, urns, expiration_time, options={}): return True diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py index fe3d0ab8..e8779139 100644 --- a/sfa/planetlab/pldriver.py +++ b/sfa/planetlab/pldriver.py @@ -1,4 +1,3 @@ -import time import datetime # from sfa.util.faults import MissingSfaInfo, UnknownSfaType, \ @@ -735,7 +734,7 @@ class PlDriver (Driver): finally: if peer: self.shell.BindObjectToPeer('slice', slice['slice_id'], peer, slice['peer_slice_id']) - return 1 + return True def renew (self, urns, expiration_time, options={}): # we can only renew slices, not individual slivers. ignore sliver -- 2.47.0