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 747E3107C2 for ; Wed, 24 Apr 2013 23:03:16 +0000 (UTC) Received: (qmail 45022 invoked by uid 500); 24 Apr 2013 23:03:11 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 44948 invoked by uid 500); 24 Apr 2013 23:03:11 -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 44469 invoked by uid 99); 24 Apr 2013 23:03:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Apr 2013 23:03:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 325378807EF; Wed, 24 Apr 2013 23:03:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Wed, 24 Apr 2013 23:03:23 -0000 Message-Id: <4d14f820d86443e7a75a9b84ccd6e0de@git.apache.org> In-Reply-To: <6cb4a1e0844441f88f7bcd1a990dff25@git.apache.org> References: <6cb4a1e0844441f88f7bcd1a990dff25@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/42] git commit: updated refs/heads/ui-vm-affinity to 25f2f0f CLOUDSTACK-2120 - mixed zone management - extend listIsos API to return zone type. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6230e5b7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6230e5b7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6230e5b7 Branch: refs/heads/ui-vm-affinity Commit: 6230e5b77bf701494e3b416a5b7cd04adacfcd24 Parents: f7f1279 Author: Jessica Wang Authored: Tue Apr 23 13:46:36 2013 -0700 Committer: Jessica Wang Committed: Tue Apr 23 13:46:36 2013 -0700 ---------------------------------------------------------------------- server/src/com/cloud/api/ApiResponseHelper.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6230e5b7/server/src/com/cloud/api/ApiResponseHelper.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 0b996c9..f4567c0 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -1738,6 +1738,7 @@ public class ApiResponseHelper implements ResponseGenerator { if (datacenter != null) { isoResponse.setZoneId(datacenter.getUuid()); isoResponse.setZoneName(datacenter.getName()); + isoResponse.setZoneType(datacenter.getNetworkType().toString()); } // If the user is an admin, add the template download status