enterdevstudio
diff --git a/‎utils/src/com/cloud/utils/net/NetUtils.java‎
Lines changed: 10 additions & 2 deletions b/‎utils/src/com/cloud/utils/net/NetUtils.java‎
Lines changed: 10 additions & 2 deletions
@@ -1381,11 +1381,19 @@ public static String getNextIp6InRange(String currentIp, String ipRange) {
     }
 
     public static String standardizeIp6Address(String ip6Addr) {
-        return IPv6Address.fromString(ip6Addr).toString();
+        try {
+            return IPv6Address.fromString(ip6Addr).toString();
+        } catch (IllegalArgumentException ex) {
+            throw new IllegalArgumentException("Invalid IPv6 address: " + ex.getMessage());
+        }
     }
 
     public static String standardizeIp6Cidr(String ip6Cidr){
-        return IPv6Network.fromString(ip6Cidr).toString();
+        try {
+            return IPv6Network.fromString(ip6Cidr).toString();
+        } catch (IllegalArgumentException ex) {
+            throw new IllegalArgumentException("Invalid IPv6 CIDR: " + ex.getMessage());
+        }
     }
 
     static final String VLAN_PREFIX = "vlan://";
Original file line number	Diff line number	Diff line change
`@@ -1381,11 +1381,19 @@ public static String getNextIp6InRange(String currentIp, String ipRange) {`
`1381`	`1381`	`}`
`1382`	`1382`
`1383`	`1383`	`public static String standardizeIp6Address(String ip6Addr) {`
`1384`		`- return IPv6Address.fromString(ip6Addr).toString();`
	`1384`	`+ try {`
	`1385`	`+ return IPv6Address.fromString(ip6Addr).toString();`
	`1386`	`+ } catch (IllegalArgumentException ex) {`
	`1387`	`+ throw new IllegalArgumentException("Invalid IPv6 address: " + ex.getMessage());`
	`1388`	`+ }`
`1385`	`1389`	`}`
`1386`	`1390`
`1387`	`1391`	`public static String standardizeIp6Cidr(String ip6Cidr){`
`1388`		`- return IPv6Network.fromString(ip6Cidr).toString();`
	`1392`	`+ try {`
	`1393`	`+ return IPv6Network.fromString(ip6Cidr).toString();`
	`1394`	`+ } catch (IllegalArgumentException ex) {`
	`1395`	`+ throw new IllegalArgumentException("Invalid IPv6 CIDR: " + ex.getMessage());`
	`1396`	`+ }`
`1389`	`1397`	`}`
`1390`	`1398`
`1391`	`1399`	`static final String VLAN_PREFIX = "vlan://";`