[cloudstack] branch master updated: CLOUDSTACK-10220: Configure IPv4 alias on VR regardless of IPv6 (#2396)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new 823a789  CLOUDSTACK-10220: Configure IPv4 alias on VR regardless of IPv6 (#2396)
823a789 is described below

commit 823a7891e4b55dca2a241f8ee8ce846469cf5c4a
Author: Wido den Hollander <wi...@widodh.nl>
AuthorDate: Fri Jan 12 18:57:09 2018 +0100

    CLOUDSTACK-10220: Configure IPv4 alias on VR regardless of IPv6 (#2396)
    
    IPv4 and IPv6 are two different protocols and the presence of IPv6
    in a network does not mean that IPv4 aliases/multiple subnets should
    not be configured or supported by the VR.
    
    This if-statement was written almost 5 years ago in a attempt to
    add IPv6 support to CloudStack but was never fully implemented.
    
    Signed-off-by: Wido den Hollander <wi...@widodh.nl>
---
 .../apache/cloudstack/engine/orchestration/NetworkOrchestrator.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 9afd642..cec2e59 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -1306,9 +1306,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
             if (_networkModel.areServicesSupportedInNetwork(network.getId(), Service.Dhcp)
                     && _networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.Dhcp, element.getProvider()) && element instanceof DhcpServiceProvider) {
                 final DhcpServiceProvider sp = (DhcpServiceProvider)element;
-                final Map<Capability, String> dhcpCapabilities = element.getCapabilities().get(Service.Dhcp);
-                final String supportsMultipleSubnets = dhcpCapabilities.get(Capability.DhcpAccrossMultipleSubnets);
-                if (supportsMultipleSubnets != null && Boolean.valueOf(supportsMultipleSubnets) && profile.getIPv6Address() == null) {
+                if (isDhcpAccrossMultipleSubnetsSupported(sp)) {
                     if (!sp.configDhcpSupportForSubnet(network, profile, vmProfile, dest, context)) {
                         return false;
                     }

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].