etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

No guest vlan is requried when add public IP range

This commit is contained in:
Alena Prokharchyk 2011-12-15 14:56:18 -08:00
parent 9fcbfc7abc
commit be696bd283
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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