etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the bug when networkRate for the domR's guest network wasn't taken from the service offering

This commit is contained in:
alena 2011-08-30 10:37:09 -07:00
parent c59d843cc5
commit 09f8d8ee4c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -3128,7 +3128,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
vm = _vmDao.findById(vmId);
}
Network network = getNetwork(networkId);
NetworkOffering networkOffering = _configMgr.getNetworkOffering(network.getNetworkOfferingId());
NetworkOffering ntwkOff = _configMgr.getNetworkOffering(network.getNetworkOfferingId());
// For default userVm Default network and domR guest/public network, get rate information from the service offering; for other situations get information
// from the network offering
@ -3137,14 +3137,14 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
if (vm != null) {
if (vm.getType() == Type.User && network.isDefault()) {
isUserVmsDefaultNetwork = true;
} else if (vm.getType() == Type.DomainRouter && networkOffering.getTrafficType() == TrafficType.Public && networkOffering.getGuestType() == null) {
} else if (vm.getType() == Type.DomainRouter && ((ntwkOff.getTrafficType() == TrafficType.Public && ntwkOff.getGuestType() == null) || (ntwkOff.getGuestType() != null && ntwkOff.getTrafficType() == TrafficType.Guest))) {
isDomRGuestOrPublicNetwork = true;
}
}
if (isUserVmsDefaultNetwork || isDomRGuestOrPublicNetwork) {
return _configMgr.getServiceOfferingNetworkRate(vm.getServiceOfferingId());
} else {
return _configMgr.getNetworkOfferingNetworkRate(networkOffering.getId());
return _configMgr.getNetworkOfferingNetworkRate(ntwkOff.getId());
}
}