You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/11/08 09:01:14 UTC
[3/4] git commit: updated refs/heads/master to 57ba367
remove network limitation of nics on systemvms (cherry picked from commit 0227e0013ad90bb66a29e0852d9a114951b8f6fc)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/edf04a33
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/edf04a33
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/edf04a33
Branch: refs/heads/master
Commit: edf04a33c1a3b04869130b30ec0216ae658777fb
Parents: 958312d
Author: Wei Zhou <w....@leaseweb.com>
Authored: Thu Nov 7 11:07:48 2013 +0100
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Fri Nov 8 09:00:24 2013 +0100
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkModelImpl.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/edf04a33/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 df9f651..c8733b0 100755
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -941,16 +941,21 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
// from the network offering
boolean isUserVmsDefaultNetwork = false;
boolean isDomRGuestOrPublicNetwork = false;
+ boolean isSystemVmNetwork = false;
if (vm != null) {
Nic nic = _nicDao.findByNtwkIdAndInstanceId(networkId, vmId);
if (vm.getType() == Type.User && nic != null && nic.isDefaultNic()) {
isUserVmsDefaultNetwork = true;
} else if (vm.getType() == Type.DomainRouter && ntwkOff != null && (ntwkOff.getTrafficType() == TrafficType.Public || ntwkOff.getTrafficType() == TrafficType.Guest)) {
isDomRGuestOrPublicNetwork = true;
+ } else if (vm.getType() == Type.ConsoleProxy || vm.getType() == Type.SecondaryStorageVm) {
+ isSystemVmNetwork = true;
}
}
if (isUserVmsDefaultNetwork || isDomRGuestOrPublicNetwork) {
return _configMgr.getServiceOfferingNetworkRate(vm.getServiceOfferingId(), network.getDataCenterId());
+ } else if (isSystemVmNetwork) {
+ return -1;
} else {
return _configMgr.getNetworkOfferingNetworkRate(ntwkOff.getId(), network.getDataCenterId());
}