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

bug 9871: deployVm - check network's zone when do vm deployment 

status 9871: resolved fixed

Conflicts:

	server/src/com/cloud/vm/UserVmManagerImpl.java
This commit is contained in:
alena 2011-07-19 11:06:13 -07:00
parent 3468d1b7ea
commit 8c9fe2ec71
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,6 @@ import com.cloud.configuration.ResourceCount.ResourceType;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.configuration.dao.ResourceLimitDao;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.HostPodVO;
import com.cloud.dc.dao.AccountVlanMapDao;
@ -2442,8 +2441,6 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
sshPublicKey = pair.getPublicKey();
}
// _accountMgr.checkAccess(caller, template);
DataCenterDeployment plan = new DataCenterDeployment(zone.getId());
@ -2456,7 +2453,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
if (network.getDataCenterId() != zone.getId()) {
throw new InvalidParameterValueException("Network id=" + network.getId() + " doesn't belong to zone " + zone.getId());
}
NicProfile profile = null;
//Add requested ips
@ -2464,6 +2461,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
profile = new NicProfile(requestedIps.get(network.getId()));
}
if (network.isDefault()) {
defaultNetworkNumber++;
// if user requested specific ip for default network, add it
@ -2514,6 +2512,8 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
if (isIso) {
vm.setIsoId(template.getId());
}
s_logger.debug("Allocating in the DB for vm");
if (_itMgr.allocate(vm, _templateDao.findById(template.getId()), offering, rootDiskOffering, dataDiskOfferings, networks, null, plan, hypervisorType, owner) == null) {
return null;