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 5A57EEC5A for ; Wed, 6 Mar 2013 18:45:05 +0000 (UTC) Received: (qmail 58465 invoked by uid 500); 6 Mar 2013 18:45:05 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 58442 invoked by uid 500); 6 Mar 2013 18:45:05 -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 58435 invoked by uid 99); 6 Mar 2013 18:45:05 -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, 06 Mar 2013 18:45:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E607E830BFA; Wed, 6 Mar 2013 18:45:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chipchilders@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: refs/heads/4.1 - CLOUDSTACK-1402: listRouters API response doesn't return linklocal IP and public IP details. Message-Id: <20130306184504.E607E830BFA@tyr.zones.apache.org> Date: Wed, 6 Mar 2013 18:45:04 +0000 (UTC) Updated Branches: refs/heads/4.1 525d391d6 -> cbbc488d3 CLOUDSTACK-1402: listRouters API response doesn't return linklocal IP and public IP details. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/cbbc488d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/cbbc488d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/cbbc488d Branch: refs/heads/4.1 Commit: cbbc488d3c878e95b8155280a220a7fa4262dc8d Parents: 525d391 Author: Min Chen Authored: Wed Mar 6 10:11:28 2013 -0800 Committer: Chip Childers Committed: Wed Mar 6 13:39:52 2013 -0500 ---------------------------------------------------------------------- .../api/query/dao/DomainRouterJoinDaoImpl.java | 23 +++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cbbc488d/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java index cdb859e..488c4e4 100644 --- a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java @@ -170,6 +170,29 @@ public class DomainRouterJoinDaoImpl extends GenericDaoBase 0) { + TrafficType ty = vr.getTrafficType(); + if (ty != null) { + // legacy code, public/control/guest nic info is kept in + // nics response object + if (ty == TrafficType.Public) { + vrData.setPublicIp(vr.getIpAddress()); + vrData.setPublicMacAddress(vr.getMacAddress()); + vrData.setPublicNetmask(vr.getNetmask()); + vrData.setGateway(vr.getGateway()); + vrData.setPublicNetworkId(vr.getNetworkUuid()); + } else if (ty == TrafficType.Control) { + vrData.setLinkLocalIp(vr.getIpAddress()); + vrData.setLinkLocalMacAddress(vr.getMacAddress()); + vrData.setLinkLocalNetmask(vr.getNetmask()); + vrData.setLinkLocalNetworkId(vr.getNetworkUuid()); + } else if (ty == TrafficType.Guest) { + vrData.setGuestIpAddress(vr.getIpAddress()); + vrData.setGuestMacAddress(vr.getMacAddress()); + vrData.setGuestNetmask(vr.getNetmask()); + vrData.setGuestNetworkId(vr.getNetworkUuid()); + vrData.setNetworkDomain(vr.getNetworkDomain()); + } + } NicResponse nicResponse = new NicResponse(); nicResponse.setId(vr.getNicUuid()); nicResponse.setIpaddress(vr.getIpAddress());