cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject git commit: updated refs/heads/master to f1f7958
Date Fri, 21 Feb 2014 06:22:32 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 21d016b3d -> f1f79586d


CLOUDSTACK-6072: Release VNIs when guest networks are destroyed

submitted-by: mail@ynojima.net


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

Branch: refs/heads/master
Commit: f1f79586da64cf3ad79ea7698927f10920b0d18d
Parents: 21d016b
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Thu Feb 20 23:21:07 2014 -0700
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Thu Feb 20 23:21:07 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/f1f79586/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 a759951..b7b2627 100755
--- a/server/src/com/cloud/network/guru/GuestNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/GuestNetworkGuru.java
@@ -417,13 +417,13 @@ public abstract class GuestNetworkGuru extends AdapterBase implements
NetworkGur
     @Override
     public void shutdown(NetworkProfile profile, NetworkOffering offering) {
 
-        if (profile.getBroadcastDomainType() == BroadcastDomainType.Vlan && profile.getBroadcastUri()
!= null && !offering.getSpecifyVlan()) {
+        if ((profile.getBroadcastDomainType() == BroadcastDomainType.Vlan || profile.getBroadcastDomainType()
== BroadcastDomainType.Vxlan) && !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: " + BroadcastDomainType.getValue(profile.getBroadcastUri())
+ " for Network: " + profile.getId(), 0);
+                "Released Zone Vnet: " + BroadcastDomainType.getValue(profile.getBroadcastUri())
+ " for Network: " + profile.getId(), 0);
         }
         profile.setBroadcastUri(null);
     }


Mime
View raw message