apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Pranav Saxena 2012-11-15 13:52:54 +05:30
parent 2914985837
commit fe460fac43
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -4640,7 +4640,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
if (networkOfferingId != oldNetworkOfferingId) { if (networkOfferingId != oldNetworkOfferingId) {
if (networkOfferingIsConfiguredForExternalNetworking(networkOfferingId) != networkOfferingIsConfiguredForExternalNetworking(oldNetworkOfferingId) if (networkOfferingIsConfiguredForExternalNetworking(networkOfferingId) != networkOfferingIsConfiguredForExternalNetworking(oldNetworkOfferingId)
&& !changeCidr) { && !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 (changeCidr) {
if (!checkForNonStoppedVmInNetwork(network.getId())) { if (!checkForNonStoppedVmInNetwork(network.getId())) {