From 85633229938858cb2706afa281bf65eb14bd667b Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Thu, 20 Jan 2011 13:36:43 +0530
Subject: [PATCH] recommiting usage changes which were erased due to
 650fb5221e255350e10c2c3cada75f0bb607e9f9

---
 server/src/com/cloud/network/NetworkManagerImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 45e15cd84c7..5388bcd85ee 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -240,7 +240,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
         if (!_ipAddressDao.update(addr.getAddress(), addr)) {
             throw new CloudRuntimeException("Found address to allocate but unable to update: " + addr);
         }
-        if(!sourceNat){
+        if(!sourceNat  &&  (owner.getAccountId() != Account.ACCOUNT_ID_SYSTEM)){
             UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_NET_IP_ASSIGN, owner.getAccountId(), dcId, 0, addr.getAddress().toString());
             _usageEventDao.persist(usageEvent);
         }
@@ -656,7 +656,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
         if (success) {
             _ipAddressDao.unassignIpAddress(addr);
             s_logger.debug("released a public ip: " + addr);    
-            if(!ip.isSourceNat()){       
+            if(!ip.isSourceNat() && (ownerId != Account.ACCOUNT_ID_SYSTEM)){       
                 UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_NET_IP_RELEASE, ownerId, ip.getDataCenterId(), 0, addr.toString());
                 _usageEventDao.persist(usageEvent);
             }