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

CLOUDSTACK-4931, CLOUDSTACK-4937: setDetails to user VMs only 

(cherry picked from commit a94acc5a43)
This commit is contained in:
Wei Zhou 2013-10-23 16:55:10 +02:00
parent 294b0c7277
commit 69b131fa15
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -887,10 +887,12 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
if ( answer != null ) {
String hypervisortoolsversion = answer.getHypervisorToolsVersion();
if (hypervisortoolsversion != null) {
UserVmVO userVm = _userVmDao.findById(vm.getId());
_userVmDao.loadDetails(userVm);
userVm.setDetail("hypervisortoolsversion", hypervisortoolsversion);
_userVmDao.saveDetails(userVm);
if (vm.getType() == VirtualMachine.Type.User) {
UserVmVO userVm = _userVmDao.findById(vm.getId());
_userVmDao.loadDetails(userVm);
userVm.setDetail("hypervisortoolsversion", hypervisortoolsversion);
_userVmDao.saveDetails(userVm);
}
}
}
@ -1003,10 +1005,12 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
if ( answer != null ) {
String hypervisortoolsversion = answer.getHypervisorToolsVersion();
if (hypervisortoolsversion != null) {
UserVmVO userVm = _userVmDao.findById(vm.getId());
_userVmDao.loadDetails(userVm);
userVm.setDetail("hypervisortoolsversion", hypervisortoolsversion);
_userVmDao.saveDetails(userVm);
if (vm.getType() == VirtualMachine.Type.User) {
UserVmVO userVm = _userVmDao.findById(vm.getId());
_userVmDao.loadDetails(userVm);
userVm.setDetail("hypervisortoolsversion", hypervisortoolsversion);
_userVmDao.saveDetails(userVm);
}
}
}
if (!answer.getResult()) {
@ -1208,10 +1212,12 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
if ( answer != null ) {
String hypervisortoolsversion = answer.getHypervisorToolsVersion();
if (hypervisortoolsversion != null) {
UserVmVO userVm = _userVmDao.findById(vm.getId());
_userVmDao.loadDetails(userVm);
userVm.setDetail("hypervisortoolsversion", hypervisortoolsversion);
_userVmDao.saveDetails(userVm);
if (vm.getType() == VirtualMachine.Type.User) {
UserVmVO userVm = _userVmDao.findById(vm.getId());
_userVmDao.loadDetails(userVm);
userVm.setDetail("hypervisortoolsversion", hypervisortoolsversion);
_userVmDao.saveDetails(userVm);
}
}
}
stopped = answer.getResult();
@ -2296,11 +2302,12 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
}
// track hypervsion tools version
if( info.hvtoolsversion != null && !info.hvtoolsversion.isEmpty() ) {
UserVmVO userVm = _userVmDao.findById(vm.getId());
_userVmDao.loadDetails(userVm);
userVm.setDetail("hypervisortoolsversion", info.hvtoolsversion);
_userVmDao.saveDetails(userVm);
if (vm.getType() == VirtualMachine.Type.User) {
UserVmVO userVm = _userVmDao.findById(vm.getId());
_userVmDao.loadDetails(userVm);
userVm.setDetail("hypervisortoolsversion", info.hvtoolsversion);
_userVmDao.saveDetails(userVm);
}
}
if (trackExternalChange) {