bug CS-15191: remove a sanity check that prevent us from getting traffic lable under VMware Reviewed-by: anthony
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d0bdab98 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d0bdab98 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d0bdab98 Branch: refs/heads/master Commit: d0bdab98ae80605a25e69da5d30d68add66d3e60 Parents: 8b6936b Author: Kelven Yang <[email protected]> Authored: Fri Jun 1 10:33:14 2012 -0700 Committer: Kelven Yang <[email protected]> Committed: Wed Jun 6 16:57:49 2012 -0700 ---------------------------------------------------------------------- .../src/com/cloud/network/NetworkManagerImpl.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d0bdab98/server/src/com/cloud/network/NetworkManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 7c11f34..60c98b8 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) {
