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

PVLAN: Check BroadcastDomainType before extract pvlan tag

This commit is contained in:
Sheng Yang 2013-05-07 14:49:50 -07:00
parent eb7c321426
commit 8ee4f6c080
1 changed files with 3 additions and 2 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

@ -2689,8 +2689,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
if (uri != null) {
String[] vlan = uri.toString().split("vlan:\\/\\/");
networkVlanId = vlan[1];
//For pvlan
networkVlanId = networkVlanId.split("-")[0];
if (network.getBroadcastDomainType() == BroadcastDomainType.Pvlan) {
networkVlanId = networkVlanId.split("-")[0];
}
}
if (vlanId != null) {