bug CS-15191: remove a sanity check that prevent us from getting traffic lable under VMware

Reviewed-by: anthony
This commit is contained in:
Kelven Yang 2012-06-01 10:33:14 -07:00
parent 8b6936bde6
commit d0bdab98ae

View File

@ -6087,10 +6087,14 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
protected Long getNonGuestNetworkPhysicalNetworkId(Network network) { protected Long getNonGuestNetworkPhysicalNetworkId(Network network) {
// no physical network for control traffic type // 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) { if (network.getTrafficType() == TrafficType.Control) {
return null; return null;
} }
*/
Long physicalNetworkId = network.getPhysicalNetworkId(); Long physicalNetworkId = network.getPhysicalNetworkId();
if (physicalNetworkId == null) { if (physicalNetworkId == null) {