etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-3642: [Usage][PortableIP] CS is not generating usage events 

for portable IPs

generating usage event for acquire and release
This commit is contained in:
Murali Reddy 2013-07-30 18:58:12 +05:30
parent 1550f5e26c
commit 4653cff88b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -539,8 +539,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());
}
@ -843,6 +842,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 {