From 6dd7e71e2efa24eef1b5cb79a3e91bcd8d062b78 Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Tue, 24 Jun 2025 18:19:03 -0400
Subject: [PATCH] Support ACLs for IPv6 addresses

---
 .../apache/cloudstack/service/NetrisServiceImpl.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisServiceImpl.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisServiceImpl.java
index e915730bd1a..e35d6bac080 100644
--- a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisServiceImpl.java
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisServiceImpl.java
@@ -404,10 +404,18 @@ public class NetrisServiceImpl implements NetrisService, Configurable {
         String destinationPrefix;
         if ("INGRESS".equals(trafficType)) {
             sourcePrefix = baseNetworkRule.getSourceCidrList().get(0);
-            destinationPrefix = network.getCidr();
+            if (NetUtils.isValidIp4Cidr(sourcePrefix)) {
+                destinationPrefix = network.getCidr();
+            } else {
+                destinationPrefix = network.getIp6Cidr();
+            }
         } else {
-            sourcePrefix = network.getCidr();
             destinationPrefix = baseNetworkRule.getSourceCidrList().get(0);
+            if (NetUtils.isValidIp4Cidr(destinationPrefix)) {
+                sourcePrefix = network.getCidr();
+            } else {
+                sourcePrefix = network.getIp6Cidr();
+            }
         }
         String srcPort;
         String dstPort;