etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VPC: Fix tier creation failure for IPv4 due to incorrect destination prefix

This commit is contained in:
Pearl Dsilva 2025-07-02 10:29:58 -04:00
parent f56b1b6f4f
commit 1ed584c1dd
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisServiceImpl.java
View File

@ -386,6 +386,7 @@ public class NetrisServiceImpl implements NetrisService, Configurable {
@Override
public boolean addFirewallRules(Network network, List<NetrisNetworkRule> firewallRules) {
Long zoneId = network.getDataCenterId();
Long accountId = network.getAccountId();
Long domainId = network.getDomainId();
@ -411,10 +412,14 @@ public class NetrisServiceImpl implements NetrisService, Configurable {
for (String sourceCidr : sourceCidrs) {
if (FirewallRule.TrafficType.Ingress.name().equalsIgnoreCase(trafficType)) {
sourcePrefix = sourceCidr;
destinationPrefix = NetUtils.isValidIp4Cidr(sourcePrefix) ? network.getCidr() : network.getIp6Cidr();
destinationPrefix = NetUtils.isValidIp4Cidr(sourcePrefix) ||
(Objects.isNull(network.getIp6Cidr()) && NetUtils.ANY_PROTO.equalsIgnoreCase(sourceCidr)) ?
network.getCidr() : network.getIp6Cidr();
} else {
destinationPrefix = sourceCidr;
sourcePrefix = NetUtils.isValidIp4Cidr(destinationPrefix) ? network.getCidr() : network.getIp6Cidr();
sourcePrefix = NetUtils.isValidIp4Cidr(destinationPrefix) ||
(Objects.isNull(network.getIp6Cidr()) && NetUtils.ANY_PROTO.equalsIgnoreCase(sourceCidr)) ?
network.getCidr() : network.getIp6Cidr();
}
String srcPort;
String dstPort;