From 01a325b2bfde3f82faca1361cfab3f66ee78a524 Mon Sep 17 00:00:00 2001 From: Kishan Kavala Date: Mon, 24 Nov 2014 11:35:36 +0530 Subject: [PATCH] Network Id for direct-network should not be included in usage record response. Direct network stats have network_id = 0. Ignore network with id = 0 in usage record --- server/src/com/cloud/api/ApiResponseHelper.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index dd55486ddfd..4726c24af2c 100644 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -3169,9 +3169,11 @@ public class ApiResponseHelper implements ResponseGenerator { } } //Network ID - NetworkVO network = _entityMgr.findByIdIncludingRemoved(NetworkVO.class, usageRecord.getNetworkId().toString()); - if (network != null) { - usageRecResponse.setNetworkId(network.getUuid()); + if((usageRecord.getNetworkId() != null) && (usageRecord.getNetworkId() != 0)) { + NetworkVO network = _entityMgr.findByIdIncludingRemoved(NetworkVO.class, usageRecord.getNetworkId().toString()); + if (network != null) { + usageRecResponse.setNetworkId(network.getUuid()); + } } } else if (usageRecord.getUsageType() == UsageTypes.VM_DISK_IO_READ || usageRecord.getUsageType() == UsageTypes.VM_DISK_IO_WRITE