Merge branch 'zsv-ldap-8@@2' into 'feature-zsv-5.0.0-vm-support-vtpm-and-secuceboot'

<feature>[kvm]: refactor VmHostFileTO to support different operations

See merge request zstackio/zstack!9453

Author: gitlab

header/src/main/java/org/zstack/header/vm/additions/VmHostFileOperation.java

@@ -0,0 +1,7 @@
+package org.zstack.header.vm.additions;
+
+public enum VmHostFileOperation {
+    Write,
+    Prepare,
+    Delete,
+}

plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java

@@ -11,7 +11,6 @@
 import org.zstack.header.host.VmNicRedirectConfig;
 import org.zstack.header.log.NoLogging;
 import org.zstack.header.vm.*;
-import org.zstack.header.vm.additions.VmHostFileContentFormat;
 import org.zstack.header.vm.devices.DeviceAddress;
 import org.zstack.header.vm.devices.VirtualDeviceInfo;
 import org.zstack.kvm.tpm.TpmTO;
@@ -2824,22 +2823,25 @@ public static class StartVmResponse extends VmDevicesInfoResponse {
     }
 
     public static class VmHostFileTO {
-        public static final String FORMAT_PREPARE_ONLY = "PrepareOnly";
-
         private String path;
         /**
          * maybe "NvRam" or "TpmState" ...
          * @see org.zstack.header.vm.additions.VmHostFileType
          */
         private String type;
         /**
-         * maybe "Simple" or "TarballGzip"
-         * if prepare only, use {@link #FORMAT_PREPARE_ONLY}
-         * @see VmHostFileContentFormat
+         * file format: Raw or TarballGzip
+         * @see org.zstack.header.vm.additions.VmHostFileContentFormat
          */
         private String fileFormat;
         /**
-         * null if fileFormat is {@link #FORMAT_PREPARE_ONLY}
+         * operation: Write, Prepare, or Delete
+         * only use in WriteVmHostFileContentCmd
+         * @see org.zstack.header.vm.additions.VmHostFileOperation
+         */
+        private String operation;
+        /**
+         * null if operation is Prepare or Delete
          */
         @NoLogging
         private String contentBase64;
@@ -2869,6 +2871,14 @@ public void setFileFormat(String fileFormat) {
             this.fileFormat = fileFormat;
         }
 
+        public String getOperation() {
+            return operation;
+        }
+
+        public void setOperation(String operation) {
+            this.operation = operation;
+        }
+
         public String getContentBase64() {
             return contentBase64;
         }

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

@@ -42,6 +42,7 @@
 import org.zstack.header.vm.additions.VmHostBackupFileVO_;
 import org.zstack.header.vm.additions.VmHostFileContentVO;
 import org.zstack.header.vm.additions.VmHostFileContentVO_;
+import org.zstack.header.vm.additions.VmHostFileOperation;
 import org.zstack.header.vm.additions.VmHostFileType;
 import org.zstack.header.vm.additions.VmHostFileVO;
 import org.zstack.header.vm.additions.VmHostFileVO_;
@@ -200,7 +201,7 @@ public void preVmMigration(VmInstanceInventory vm, VmMigrationType type, String
                     VmHostFileTO to = new VmHostFileTO();
                     to.setPath(buildNvramFilePath(vm.getUuid()));
                     to.setType(VmHostFileType.NvRam.toString());
-                    to.setFileFormat(VmHostFileTO.FORMAT_PREPARE_ONLY);
+                    to.setOperation(VmHostFileOperation.Prepare.toString());
 
                     RewriteVmHostFilesContext context = new RewriteVmHostFilesContext();
                     context.hostUuid = dstHostUuid;
@@ -470,6 +471,7 @@ public void run(FlowTrigger trigger, Map data) {
                 to.setPath(context.path);
                 to.setType(context.type.toString());
                 to.setFileFormat(content.getFormat().toString());
+                to.setOperation(VmHostFileOperation.Write.toString());
 
                 String contentBase64 = Base64.getEncoder().encodeToString(content.getContent());
                 to.setContentBase64(contentBase64);