Repository: cloudstack Updated Branches: refs/heads/master 88f35179e -> 4596ae9aa
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 <sanj...@apache.org> Signed-off-by: Santhosh Edukulla <santhosh.eduku...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4596ae9a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4596ae9a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4596ae9a Branch: refs/heads/master Commit: 4596ae9aac81ecec2c1de95950da431e7490b95d Parents: 88f3517 Author: sanjeev <sanj...@apache.org> Authored: Thu Jul 17 17:19:04 2014 +0530 Committer: Santhosh Edukulla <santhosh.eduku...@gmail.com> Committed: Tue Jul 22 11:50:01 2014 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/lib/base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4596ae9a/tools/marvin/marvin/lib/base.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py index e9d5bb4..8d40591 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):
