Merge remote-tracking branch 'upstream/main' into resource-alerts

# Conflicts:
#	engine/schema/src/main/resources/META-INF/db/schema-42300to2400.sql

Author: Damans227

PendingReleaseNotes

@@ -55,25 +55,6 @@ example.ver.1 > example.ver.2:
     continue to snapshot live.
 
 4.23.0.0 > 24.0.0:
-  * VMware-to-KVM import using VDDK can import powered-off VMware VMs directly
-    into Ceph RBD primary storage when forceconverttopool is enabled and the
-    selected KVM conversion host supports qemu RBD access and in-place virt-v2v
-    finalization. Hosts without in-place finalization support can still use the
-    staged VDDK flow, converting to temporary qcow2 storage before copying the
-    finalized disks into RBD.
-
-  * Linstor primary storage can now be the destination for VMware-to-KVM
-    imports in all three modes. Staged imports (virt-v2v to a temporary NFS
-    location) copy the converted disks into pre-created DRBD block devices
-    through the Linstor storage adaptor; the import host must be a LINSTOR
-    satellite connected to the destination pool. Direct VDDK imports with
-    forceconverttopool write each powered-off VMware disk over nbdkit/VDDK
-    straight into the DRBD device and finalize it with virt-v2v in place.
-    VMware CBT warm migrations replicate the initial full copy and all
-    incremental changed-block cycles directly into Linstor volumes and
-    finalize in place at cutover; the conversion host requires VDDK,
-    in-place virt-v2v support and access to the Linstor pool.
-
   * KVM/Ceph: RBD volumes can now be encrypted at rest using native librbd
     LUKS2 (<encryption format='luks2' engine='librbd'>), for both data disks
     and root disks. Encryption is transparent to the guest and reuses the

agent/src/main/java/com/cloud/agent/properties/AgentProperties.java

@@ -848,19 +848,6 @@ public Property<Integer> getWorkers() {
      */
     public static final Property<String> VDDK_TRANSPORTS = new Property<>("vddk.transports", null, String.class);
 
-    /**
-     * NBD-transport compression used between the VDDK and the VMware server for the
-     * agent-driven nbdkit full-disk copies (cold direct import and CBT initial full
-     * sync). Passed to the nbdkit vddk plugin as <code>compression=&lt;value&gt;</code>.
-     * Valid values: <code>none</code>, <code>zlib</code>, <code>fastlz</code>,
-     * <code>skipz</code> (nbdkit &ge; 1.24, vSphere &ge; 6.5). <code>fastlz</code>
-     * compresses both zero regions and real data at low CPU cost; <code>skipz</code>
-     * only elides zero blocks. Does not affect the staged virt-v2v conversion path.
-     * Data type: String.<br>
-     * Default value: <code>fastlz</code>
-     */
-    public static final Property<String> VDDK_NBD_COMPRESSION = new Property<>("vddk.nbd.compression", "fastlz", String.class);
-
     /**
      * vCenter TLS certificate thumbprint used by virt-v2v VDDK mode, passed as <code>-io vddk-thumbprint=&lt;value&gt;</code>.
      * If unset, the KVM host computes it at runtime from the vCenter endpoint.

api/src/main/java/com/cloud/agent/api/to/RemoteInstanceTO.java

@@ -38,7 +38,6 @@ public class RemoteInstanceTO implements Serializable {
     private String datacenterName;
     private String clusterName;
     private String hostName;
-    private String vmwareMoref;
 
     public RemoteInstanceTO() {
     }
@@ -66,11 +65,6 @@ public RemoteInstanceTO(String instanceName, String instancePath, String vcenter
         this.hostName = hostName;
     }
 
-    public RemoteInstanceTO(String instanceName, String instancePath, String vcenterHost, String vcenterUsername, String vcenterPassword, String datacenterName, String clusterName, String hostName, String vmwareMoref) {
-        this(instanceName, instancePath, vcenterHost, vcenterUsername, vcenterPassword, datacenterName, clusterName, hostName);
-        this.vmwareMoref = vmwareMoref;
-    }
-
     public Hypervisor.HypervisorType getHypervisorType() {
         return this.hypervisorType;
     }
@@ -106,12 +100,4 @@ public String getClusterName() {
     public String getHostName() {
         return hostName;
     }
-
-    public String getVmwareMoref() {
-        return vmwareMoref;
-    }
-
-    public void setVmwareMoref(String vmwareMoref) {
-        this.vmwareMoref = vmwareMoref;
-    }
 }

api/src/main/java/com/cloud/agent/api/to/VmwareCbtChangedBlockRangeTO.java

@@ -127,9 +127,6 @@ public class EventTypes {
     public static final String EVENT_VM_RESTORE = "VM.RESTORE";
     public static final String EVENT_VM_EXPUNGE = "VM.EXPUNGE";
     public static final String EVENT_VM_IMPORT = "VM.IMPORT";
-    public static final String EVENT_VMWARE_CBT_MIGRATION_START = "VMWARE.CBT.MIGRATION.START";
-    public static final String EVENT_VMWARE_CBT_MIGRATION_SYNC = "VMWARE.CBT.MIGRATION.SYNC";
-    public static final String EVENT_VMWARE_CBT_MIGRATION_CUTOVER = "VMWARE.CBT.MIGRATION.CUTOVER";
     public static final String EVENT_VM_UNMANAGE = "VM.UNMANAGE";
     public static final String EVENT_VM_RECOVER = "VM.RECOVER";
 

api/src/main/java/com/cloud/agent/api/to/VmwareCbtDiskSyncResultTO.java

@@ -62,18 +62,8 @@ public static String[] toStrings(Host.Type... types) {
     String HOST_VDDK_SUPPORT = "host.vddk.support";
     String HOST_VDDK_LIB_DIR = "vddk.lib.dir";
     String HOST_VDDK_VERSION = "host.vddk.version";
-    String HOST_VDDK_BLOCKCOPY_SUPPORT = "host.vddk.blockcopy.support";
-    String HOST_VDDK_BLOCKCOPY_INPLACE_FINALIZATION_SUPPORT = "host.vddk.blockcopy.inplace.finalization.support";
-    String HOST_VDDK_BLOCKCOPY_RBD_SUPPORT = "host.vddk.blockcopy.rbd.support";
-    String HOST_QEMU_IMG_VERSION = "host.qemu.img.version";
-    String HOST_QEMU_NBD_VERSION = "host.qemu.nbd.version";
-    String HOST_QEMU_IO_VERSION = "host.qemu.io.version";
     String HOST_OVFTOOL_VERSION = "host.ovftool.version";
     String HOST_VIRTV2V_VERSION = "host.virtv2v.version";
-    String HOST_VIRTV2V_INPLACE_VERSION = "host.virtv2v.inplace.version";
-    String HOST_VDDK_RBD_DIRECT_IMPORT_SUPPORT = "host.vddk.rbd.direct.import.support";
-    String HOST_VIRTV2V_INPLACE_SUPPORT = "host.virtv2v.inplace.support";
-    String HOST_QEMU_RBD_SUPPORT = "host.qemu.rbd.support";
     String HOST_SSH_PORT = "host.ssh.port";
     String HOST_CDROM_MAX_COUNT = "host.cdrom.max.count";
     String GUEST_OS_CATEGORY_ID = "guest.os.category.id";