apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 18:43:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Guest cidr is optional for Advance zone (zone can have just Shared networks)

Browse Source
This commit is contained in:
Alena Prokharchyk 2012-02-10 10:44:02 -08:00
parent a6f805c140
commit 26d272021f
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -1658,11 +1658,8 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
NetworkType zoneType = isBasic ? NetworkType.Basic : NetworkType.Advanced;
// Guest cidr is required for Advanced zone creation; error out when the
// parameter specified for Basic zone
if (zoneType == NetworkType.Advanced && guestCidr == null && !isSecurityGroupEnabled) {
throw new InvalidParameterValueException("guestCidrAddress parameter is required for Advanced zone creation");
} else if (zoneType == NetworkType.Basic && guestCidr != null) {
// error out when the parameter specified for Basic zone
if (zoneType == NetworkType.Basic && guestCidr != null) {
throw new InvalidParameterValueException("guestCidrAddress parameter is not supported for Basic zone");
}