VMware: add support for 8.0b (8.0.0.2), 8.0c (8.0.0.3)

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41800to41810.java

@@ -16,12 +16,17 @@
 // under the License.
 package com.cloud.upgrade.dao;
 
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.storage.GuestOSHypervisorMapping;
+import com.cloud.upgrade.GuestOsMapper;
 import com.cloud.upgrade.SystemVmTemplateRegistration;
 import com.cloud.utils.exception.CloudRuntimeException;
 import org.apache.log4j.Logger;
 
 import java.io.InputStream;
 import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.List;
 
 public class Upgrade41800to41810 implements DbUpgrade, DbUpgradeSystemVmTemplate {
     final static Logger LOG = Logger.getLogger(Upgrade41800to41810.class);
@@ -55,6 +60,7 @@ public InputStream[] getPrepareScripts() {
 
     @Override
     public void performDataMigration(Connection conn) {
+        updateGuestOsMappings();
     }
 
     @Override
@@ -82,4 +88,84 @@ public void updateSystemVmTemplates(Connection conn) {
             throw new CloudRuntimeException("Failed to find / register SystemVM template(s)");
         }
     }
+
+    private void updateGuestOsMappings() {
+        LOG.debug("Updating guest OS mappings");
+
+        GuestOsMapper guestOsMapper = new GuestOsMapper();
+        List<GuestOSHypervisorMapping> mappings = new ArrayList<>();
+
+        final String hypervisorVMware = Hypervisor.HypervisorType.VMware.name();
+        final String hypervisorVersionVmware8 = "8.0";
+
+        // Add support for almalinux_64Guest from VMware 8.0
+        mappings.add(new GuestOSHypervisorMapping(hypervisorVMware, hypervisorVersionVmware8, "almalinux_64Guest"));
+        guestOsMapper.addGuestOsAndHypervisorMappings(1, "AlmaLinux (64-bit)", mappings);
+        mappings.clear();
+
+        // Add support for darwin22_64Guest from VMware 8.0
+        mappings.add(new GuestOSHypervisorMapping(hypervisorVMware, hypervisorVersionVmware8, "darwin22_64Guest"));
+        guestOsMapper.addGuestOsAndHypervisorMappings(7, "macOS 13 (64-bit)", mappings);
+        mappings.clear();
+
+        // Add support for darwin23_64Guest from VMware 8.0
+        mappings.add(new GuestOSHypervisorMapping(hypervisorVMware, hypervisorVersionVmware8, "darwin23_64Guest"));
+        guestOsMapper.addGuestOsAndHypervisorMappings(7, "macOS 14 (64-bit)", mappings);
+        mappings.clear();
+
+        // Add support for debian12_64Guest from VMware 8.0
+        mappings.add(new GuestOSHypervisorMapping(hypervisorVMware, hypervisorVersionVmware8, "debian12_64Guest"));
+        guestOsMapper.addGuestOsAndHypervisorMappings(2, "Debian GNU/Linux 12 (64-bit)", mappings);
+        mappings.clear();
+
+        // Add support for debian12Guest from VMware 8.0
+        mappings.add(new GuestOSHypervisorMapping(hypervisorVMware, hypervisorVersionVmware8, "debian12Guest"));
+        guestOsMapper.addGuestOsAndHypervisorMappings(2, "Debian GNU/Linux 12 (32-bit)", mappings);
+        mappings.clear();
+
+        // Add support for freebsd14_64Guest from VMware 8.0
+        mappings.add(new GuestOSHypervisorMapping(hypervisorVMware, hypervisorVersionVmware8, "freebsd14_64Guest"));
+        guestOsMapper.addGuestOsAndHypervisorMappings(9, "FreeBSD 14 (64-bit)", mappings);
+        mappings.clear();
+
+        // Add support for freebsd14Guest from VMware 8.0
+        mappings.add(new GuestOSHypervisorMapping(hypervisorVMware, hypervisorVersionVmware8, "freebsd14Guest"));
+        guestOsMapper.addGuestOsAndHypervisorMappings(9, "FreeBSD 14 (32-bit)", mappings);
+        mappings.clear();
+
+        // Add support for other6xLinux64Guest from VMware 8.0
+        mappings.add(new GuestOSHypervisorMapping(hypervisorVMware, hypervisorVersionVmware8, "other6xLinux64Guest"));
+        guestOsMapper.addGuestOsAndHypervisorMappings(7, "Linux 6.x Kernel (64-bit)", mappings);
+        mappings.clear();
+
+        // Add support for other6xLinuxGuest from VMware 8.0
+        mappings.add(new GuestOSHypervisorMapping(hypervisorVMware, hypervisorVersionVmware8, "other6xLinuxGuest"));
+        guestOsMapper.addGuestOsAndHypervisorMappings(7, "Linux 6.x Kernel (32-bit)", mappings);
+        mappings.clear();
+
+        // Add support for rockylinux_64Guest from VMware 8.0
+        mappings.add(new GuestOSHypervisorMapping(hypervisorVMware, hypervisorVersionVmware8, "rockylinux_64Guest"));
+        guestOsMapper.addGuestOsAndHypervisorMappings(1, "Rocky Linux (64-bit)", mappings);
+        mappings.clear();
+
+        // Add support for vmkernel8Guest from VMware 8.0
+        mappings.add(new GuestOSHypervisorMapping(hypervisorVMware, hypervisorVersionVmware8, "vmkernel8Guest"));
+        guestOsMapper.addGuestOsAndHypervisorMappings(7, "VMware ESXi 8.0", mappings);
+        mappings.clear();
+
+        // Add support for windows11_64Guest from VMware 8.0
+        mappings.add(new GuestOSHypervisorMapping(hypervisorVMware, hypervisorVersionVmware8, "windows11_64Guest"));
+        guestOsMapper.addGuestOsAndHypervisorMappings(6, "Windows 11 (64-bit)", mappings);
+        mappings.clear();
+
+        // Add support for windows12_64Guest from VMware 8.0
+        mappings.add(new GuestOSHypervisorMapping(hypervisorVMware, hypervisorVersionVmware8, "windows12_64Guest"));
+        guestOsMapper.addGuestOsAndHypervisorMappings(6, "Windows 12 (64-bit)", mappings);
+        mappings.clear();
+
+        // Add support for windows2022srvNext_64Guest from VMware 8.0
+        mappings.add(new GuestOSHypervisorMapping(hypervisorVMware, hypervisorVersionVmware8, "windows2022srvNext_64Guest"));
+        guestOsMapper.addGuestOsAndHypervisorMappings(6, "Windows Server 2025 (64-bit)", mappings);
+        mappings.clear();
+    }
 }

