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 0179410B03 for ; Tue, 7 Jan 2014 12:13:03 +0000 (UTC) Received: (qmail 32964 invoked by uid 500); 7 Jan 2014 12:11:07 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 32914 invoked by uid 500); 7 Jan 2014 12:11:00 -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 32486 invoked by uid 99); 7 Jan 2014 12:10:58 -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, 07 Jan 2014 12:10:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C4B3838EA3; Tue, 7 Jan 2014 12:10:57 +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: <9696bd579c734cfdbd0e0339a988d415@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.3 to 14ecb4f Date: Tue, 7 Jan 2014 12:10:57 +0000 (UTC) Updated Branches: refs/heads/4.3 6220e48a9 -> 14ecb4f84 CLOUDSTACK-5113: Fix get_template method to return 'BUILTIN' template by default Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/14ecb4f8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/14ecb4f8 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/14ecb4f8 Branch: refs/heads/4.3 Commit: 14ecb4f842e4ca1a030333f8688dfceaa1f47797 Parents: 6220e48 Author: SrikanteswaraRao Talluri Authored: Tue Jan 7 17:39:19 2014 +0530 Committer: SrikanteswaraRao Talluri Committed: Tue Jan 7 17:39:19 2014 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/integration/lib/common.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14ecb4f8/tools/marvin/marvin/integration/lib/common.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/common.py b/tools/marvin/marvin/integration/lib/common.py index c524675..504cd4c 100644 --- a/tools/marvin/marvin/integration/lib/common.py +++ b/tools/marvin/marvin/integration/lib/common.py @@ -209,7 +209,9 @@ def get_pod(apiclient, zoneid, services=None): raise Exception("Exception: Failed to find specified pod.") -def get_template(apiclient, zoneid, ostype, services=None): +def get_template(apiclient, zoneid, ostype, services=None, + templatefilter='featured', + templatetype='BUILTIN'): "Returns a template" cmd = listOsTypes.listOsTypesCmd() @@ -223,7 +225,7 @@ def get_template(apiclient, zoneid, ostype, services=None): "Failed to find OS type with description: %s" % ostype) cmd = listTemplates.listTemplatesCmd() - cmd.templatefilter = 'featured' + cmd.templatefilter = templatefilter cmd.zoneid = zoneid if services: @@ -237,7 +239,7 @@ def get_template(apiclient, zoneid, ostype, services=None): for template in list_templates: if template.ostypeid == ostypeid: return template - elif template.isready: + elif template.isready and template.templatetype == templatetype: return template raise Exception("Exception: Failed to find template with OSTypeID: %s" %