commit 8ee4f6c080062632473c214b6fe896148e3d56e3
author Sheng Yang <sheng.yang@citrix.com> Tue May 07 14:49:50 2013 -0700
committer Sheng Yang <sheng.yang@citrix.com> Mon May 20 17:38:09 2013 -0700
tree ff56d47a5f241c283ba0dc136e69c56ce770fd4c
parent eb7c3214260371b0551040831ad7404f5880fc8d

PVLAN: Check BroadcastDomainType before extract pvlan tag

server/src/com/cloud/configuration/ConfigurationManagerImpl.java

diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 47c5482..7bd90b2 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2689,8 +2689,9 @@
             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) {