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 693E9104D7 for ; Fri, 31 May 2013 07:49:25 +0000 (UTC) Received: (qmail 8917 invoked by uid 500); 31 May 2013 07:49:21 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 7658 invoked by uid 500); 31 May 2013 07:49:17 -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 4661 invoked by uid 99); 31 May 2013 07:49:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 May 2013 07:49:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 76E7D89E856; Fri, 31 May 2013 07:49:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sateesh@apache.org To: commits@cloudstack.apache.org Date: Fri, 31 May 2013 07:49:20 -0000 Message-Id: In-Reply-To: <85474085270c4d6c94c51048c4a4807d@git.apache.org> References: <85474085270c4d6c94c51048c4a4807d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [22/50] [abbrv] git commit: updated refs/heads/vmware-datamodel to 6a8c2bd Don't need to handle dhcp entry differently for different guest OS Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/51930405 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/51930405 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/51930405 Branch: refs/heads/vmware-datamodel Commit: 51930405d9998a352071f4ec8104c0e03300e389 Parents: 271cf92 Author: Anthony Xu Authored: Wed May 29 16:51:42 2013 -0700 Committer: Anthony Xu Committed: Wed May 29 16:51:42 2013 -0700 ---------------------------------------------------------------------- .../router/VirtualNetworkApplianceManagerImpl.java | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51930405/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index b969be2..9e01aa3 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -3370,20 +3370,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId()); Nic defaultNic = findGatewayIp(vm.getId()); String gatewayIp = defaultNic.getGateway(); - boolean needGateway = true; if (gatewayIp != null && !gatewayIp.equals(nic.getGateway())) { - needGateway = false; - GuestOSVO guestOS = _guestOSDao.findById(vm.getGuestOSId()); - // Do set dhcp:router option for non-default nic on certain OS(including Windows), and leave other OS unset. - // Because some OS(e.g. CentOS) would set routing on wrong interface - for (String name : _guestOSNeedGatewayOnNonDefaultNetwork) { - if (guestOS.getDisplayName().startsWith(name)) { - needGateway = true; - break; - } - } - } - if (!needGateway) { gatewayIp = "0.0.0.0"; } dhcpCommand.setDefaultRouter(gatewayIp);