From d6420cd91ebb493e8b9d4220e95b7a3250272db3 Mon Sep 17 00:00:00 2001 From: David Grizzanti Date: Fri, 1 Nov 2013 11:40:32 -0400 Subject: [PATCH] CLOUDSTACK-5023: Deleting Port Forwarding Rule fails when generating usage events are enabled --- server/src/com/cloud/network/firewall/FirewallManagerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java index 8c4583ebac8..e9811d6c3b7 100644 --- a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java +++ b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java @@ -738,7 +738,8 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService, } if (generateUsageEvent && needUsageEvent) { - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_RULE_DELETE, rule.getAccountId(), 0, rule.getId(), + Network network = _networkModel.getNetwork(rule.getNetworkId()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_RULE_DELETE, rule.getAccountId(), network.getDataCenterId(), rule.getId(), null, rule.getClass().getName(), rule.getUuid()); }