You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2013/12/22 17:59:00 UTC
[5/7] git commit: updated refs/heads/4.3 to 58aaf67
CLOUDSTACK-5340 [Hyper-V] Control IPs are not getting released when VRs are in stopped state
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7c5563ad
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7c5563ad
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7c5563ad
Branch: refs/heads/4.3
Commit: 7c5563adb75c8f8ab62861650ef640bc95a97e8f
Parents: 0ef953f
Author: Rajesh Battala <ra...@citrix.com>
Authored: Sun Dec 22 17:08:42 2013 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Sun Dec 22 20:24:16 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/guru/ControlNetworkGuru.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c5563ad/server/src/com/cloud/network/guru/ControlNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/ControlNetworkGuru.java b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
index a5b7c88..26caa61 100755
--- a/server/src/com/cloud/network/guru/ControlNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
@@ -168,8 +168,8 @@ public class ControlNetworkGuru extends PodBasedNetworkGuru implements NetworkGu
@Override
public boolean release(NicProfile nic, VirtualMachineProfile vm, String reservationId) {
assert nic.getTrafficType() == TrafficType.Control;
-
- if (vm.getHypervisorType() == HypervisorType.VMware && isRouterVm(vm)) {
+ HypervisorType hType = vm.getHypervisorType();
+ if ( ( (hType == HypervisorType.VMware) || (hType == HypervisorType.Hyperv) )&& isRouterVm(vm)) {
long dcId = vm.getVirtualMachine().getDataCenterId();
DataCenterVO dcVo = _dcDao.findById(dcId);
if(dcVo.getNetworkType() != NetworkType.Basic) {