From f16fbc3c52b602828ed0ded0532abb0f90359d96 Mon Sep 17 00:00:00 2001
From: ilya <ilya@apache.org>
Date: Thu, 3 Apr 2014 06:46:59 +0000
Subject: [PATCH] CLOUDSTACK-6317 [VMware] Tagged VLAN support broken for
 Management/Control/Storage traffic

---
 .../cloud/hypervisor/vmware/resource/VmwareResource.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index be87f121852..7f35eb72a40 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -3749,10 +3749,11 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
             }
         }
 
-        if (nicTo.getType() == Networks.TrafficType.Control || nicTo.getType() == Networks.TrafficType.Management || nicTo.getType() == Networks.TrafficType.Storage) {
-            switchName = _privateNetworkVSwitchName;
-        }
-
+            if (switchName == null
+                   && (nicTo.getType() == Networks.TrafficType.Control || nicTo.getType() == Networks.TrafficType.Management || nicTo.getType() == Networks.TrafficType.Storage)) {
+               switchName = _privateNetworkVSwitchName;
+            }
+ 
         return new Ternary<String,String,String>(switchName, switchType.toString(), vlanToken);
     }