Skip to content

Commit 127667f

Browse files
committed
VPC: Fix tier creation failure for IPv4 due to incorrect destination prefix
* VPC: Fix tier creation failure for IPv4 due to incorrect destination prefix * remove newline
1 parent b0603c1 commit 127667f

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,10 +411,14 @@ public boolean addFirewallRules(Network network, List<NetrisNetworkRule> firewal
411411
for (String sourceCidr : sourceCidrs) {
412412
if (FirewallRule.TrafficType.Ingress.name().equalsIgnoreCase(trafficType)) {
413413
sourcePrefix = sourceCidr;
414-
destinationPrefix = NetUtils.isValidIp4Cidr(sourcePrefix) ? network.getCidr() : network.getIp6Cidr();
414+
destinationPrefix = NetUtils.isValidIp4Cidr(sourcePrefix) ||
415+
(Objects.isNull(network.getIp6Cidr()) && NetUtils.ANY_PROTO.equalsIgnoreCase(sourceCidr)) ?
416+
network.getCidr() : network.getIp6Cidr();
415417
} else {
416418
destinationPrefix = sourceCidr;
417-
sourcePrefix = NetUtils.isValidIp4Cidr(destinationPrefix) ? network.getCidr() : network.getIp6Cidr();
419+
sourcePrefix = NetUtils.isValidIp4Cidr(destinationPrefix) ||
420+
(Objects.isNull(network.getIp6Cidr()) && NetUtils.ANY_PROTO.equalsIgnoreCase(sourceCidr)) ?
421+
network.getCidr() : network.getIp6Cidr();
418422
}
419423
String srcPort;
420424
String dstPort;

0 commit comments

Comments
 (0)