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 833F8108BE for ; Sat, 20 Jul 2013 00:38:39 +0000 (UTC) Received: (qmail 8649 invoked by uid 500); 20 Jul 2013 00:38:39 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 8632 invoked by uid 500); 20 Jul 2013 00:38:39 -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 8625 invoked by uid 99); 20 Jul 2013 00:38:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Jul 2013 00:38:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2E9CF8AF683; Sat, 20 Jul 2013 00:38:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: frankzhang@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.2 to f21fd25 Date: Sat, 20 Jul 2013 00:38:39 +0000 (UTC) Updated Branches: refs/heads/4.2 7073031c5 -> f21fd253e CLOUDSTACK-3428 UCS:API: We need listUCSManager API to lists all UCS managers registered with CloudStack fix entityType in api command Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f21fd253 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f21fd253 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f21fd253 Branch: refs/heads/4.2 Commit: f21fd253eb38d04dd837ab42c818b29806c56131 Parents: 7073031 Author: frank Authored: Fri Jul 19 17:46:27 2013 -0700 Committer: frank Committed: Fri Jul 19 17:47:54 2013 -0700 ---------------------------------------------------------------------- .../ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f21fd253/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java index 4d4473d..228fbcb 100755 --- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java +++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java @@ -36,6 +36,7 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.UcsManagerResponse; +import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.log4j.Logger; import com.cloud.exception.ConcurrentOperationException; @@ -50,7 +51,7 @@ import com.cloud.user.Account; public class ListUcsManagerCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListUcsManagerCmd.class); - @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, description="the zone id", required=true) + @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, description="the zone id", entityType=ZoneResponse.class, required=true) private Long zoneId; @Inject