Repository: cloudstack Updated Branches: refs/heads/4.3-forward 3787579d2 -> c04fb68fc
CLOUDSTACK-6072: Release VNIs when guest networks are destroyed submitted-by: [email protected] Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c04fb68f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c04fb68f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c04fb68f Branch: refs/heads/4.3-forward Commit: c04fb68fc7022c9d3ef6206d314194c3ce2a1872 Parents: 3787579 Author: Marcus Sorensen <[email protected]> Authored: Thu Feb 20 23:22:57 2014 -0700 Committer: Marcus Sorensen <[email protected]> Committed: Thu Feb 20 23:22:57 2014 -0700 ---------------------------------------------------------------------- server/src/com/cloud/network/guru/GuestNetworkGuru.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c04fb68f/server/src/com/cloud/network/guru/GuestNetworkGuru.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/guru/GuestNetworkGuru.java b/server/src/com/cloud/network/guru/GuestNetworkGuru.java index 85728c2..d1c0656 100755 --- a/server/src/com/cloud/network/guru/GuestNetworkGuru.java +++ b/server/src/com/cloud/network/guru/GuestNetworkGuru.java @@ -414,13 +414,13 @@ public abstract class GuestNetworkGuru extends AdapterBase implements NetworkGur @Override public void shutdown(NetworkProfile profile, NetworkOffering offering) { - if (profile.getBroadcastDomainType() == BroadcastDomainType.Vlan && + if ((profile.getBroadcastDomainType() == BroadcastDomainType.Vlan || profile.getBroadcastDomainType() == BroadcastDomainType.Vxlan) && profile.getBroadcastUri() != null && !offering.getSpecifyVlan()) { 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()); ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), profile.getAccountId(), - EventVO.LEVEL_INFO, EventTypes.EVENT_ZONE_VLAN_RELEASE, "Released Zone Vlan: " + EventVO.LEVEL_INFO, EventTypes.EVENT_ZONE_VLAN_RELEASE, "Released Zone vnet: " + BroadcastDomainType.getValue(profile.getBroadcastUri()) + " for Network: " + profile.getId(), 0); } profile.setBroadcastUri(null);
