From fe460fac43cf1abe094bf6c99c00b132be274c3a Mon Sep 17 00:00:00 2001
From: Pranav Saxena <pranav.saxena@citrix.com>
Date: Thu, 15 Nov 2012 13:52:54 +0530
Subject: [PATCH] Upgrading a network that has Network offering SRX/F5 inline
 mode to a network offering that has all service provided by VR does not give
 proper error message: Hence correcting the error message

---
 server/src/com/cloud/network/NetworkManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 540639b4277..5c40f521562 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -4640,7 +4640,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
             if (networkOfferingId != oldNetworkOfferingId) {
                 if (networkOfferingIsConfiguredForExternalNetworking(networkOfferingId) != networkOfferingIsConfiguredForExternalNetworking(oldNetworkOfferingId)
                         && !changeCidr) {
-                    throw new InvalidParameterValueException("Can't guarantee guest network CIDR is unchanged after updating network!");
+                    throw new InvalidParameterValueException("Updating network failed since guest CIDR needs to be changed!");
                 }
                 if (changeCidr) {
                     if (!checkForNonStoppedVmInNetwork(network.getId())) {