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

murali-reddy · murali-reddy · commit 515ef0de4f0d · 2014-06-13T17:05:44.000+05:30
fix ensures allocated VNET is released during network shutdown
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
@@ -189,7 +189,12 @@ public void shutdown(NetworkProfile profile, NetworkOffering offering) {
             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

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,12 @@ public void shutdown(NetworkProfile profile, NetworkOffering offering) {`
`189`	`189`	`return;`
`190`	`190`	`}`
`191`	`191`
`192`		`- super.shutdown(profile, offering);`
	`192`	`+ if (profile.getBroadcastDomainType() == BroadcastDomainType.Vswitch ) {`
	`193`	`+ s_logger.debug("Releasing vnet for the network id=" + profile.getId());`
	`194`	`+ _dcDao.releaseVnet(BroadcastDomainType.getValue(profile.getBroadcastUri()), profile.getDataCenterId(), profile.getPhysicalNetworkId(),`
	`195`	`+ profile.getAccountId(), profile.getReservationId());`
	`196`	`+ }`
	`197`	`+ profile.setBroadcastUri(null);`
`193`	`198`	`}`
`194`	`199`
`195`	`200`	`@Override`