From a08528cfd9f9e35643b9201a6f1bf9b9c1507384 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Tue, 1 Jul 2014 15:16:40 -0700
Subject: [PATCH] Polish IPv6 input error information

---
 utils/src/com/cloud/utils/net/NetUtils.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java
index d881c898934..cde97d47c06 100755
--- a/utils/src/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -1381,11 +1381,19 @@ public class NetUtils {
     }
 
     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://";