You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/05/03 21:51:57 UTC
[39/50] git commit: updated refs/heads/internallb to 1cff609
CLOUDSTACK-741: Granular Global Parameters fixing network.throttling.rate to work per zone in vmware
Signed-off-by: Abhinandan Prateek <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4a40f3f6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4a40f3f6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4a40f3f6
Branch: refs/heads/internallb
Commit: 4a40f3f6dade062c7996611d4b8918d3fbd59d73
Parents: 8832a52
Author: Harikrishna Patnala <ha...@citrix.com>
Authored: Thu May 2 15:42:53 2013 +0530
Committer: Abhinandan Prateek <ap...@apache.org>
Committed: Fri May 3 10:52:04 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkModelImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4a40f3f6/server/src/com/cloud/network/NetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
index 7b712ea..fdf722c 100755
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -924,9 +924,9 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
}
}
if (isUserVmsDefaultNetwork || isDomRGuestOrPublicNetwork) {
- return _configMgr.getServiceOfferingNetworkRate(vm.getServiceOfferingId(), vm.getDataCenterId());
+ return _configMgr.getServiceOfferingNetworkRate(vm.getServiceOfferingId(), network.getDataCenterId());
} else {
- return _configMgr.getNetworkOfferingNetworkRate(ntwkOff.getId(), vm.getDataCenterId());
+ return _configMgr.getNetworkOfferingNetworkRate(ntwkOff.getId(), network.getDataCenterId());
}
}