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

CLOUDSTACK-5502: interpret vlan='untagged' as vlan == null

This commit is contained in:
Daan Hoogland 2013-12-20 13:31:25 +01:00
parent 50a428c3aa
commit 7b0c85da3c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2378,6 +2378,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
String newVlanNetmask = cmd.getNetmask();
String vlanId = cmd.getVlan();
// TODO decide if we should be forgiving or demand a valid and complete URI
if(Vlan.UNTAGGED.equalsIgnoreCase(vlanId))
vlanId = null;
if (!((vlanId == null) || ("".equals(vlanId)) || vlanId.startsWith(BroadcastDomainType.Vlan.scheme())))
vlanId = BroadcastDomainType.Vlan.toUri(vlanId).toString();
Boolean forVirtualNetwork = cmd.isForVirtualNetwork();