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

ustcweizhou · ustcweizhou · commit 69b131fa1501 · 2013-10-23T17:04:02.000+02:00
(cherry picked from commit a94acc5)
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -887,10 +887,12 @@ public void advanceStart(String vmUuid, Map<VirtualMachineProfile.Param, Object>
                            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 @@ protected boolean sendStop(VirtualMachineGuru guru, VirtualMachineProfile profil
             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 @@ private void advanceStop(VMInstanceVO vm, boolean cleanUpEvenIfUnableToStop) thr
             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 @@ protected Command compareState(long hostId, VMInstanceVO vm, final AgentVmInfo i
         }
         // 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) {
