Merge branch 'zsv-ldap-9' into 'feature-zsv-5.0.0-vm-support-vtpm-and-secuceboot'

<feature>[kvm]: reset TPM state after VM reimage

See merge request zstackio/zstack!9445

Author: gitlab

conf/springConfigXml/Kvm.xml

@@ -272,6 +272,7 @@
             <zstack:extension interface="org.zstack.header.vm.PreVmInstantiateResourceExtensionPoint" />
             <zstack:extension interface="org.zstack.header.vm.VmInstanceDestroyExtensionPoint" />
             <zstack:extension interface="org.zstack.header.vm.VmPreMigrationExtensionPoint" />
+            <zstack:extension interface="org.zstack.header.vm.AfterReimageVmInstanceExtensionPoint" />
         </zstack:plugin>
     </bean>
 </beans>

plugin/kvm/src/main/java/org/zstack/kvm/efi/KvmSecureBootExtensions.java

@@ -30,6 +30,7 @@
 import org.zstack.header.vm.DiskAO;
 import org.zstack.header.vm.PreVmInstantiateResourceExtensionPoint;
 import org.zstack.header.vm.VmInstanceConstant;
+import org.zstack.header.vm.AfterReimageVmInstanceExtensionPoint;
 import org.zstack.header.vm.VmInstanceDestroyExtensionPoint;
 import org.zstack.header.vm.VmInstanceInventory;
 import org.zstack.header.vm.VmInstanceSpec;
@@ -85,7 +86,8 @@
 public class KvmSecureBootExtensions implements KVMStartVmExtensionPoint,
         PreVmInstantiateResourceExtensionPoint,
         VmInstanceDestroyExtensionPoint,
-        VmPreMigrationExtensionPoint {
+        VmPreMigrationExtensionPoint,
+        AfterReimageVmInstanceExtensionPoint {
     private static final CLogger logger = Utils.getLogger(KvmSecureBootExtensions.class);
 
     @Autowired
@@ -711,4 +713,22 @@ public void afterDestroyVm(VmInstanceInventory inv) {
     public void failedToDestroyVm(VmInstanceInventory inv, ErrorCode reason) {
         // do-nothing
     }
+
+    @Override
+    public void afterReimageVmInstance(VolumeInventory inventory) {
+        String vmUuid = inventory.getVmInstanceUuid();
+        if (vmUuid == null) {
+            return;
+        }
+
+        SQL.New(VmHostFileVO.class)
+                .eq(VmHostFileVO_.vmInstanceUuid, vmUuid)
+                .delete();
+        SQL.New(VmHostBackupFileVO.class)
+                .eq(VmHostBackupFileVO_.resourceUuid, vmUuid)
+                .delete();
+
+        logger.debug(String.format("reset TPM state for VM[uuid:%s] after reimage: " +
+                "deleted all VmHostFileVO and VmHostBackupFileVO records", vmUuid));
+    }
 }

test/src/test/resources/springConfigXml/Kvm.xml

@@ -271,6 +271,7 @@
             <zstack:extension interface="org.zstack.header.vm.PreVmInstantiateResourceExtensionPoint" />
             <zstack:extension interface="org.zstack.header.vm.VmInstanceDestroyExtensionPoint" />
             <zstack:extension interface="org.zstack.header.vm.VmPreMigrationExtensionPoint" />
+            <zstack:extension interface="org.zstack.header.vm.AfterReimageVmInstanceExtensionPoint" />
         </zstack:plugin>
     </bean>
 </beans>