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 4B129105C4 for ; Tue, 17 Dec 2013 11:05:09 +0000 (UTC) Received: (qmail 95311 invoked by uid 500); 17 Dec 2013 11:05:07 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 95260 invoked by uid 500); 17 Dec 2013 11:05:06 -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 95246 invoked by uid 99); 17 Dec 2013 11:05:06 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Dec 2013 11:05:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4E08182AC19; Tue, 17 Dec 2013 11:05:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rajeshbattala@apache.org To: commits@cloudstack.apache.org Date: Tue, 17 Dec 2013 11:05:06 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: updated refs/heads/4.3 to 03f1bae Updated Branches: refs/heads/4.3 340e29d7b -> 03f1bae21 CLOUDSTACK-5365 added route for mgmt cidr in the VR running on HyperV Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/03f1bae2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/03f1bae2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/03f1bae2 Branch: refs/heads/4.3 Commit: 03f1bae21c532aa3b39ba5ed3bc901ae02f044ba Parents: 6d6c3c3 Author: Rajesh Battala Authored: Tue Dec 17 16:39:26 2013 +0530 Committer: Rajesh Battala Committed: Tue Dec 17 16:40:01 2013 +0530 ---------------------------------------------------------------------- .../cloud/network/router/VirtualNetworkApplianceManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/03f1bae2/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 4b030e8..a3cafa5 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -1936,7 +1936,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V } else if (nic.getTrafficType() == TrafficType.Control) { controlNic = nic; // DOMR control command is sent over management server in VMware - if (dest.getHost().getHypervisorType() == HypervisorType.VMware) { + if (dest.getHost().getHypervisorType() == HypervisorType.VMware || dest.getHost().getHypervisorType() == HypervisorType.Hyperv) { s_logger.info("Check if we need to add management server explicit route to DomR. pod cidr: " + dest.getPod().getCidrAddress() + "/" + dest.getPod().getCidrSize() + ", pod gateway: " + dest.getPod().getGateway() + ", management host: " + ClusterManager.ManagementHostIPAdr.value());