From be696bd2830102190b6cda054e383e95b9bff7ed Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Thu, 15 Dec 2011 14:56:18 -0800 Subject: [PATCH] No guest vlan is requried when add public IP range --- .../com/cloud/configuration/ConfigurationManagerImpl.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 7fdf9fd2b9d..f6906fcf3f2 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -2202,11 +2202,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura throw new InvalidParameterValueException("Only Direct Untagged and Virtual networks are supported in the zone " + zone.getId() + " of type " + zone.getNetworkType()); } - // don't allow to create a virtual vlan when physical networks's vnet is NULL in Advanced zone - if ((zone.getNetworkType() == NetworkType.Advanced && pNtwk.getVnet() == null) && forVirtualNetwork) { - throw new InvalidParameterValueException("Can't add virtual network to the physical Network id="+pNtwk.getId() +" in zone id=" + zone.getId() + " as there is no guest vlan configured"); - } - VlanType vlanType = forVirtualNetwork ? VlanType.VirtualNetwork : VlanType.DirectAttached; // ACL check