Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 719FF117C1 for ; Tue, 9 Sep 2014 06:43:07 +0000 (UTC) Received: (qmail 45904 invoked by uid 500); 9 Sep 2014 06:43:07 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 45871 invoked by uid 500); 9 Sep 2014 06:43:07 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 45862 invoked by uid 99); 9 Sep 2014 06:43:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Sep 2014 06:43:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E63C1A0FB2E; Tue, 9 Sep 2014 06:43:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: talluri@apache.org To: commits@cloudstack.apache.org Message-Id: <7c2d3faad8fb40b5ad43698585e60297@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to d08d714 Date: Tue, 9 Sep 2014 06:43:06 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master bbb3ea598 -> d08d71427 CLOUDSTACK-7506: Fix base library to read hypevisor value from dictionary as opposed to only from function parameter Signed-off-by: SrikanteswaraRao Talluri Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d08d7142 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d08d7142 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d08d7142 Branch: refs/heads/master Commit: d08d71427bba562aa8b46a54143a783051297494 Parents: bbb3ea5 Author: Gaurav Aradhye Authored: Mon Sep 8 16:45:20 2014 +0530 Committer: SrikanteswaraRao Talluri Committed: Tue Sep 9 12:12:45 2014 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/lib/base.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d08d7142/tools/marvin/marvin/lib/base.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py index d9c72f5..2a763ce 100755 --- a/tools/marvin/marvin/lib/base.py +++ b/tools/marvin/marvin/lib/base.py @@ -1085,7 +1085,10 @@ class Template: cmd.displaytext = services["displaytext"] cmd.name = "-".join([services["name"], random_gen()]) cmd.format = services["format"] - cmd.hypervisor = hypervisor + if hypervisor: + cmd.hypervisor = hypervisor + elif "hypervisor" in services: + cmd.hypervisor = services["hypervisor"] if "ostypeid" in services: cmd.ostypeid = services["ostypeid"]