From 26d272021f35e29bd00fdbbd7c7d75e2017539fa Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <Alena.Prokharchyk@citrix.com>
Date: Fri, 10 Feb 2012 10:44:02 -0800
Subject: [PATCH] Guest cidr is optional for Advance zone (zone can have just
 Shared networks)

---
 .../com/cloud/configuration/ConfigurationManagerImpl.java  | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index ad27d44c2ec..01d5a6e0b7d 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -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");
         }