From c499be256a8b6cc5e4643679a9187dfd96871b45 Mon Sep 17 00:00:00 2001 From: Wido den Hollander Date: Sat, 24 Nov 2018 10:40:36 +0100 Subject: [PATCH] ipv6: Advanced Networking Security Groups are supported (#3053) With earlier work in Basic Networking and the security group provider IPv6 is supported and we can allow IPv6 to be supplied in networks with SG enabled. Signed-off-by: Wido den Hollander --- .../cloudstack/engine/orchestration/NetworkOrchestrator.java | 3 --- .../main/java/com/cloud/network/guru/DirectNetworkGuru.java | 3 --- 2 files changed, 6 deletions(-) diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java index e4fbf322b6f..b451974851b 100644 --- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java @@ -2151,9 +2151,6 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } else if (zone.getNetworkType() == NetworkType.Advanced) { if (zone.isSecurityGroupEnabled()) { - if (ipv6) { - throw new InvalidParameterValueException("IPv6 is not supported with security group!"); - } if (isolatedPvlan != null) { throw new InvalidParameterValueException("Isolated Private VLAN is not supported with security group!"); } diff --git a/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java index ee880e62a84..1d8355ab584 100644 --- a/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java +++ b/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java @@ -222,9 +222,6 @@ public class DirectNetworkGuru extends AdapterBase implements NetworkGuru { boolean isSecurityGroupEnabled = _networkModel.areServicesSupportedByNetworkOffering(offering.getId(), Service.SecurityGroup); if (isSecurityGroupEnabled) { - if (userSpecified.getIp6Cidr() != null) { - throw new InvalidParameterValueException("Didn't support security group with IPv6"); - } config.setName("SecurityGroupEnabledNetwork"); config.setDisplayText("SecurityGroupEnabledNetwork"); }