From 2971fb32fb83826dc1cfb0f46bd51deeddef3a84 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@cloud.com>
Date: Fri, 10 Jun 2011 19:23:12 -0700
Subject: [PATCH] bug 9516: Fix network.throttling.rate on DomR other vnifs

It's due to nobody tell getNetworkRate() it's the router who want to get network
throttling rate, then the function failed to follow the policy.

status 9516: resolved fixed
---
 .../network/router/VirtualNetworkApplianceManagerImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 459f6dd9bcf..7a8143f081d 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1484,7 +1484,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
                 String vmGuestAddress = null;
 
                 // Get network rate - required for IpAssoc
-                Integer networkRate = _networkMgr.getNetworkRate(ipAddr.getNetworkId(), null);
+                Integer networkRate = _networkMgr.getNetworkRate(ipAddr.getNetworkId(), router.getId());
 
                 IpAddressTO ip = new IpAddressTO(ipAddr.getAddress().addr(), add, firstIP, sourceNat, vlanId, vlanGateway, vlanNetmask, vifMacAddress, vmGuestAddress, networkRate);
                 ipsToSend[i++] = ip;