engine/schema/src/main/resources/META-INF/db/schema-41800to41810.sql

@@ -19,3 +19,6 @@
 -- Schema upgrade from 4.18.0.0 to 4.18.1.0
 --;
 
+-- Add support for VMware 8.0b (8.0.0.2)
+INSERT IGNORE INTO `cloud`.`hypervisor_capabilities` (uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, max_hosts_per_cluster, storage_motion_supported, vm_snapshot_enabled) values (UUID(), 'VMware', '8.0.0.2', 1024, 0, 59, 64, 1, 1);
+

plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VmwareVmImplementer.java

@@ -47,6 +47,7 @@
 import com.cloud.vm.dao.NicDao;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.image.deployasis.DeployAsIsHelper;
+import org.apache.cloudstack.utils.CloudStackVersion;
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.log4j.Logger;
 
@@ -166,6 +167,13 @@ VirtualMachineTO implement(VirtualMachineProfile vm, VirtualMachineTO to, long c
         GuestOSHypervisorVO guestOsMapping = null;
         if (host != null) {
             guestOsMapping = guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(), Hypervisor.HypervisorType.VMware.toString(), host.getHypervisorVersion());
+            if (guestOsMapping == null) {
+                LOGGER.debug(String.format("Cannot find guest os mappings for guest os \"%s\" on VMware %s", guestOS.getDisplayName(), host.getHypervisorVersion()));
+                String parentVersion = getParentVersion(host.getHypervisorVersion());
+                if (parentVersion != null) {
+                    guestOsMapping = guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(), Hypervisor.HypervisorType.VMware.toString(), parentVersion);
+                }
+            }
         }
         if (guestOsMapping == null || host == null) {
             to.setPlatformEmulator(null);
@@ -182,6 +190,23 @@ VirtualMachineTO implement(VirtualMachineProfile vm, VirtualMachineTO to, long c
         return to;
     }
 
+    /**
+     * Get the parent version of VMware hypervisor version
+     */
+    String getParentVersion(String hypervisorVersion) {
+        try {
+            CloudStackVersion version = CloudStackVersion.parse(hypervisorVersion);
+            String parentVersion = String.format("%s.%s", version.getMajorRelease(), version.getMinorRelease());
+            if (version.getPatchRelease() != 0) {
+                parentVersion = String.format("%s.%s", parentVersion, version.getPatchRelease());
+            }
+            return parentVersion;
+        } catch (Exception ex) {
+            LOGGER.debug("Failed to get guest os mappings from the parent version: " + ex.getMessage());
+        }
+        return null;
+    }
+
     /**
      * Set the information relevant for deploy-as-is VMs on the VM TO
      */

plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/guru/VmwareVmImplementerTest.java

@@ -23,7 +23,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.cloudstack.framework.config.ConfigKey;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -32,17 +32,12 @@
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.mockito.Spy;
-import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 import com.cloud.agent.api.to.VirtualMachineTO;
 import com.cloud.vm.VmDetailConstants;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({ConfigKey.class, VmwareVmImplementer.class})
-@ContextConfiguration(loader = AnnotationConfigContextLoader.class)
 public class VmwareVmImplementerTest {
 
     @Spy
@@ -145,4 +140,21 @@ public void testEnableNestedVirtualizationCaseGlobalNVFalseGlobalNVPVMFalseLocal
         executeAndVerifyTest(false, false, "false", false);
     }
 
+    private void verifyGetParentVersion(String hypervisorVersion, String expectedParentVersion) {
+        if (expectedParentVersion == null) {
+            Assert.assertNull(implementer.getParentVersion(hypervisorVersion));
+        } else {
+            Assert.assertEquals(implementer.getParentVersion(hypervisorVersion), expectedParentVersion);
+        }
+    }
+    @Test
+    public void testGetParentVersion() {
+        verifyGetParentVersion(null, null);
+        verifyGetParentVersion("6.5", null);
+        verifyGetParentVersion("6.7.3", "6.7.3");
+        verifyGetParentVersion("7.0.3.0", "7.0.3");
+        verifyGetParentVersion("8.0", null);
+        verifyGetParentVersion("8.0.0.2", "8.0");
+        verifyGetParentVersion("8.0.1.0", "8.0.1");
+    }
 }