[cloudstack] branch master updated: ipv6: Advanced Networking Security Groups are supported (#3053)

[rohit]

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 c499be2  ipv6: Advanced Networking Security Groups are supported 
(#3053)
c499be2 is described below

commit c499be256a8b6cc5e4643679a9187dfd96871b45
Author: Wido den Hollander <w...@widodh.nl>
AuthorDate: Sat Nov 24 10:40:36 2018 +0100

    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 <w...@widodh.nl>
---
 .../apache/cloudstack/engine/orchestration/NetworkOrchestrator.java    | 3 ---
 server/src/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 e4fbf32..b451974 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 ee880e6..1d8355a 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");
         }