fixing double calls to VM deploy This fixes regression introduced in commit 2f40a90c that made duplicate calls to deployVirtualMachine.
Signed-off-by: Prasanna Santhanam <t...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/71771c1b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/71771c1b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/71771c1b Branch: refs/heads/ui-cisco-asa1000v-support Commit: 71771c1ba4653a9b3e146c6f0e7a24828eb8a13d Parents: 2b87261 Author: Prasanna Santhanam <t...@apache.org> Authored: Mon May 6 19:16:15 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Mon May 6 19:16:15 2013 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/integration/lib/base.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71771c1b/tools/marvin/marvin/integration/lib/base.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py index dc7fe60..cdb6a36 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
