From 4596ae9aac81ecec2c1de95950da431e7490b95d Mon Sep 17 00:00:00 2001 From: sanjeev Date: Thu, 17 Jul 2014 17:19:04 +0530 Subject: [PATCH] Changed delete method signature inside VirtualMachine class. From 4.3 onwards vm destroy has expunge parameter to expunge the vm immediately. Signed-off-by: sanjeev Signed-off-by: Santhosh Edukulla --- tools/marvin/marvin/lib/base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py index e9d5bb4b5b2..8d405918cf9 100755 --- a/tools/marvin/marvin/lib/base.py +++ b/tools/marvin/marvin/lib/base.py @@ -612,10 +612,11 @@ class VirtualMachine: [setattr(cmd, k, v) for k, v in kwargs.items()] return(apiclient.updateVirtualMachine(cmd)) - def delete(self, apiclient): + def delete(self, apiclient, **kwargs): """Destroy an Instance""" cmd = destroyVirtualMachine.destroyVirtualMachineCmd() cmd.id = self.id + [setattr(cmd, k, v) for k, v in kwargs.items()] apiclient.destroyVirtualMachine(cmd) def expunge(self, apiclient):