From edda8e8032e986d51d03a50819d6ba17bf64b606 Mon Sep 17 00:00:00 2001
From: prachi <prachi@cloud.com>
Date: Tue, 12 Apr 2011 17:59:12 -0700
Subject: [PATCH] More changes for Bug 9387:

- Update system vm_instance's template_id if it does not match the system vm template.
- Use _templateDao.findSystemVMTemplate to find the latest system vm template.
---
 core/src/com/cloud/vm/VMInstanceVO.java       |  2 +-
 .../cloud/vm/VirtualMachineManagerImpl.java   | 33 +++++++++++++++----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/core/src/com/cloud/vm/VMInstanceVO.java b/core/src/com/cloud/vm/VMInstanceVO.java
index b45e944f484..31fe898b9d1 100644
--- a/core/src/com/cloud/vm/VMInstanceVO.java
+++ b/core/src/com/cloud/vm/VMInstanceVO.java
@@ -80,7 +80,7 @@ public class VMInstanceVO implements VirtualMachine, FiniteStateObject<State, Vi
     @Column(name="instance_name", updatable=true, nullable=false)
     protected String instanceName;
 
-    @Column(name="vm_template_id", updatable=false, nullable=true, length=17)
+    @Column(name="vm_template_id", updatable=true, nullable=true, length=17)
 	protected Long templateId = new Long(-1);
 
     @Column(name="guest_os_id", nullable=false, length=17)
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index b8c7bccd667..580cc046ee5 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -555,6 +555,22 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
         T startedVm = null;
         ServiceOfferingVO offering = _offeringDao.findById(vm.getServiceOfferingId());
         VMTemplateVO template = _templateDao.findById(vm.getTemplateId());
+        //if System VM template has been changed, update vm templateId if this is a System VM
+        if(VirtualMachine.Type.DomainRouter.equals(vm.getType())
+    			|| VirtualMachine.Type.ConsoleProxy.equals(vm.getType())
+    			|| VirtualMachine.Type.SecondaryStorageVm.equals(vm.getType())){
+        	VMTemplateVO systemVMTemplate = _templateDao.findSystemVMTemplate(vm.getDataCenterId(), vm.getHypervisorType());
+        	if(template != null && systemVMTemplate != null){
+    			if(template.getId() != systemVMTemplate.getId()){
+                    if (s_logger.isDebugEnabled()) {
+                        s_logger.debug("System VM's templateId does not match the current System VM Template, updating templateId of the VM: "+ vm);
+                    }
+                    vm.setTemplateId(systemVMTemplate.getId());
+                    _vmDao.update(vm.getId(), vm);
+    			}
+        	}
+        }
+        
         Long clusterSpecified = null;
         if(hostIdSpecified != null){
         	Host destinationHost = _hostDao.findById(hostIdSpecified);
@@ -583,13 +599,16 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
                     			|| VirtualMachine.Type.SecondaryStorageVm.equals(vm.getType())){
 
                     		Long volTemplateId = vol.getTemplateId();
-                    		if(volTemplateId != null && volTemplateId.longValue() != vm.getTemplateId()){
-                                if (s_logger.isDebugEnabled()) {
-                                    s_logger.debug("Root Volume " + vol + " of "+vm.getType().toString() +" System VM is ready, but volume's templateId does not match the VM, updating templateId and reassigning a new pool");
-                                }
-                    			vol.setTemplateId(vm.getTemplateId());
-                    			_volsDao.update(vol.getId(), vol);
-                    			continue;
+                    		VMTemplateVO systemVMTemplate = _templateDao.findSystemVMTemplate(vm.getDataCenterId(), vm.getHypervisorType());
+                    		if(volTemplateId != null && systemVMTemplate != null){
+                    			if(volTemplateId.longValue() != systemVMTemplate.getId()){
+	                                if (s_logger.isDebugEnabled()) {
+	                                    s_logger.debug("Root Volume " + vol + " of "+vm.getType().toString() +" System VM is ready, but volume's templateId does not match the System VM Template, updating templateId and reassigning a new pool");
+	                                }
+	                    			vol.setTemplateId(systemVMTemplate.getId());
+	                    			_volsDao.update(vol.getId(), vol);
+	                    			continue;
+	                    		}
                     		}
 
                     	}