Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 48E29E464 for ; Mon, 18 Mar 2013 12:27:28 +0000 (UTC) Received: (qmail 39871 invoked by uid 500); 18 Mar 2013 12:27:17 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 39513 invoked by uid 500); 18 Mar 2013 12:27:16 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 35895 invoked by uid 99); 18 Mar 2013 12:27:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Mar 2013 12:27:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3EE2635D6F; Mon, 18 Mar 2013 12:27:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [20/50] [abbrv] git commit: refs/heads/marvin-refactor - CLOUDSTACK-1157 updated API documentation for listTemplates command; fixed description of templateFilter parameter to all 7 options (in line with listIsos API cmd) Message-Id: <20130318122711.3EE2635D6F@tyr.zones.apache.org> Date: Mon, 18 Mar 2013 12:27:11 +0000 (UTC) CLOUDSTACK-1157 updated API documentation for listTemplates command; fixed description of templateFilter parameter to all 7 options (in line with listIsos API cmd) Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4d5dfb11 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4d5dfb11 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4d5dfb11 Branch: refs/heads/marvin-refactor Commit: 4d5dfb1139918fd984e6d2392cef4537c6b357eb Parents: 3226b95 Author: David Grizzanti Authored: Tue Mar 12 16:02:59 2013 -0400 Committer: Alena Prokharchyk Committed: Thu Mar 14 14:58:58 2013 -0700 ---------------------------------------------------------------------- .../command/user/template/ListTemplatesCmd.java | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4d5dfb11/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java index c48534e..aeb76f5 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java @@ -55,11 +55,14 @@ public class ListTemplatesCmd extends BaseListTaggedResourcesCmd { @Parameter(name=ApiConstants.NAME, type=CommandType.STRING, description="the template name") private String templateName; - @Parameter(name=ApiConstants.TEMPLATE_FILTER, type=CommandType.STRING, required=true, description="possible values are \"featured\", \"self\", \"self-executable\", \"executable\", and \"community\"." + - "* featured-templates that are featured and are public" + - "* self-templates that have been registered/created by the owner" + - "* selfexecutable-templates that have been registered/created by the owner that can be used to deploy a new VM" + - "* executable-all templates that can be used to deploy a new VM* community-templates that are public.") + @Parameter(name=ApiConstants.TEMPLATE_FILTER, type=CommandType.STRING, required=true, description="possible values are \"featured\", \"self\", \"selfexecutable\",\"sharedexecutable\",\"executable\", and \"community\". " + + "* featured : templates that have been marked as featured and public. " + + "* self : templates that have been registered or created by the calling user. " + + "* selfexecutable : same as self, but only returns templates that can be used to deploy a new VM. " + + "* sharedexecutable : templates ready to be deployed that have been granted to the calling user by another user. " + + "* executable : templates that are owned by the calling user, or public templates, that can be used to deploy a VM. " + + "* community : templates that have been marked as public but not featured. " + + "* all : all templates (only usable by admins).") private String templateFilter; @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType = ZoneResponse.class,