From d0bdab98ae80605a25e69da5d30d68add66d3e60 Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Fri, 1 Jun 2012 10:33:14 -0700 Subject: [PATCH] bug CS-15191: remove a sanity check that prevent us from getting traffic lable under VMware Reviewed-by: anthony --- server/src/com/cloud/network/NetworkManagerImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 7c11f3411bc..60c98b86d96 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -6087,10 +6087,14 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag protected Long getNonGuestNetworkPhysicalNetworkId(Network network) { // no physical network for control traffic type + + // have to remove this sanity check as VMware control network is management network + // we need to retrieve traffic label information through physical network +/* if (network.getTrafficType() == TrafficType.Control) { return null; } - +*/ Long physicalNetworkId = network.getPhysicalNetworkId(); if (physicalNetworkId == null) {