Updated Branches: refs/heads/master 4c729e758 -> b2fdfc508
CLOUDSTACK-3642: [Usage][PortableIP] CS is not generating usage events for portable IPs generating usage event for acquire and release Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b2fdfc50 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b2fdfc50 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b2fdfc50 Branch: refs/heads/master Commit: b2fdfc50840dd6dea74100358c88953814b28593 Parents: 4c729e7 Author: Murali Reddy <[email protected]> Authored: Tue Jul 30 18:58:12 2013 +0530 Committer: Murali Reddy <[email protected]> Committed: Tue Jul 30 19:01:10 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkManagerImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b2fdfc50/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 2c7dfa1..5fc4f41 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -540,8 +540,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L String guestType = vlan.getVlanType().toString(); if (!isIpDedicated(addr)) { - String eventType = addr.isPortable() ? EventTypes.EVENT_PORTABLE_IP_ASSIGN : EventTypes.EVENT_NET_IP_ASSIGN; - UsageEventUtils.publishUsageEvent(eventType, owner.getId(), + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_ASSIGN, owner.getId(), addr.getDataCenterId(), addr.getId(), addr.getAddress().toString(), addr.isSourceNat(), guestType, addr.getSystem(), addr.getClass().getName(), addr.getUuid()); } @@ -844,6 +843,11 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L ipaddr.setAllocatedToAccountId(ipOwner.getId()); ipaddr= _ipAddressDao.persist(ipaddr); + String guestType = vlan.getVlanType().toString(); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_PORTABLE_IP_ASSIGN, ipaddr.getId(), + ipaddr.getDataCenterId(), ipaddr.getId(), ipaddr.getAddress().toString(), ipaddr.isSourceNat(), null, + ipaddr.getSystem(), ipaddr.getClass().getName(), ipaddr.getUuid()); + txn.commit(); } finally {
