From a94acc5a43aeaf5f18f1912e2653a92f6041a6e5 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 23 Oct 2013 16:55:10 +0200 Subject: [PATCH] CLOUDSTACK-4931, CLOUDSTACK-4937: setDetails to user VMs only --- .../cloud/vm/VirtualMachineManagerImpl.java | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java index 1cb2f91198a..08eda787ad8 100755 --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -949,10 +949,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); + } } } @@ -1064,10 +1066,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()) { @@ -1261,10 +1265,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(); @@ -2468,9 +2474,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } // track hypervsion tools version if( info.hvtoolsversion != null && !info.hvtoolsversion.isEmpty() ) { - - UserVmVO userVm = _userVmDao.findById(vm.getId()); - if (userVm != null) { + if (vm.getType() == VirtualMachine.Type.User) { + UserVmVO userVm = _userVmDao.findById(vm.getId()); _userVmDao.loadDetails(userVm); userVm.setDetail("hypervisortoolsversion", info.hvtoolsversion); _userVmDao.saveDetails(userVm);