You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2013/07/19 15:14:10 UTC
[2/2] git commit: updated refs/heads/4.2 to 2b82c3e
CLOUDSTACK-3642: [Usage][PortableIP] CS is not generating usage events
for portable IPs
generating usage events for acquire/release of portable IP
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2b82c3e1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2b82c3e1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2b82c3e1
Branch: refs/heads/4.2
Commit: 2b82c3e1db1ecf8ec15819bfe0fd255f06c21413
Parents: 75af53b
Author: Murali Reddy <mu...@gmail.com>
Authored: Fri Jul 19 18:42:52 2013 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Fri Jul 19 18:42:52 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkManagerImpl.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b82c3e1/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index f691e17..736f2a1 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -534,7 +534,8 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
String guestType = vlan.getVlanType().toString();
if (!isIpDedicated(addr)) {
- UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_ASSIGN, owner.getId(),
+ String eventType = addr.isPortable() ? EventTypes.EVENT_PORTABLE_IP_ASSIGN : EventTypes.EVENT_NET_IP_ASSIGN;
+ UsageEventUtils.publishUsageEvent(eventType, owner.getId(),
addr.getDataCenterId(), addr.getId(), addr.getAddress().toString(), addr.isSourceNat(), guestType,
addr.getSystem(), addr.getClass().getName(), addr.getUuid());
}
@@ -3530,7 +3531,8 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
String guestType = vlan.getVlanType().toString();
if (!isIpDedicated(ip)) {
- UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_RELEASE,
+ String eventType = ip.isPortable() ? EventTypes.EVENT_PORTABLE_IP_RELEASE : EventTypes.EVENT_NET_IP_RELEASE;
+ UsageEventUtils.publishUsageEvent( eventType,
ip.getAllocatedToAccountId(), ip.getDataCenterId(), addrId, ip.getAddress().addr(),
ip.isSourceNat(), guestType, ip.getSystem(), ip.getClass().getName(), ip.getUuid());
}