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

Summary: Changes required for network refactor branch 

Reported-by: Brian Angus <blangus@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358554509 -0700
This commit is contained in:
Marcus Sorensen 2013-01-18 17:15:09 -07:00
parent 42e4961da2
commit 68b236cd2d
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/com/cloud/network/NetworkModelImpl.java
View File

@ -1692,6 +1692,9 @@ public class NetworkModelImpl implements NetworkModel, Manager{
} else {
nic = _nicDao.findByInstanceIdAndNetworkId(networkId, vm.getId());
}
if (nic == null) {
return null;
}
NetworkVO network = _networksDao.findById(networkId);
Integer networkRate = getNetworkRate(network.getId(), vm.getId());
@ -1836,4 +1839,4 @@ public class NetworkModelImpl implements NetworkModel, Manager{
return offering.isInline();
}
}
}

12
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -962,7 +962,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
//todo: verify unique hostname in network domain?
//verify that there isn't a NIC attached to network
if(_networkMgr.getNicInNetwork(vmInstance.getId(),network.getId()) != null){
if(_networkModel.getNicInNetwork(vmInstance.getId(),network.getId()) != null){
throw new CloudRuntimeException("Unable to add NIC to " + vmInstance + " because it already has a NIC attached to " + network);
}
@ -1071,7 +1071,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
}
// no need to check permissions for network, we'll enumerate the ones they already have access to
Network existingdefaultnet = _networkMgr.getDefaultNetworkForVm(vmId);
Network existingdefaultnet = _networkModel.getDefaultNetworkForVm(vmId);
// if current default equals chosen new default, return and do nothing
if (existingdefaultnet == network){
@ -1082,8 +1082,8 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
s_logger.debug("looks like we want to change from " + existingdefaultnet + " to " + network);
}
NicProfile chosen = _networkMgr.getNicProfile(vmInstance, network.getId(), null);
NicProfile existing = _networkMgr.getNicProfile(vmInstance, existingdefaultnet.getId(), null);
NicProfile chosen = _networkModel.getNicProfile(vmInstance, network.getId(), null);
NicProfile existing = _networkModel.getNicProfile(vmInstance, existingdefaultnet.getId(), null);
// if we can't find the chosen nic, fail!
if (chosen == null){
@ -1114,7 +1114,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
existingVO = _nicDao.persist(existingVO);
Network newdefault = null;
newdefault = _networkMgr.getDefaultNetworkForVm(vmId);
newdefault = _networkModel.getDefaultNetworkForVm(vmId);
if (newdefault == null){
chosenVO.setDefaultNic(false);
@ -1125,7 +1125,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
chosenVO = _nicDao.persist(chosenVO);
existingVO = _nicDao.persist(existingVO);
newdefault = _networkMgr.getDefaultNetworkForVm(vmId);
newdefault = _networkModel.getDefaultNetworkForVm(vmId);
if (newdefault.getId() == existingdefaultnet.getId()) {
throw new CloudRuntimeException("Setting a default nic failed, and we had no default nic, but we were able to set it back to the original");
}