cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [1/2] git commit: updated refs/heads/4.4 to 473c2b4
Date Fri, 13 Jun 2014 11:56:13 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 a951b5152 -> 473c2b480


CLOUDSTACK-6832: [OVS]vnet is not released even the network is deleted

fix ensures allocated VNET is released during network shutdown

(cherry picked from commit be937a08213f06a801cf07d19867d48dad35d19f)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a4512c0f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a4512c0f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a4512c0f

Branch: refs/heads/4.4
Commit: a4512c0f0cf126df59c6d5467d2ece5472029c6f
Parents: a951b51
Author: Murali Reddy <muralimmreddy@gmail.com>
Authored: Fri Jun 13 17:03:28 2014 +0530
Committer: Daan Hoogland <daan@onecht.net>
Committed: Fri Jun 13 13:55:16 2014 +0200

----------------------------------------------------------------------
 .../ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4512c0f/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
index de74108..3ca25f7 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
@@ -189,7 +189,12 @@ public class OvsGuestNetworkGuru extends GuestNetworkGuru {
             return;
         }
 
-        super.shutdown(profile, offering);
+        if (profile.getBroadcastDomainType() == BroadcastDomainType.Vswitch ) {
+            s_logger.debug("Releasing vnet for the network id=" + profile.getId());
+            _dcDao.releaseVnet(BroadcastDomainType.getValue(profile.getBroadcastUri()), profile.getDataCenterId(),
profile.getPhysicalNetworkId(),
+                    profile.getAccountId(), profile.getReservationId());
+        }
+        profile.setBroadcastUri(null);
     }
 
     @Override


Mime
View raw message