You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2012/11/15 09:36:37 UTC
git commit: 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
Updated Branches:
refs/heads/master 291498583 -> fe460fac4
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
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/fe460fac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/fe460fac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/fe460fac
Branch: refs/heads/master
Commit: fe460fac43cf1abe094bf6c99c00b132be274c3a
Parents: 2914985
Author: Pranav Saxena <pr...@citrix.com>
Authored: Thu Nov 15 13:52:54 2012 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Thu Nov 15 13:52:54 2012 +0530
----------------------------------------------------------------------
.../src/com/cloud/network/NetworkManagerImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe460fac/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 540639b..5c40f52 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())) {