From f18eebf2e958ffd63be8b47996ad07b8c04a9c34 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 6 Sep 2022 16:43:20 +0530 Subject: [PATCH] server: fix check for ipv6 range overlap (#6705) Fixes incorrect check for verifying IPv6 ranges overlap. This causes the inability to add multiple IPv6 ranges. --- .../java/com/cloud/configuration/ConfigurationManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java index 1dd73aa593d..9dc1a5201be 100755 --- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java @@ -4643,7 +4643,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } if (!StringUtils.isAllEmpty(ipv6Range, vlan.getIp6Range())) { String r1 = StringUtils.isEmpty(ipv6Range) ? NetUtils.getIpv6RangeFromCidr(vlanIp6Cidr) : ipv6Range; - String r2 = StringUtils.isEmpty(vlan.getIp6Range()) ? NetUtils.getIpv6RangeFromCidr(vlanIp6Cidr) : vlan.getIp6Range(); + String r2 = StringUtils.isEmpty(vlan.getIp6Range()) ? NetUtils.getIpv6RangeFromCidr(vlan.getIp6Cidr()) : vlan.getIp6Range(); if(NetUtils.isIp6RangeOverlap(r1, r2)) { throw new InvalidParameterValueException(String.format("The IPv6 range with tag: %s already has IPs that overlap with the new range.", vlan.getVlanTag()));