From 2b82c3e1db1ecf8ec15819bfe0fd255f06c21413 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Fri, 19 Jul 2013 18:42:52 +0530 Subject: [PATCH] CLOUDSTACK-3642: [Usage][PortableIP] CS is not generating usage events for portable IPs generating usage events for acquire/release of portable IP --- server/src/com/cloud/network/NetworkManagerImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index f691e173706..736f2a16fde 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()); }