From 71771c1ba4653a9b3e146c6f0e7a24828eb8a13d Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Mon, 6 May 2013 19:16:15 +0530 Subject: [PATCH] fixing double calls to VM deploy This fixes regression introduced in commit 2f40a90c that made duplicate calls to deployVirtualMachine. Signed-off-by: Prasanna Santhanam --- tools/marvin/marvin/integration/lib/base.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py index dc7fe60589c..cdb6a36c41d 100755 --- a/tools/marvin/marvin/integration/lib/base.py +++ b/tools/marvin/marvin/integration/lib/base.py @@ -298,11 +298,10 @@ class VirtualMachine: if "userdata" in services: cmd.userdata = base64.b64encode(services["userdata"]) - virtual_machine = apiclient.deployVirtualMachine(cmd, method=method) - if group: cmd.group = group - virtual_machine = apiclient.deployVirtualMachine(cmd) + + virtual_machine = apiclient.deployVirtualMachine(cmd, method=method) if startvm == False: virtual_machine.ssh_ip = virtual_machine.nic[0].ipaddress