From d72dad8769c757cb410e499cd271d2d854d16684 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Fri, 13 Jan 2023 17:31:05 +0100 Subject: [PATCH 1/8] fix guestOsMapper and move mapping code to latest upgrade --- .../java/com/cloud/upgrade/GuestOsMapper.java | 18 +-- .../upgrade/dao/Upgrade41500to41510.java | 125 ----------------- .../upgrade/dao/Upgrade41720to41800.java | 130 ++++++++++++++++++ 3 files changed, 140 insertions(+), 133 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/upgrade/GuestOsMapper.java b/engine/schema/src/main/java/com/cloud/upgrade/GuestOsMapper.java index f8b3d7a69cdd..14dbfd085c02 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/GuestOsMapper.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/GuestOsMapper.java @@ -53,22 +53,24 @@ public GuestOsMapper() { private long getGuestOsId(long categoryId, String displayName) { GuestOSVO guestOS = guestOSDao.findByCategoryIdAndDisplayNameOrderByCreatedDesc(categoryId, displayName); + long id = 0l; if (guestOS != null) { - guestOS.getId(); + id = guestOS.getId(); + } else { + LOG.warn(String.format("Unable to find the guest OS details with category id: %d and display name: %s", + categoryId, displayName)); } - - LOG.warn("Unable to find the guest OS details with category id: " + categoryId + " and display name: " + displayName); - return 0; + return id; } private long getGuestOsIdFromHypervisorMapping(GuestOSHypervisorMapping mapping) { GuestOSHypervisorVO guestOSHypervisorVO = guestOSHypervisorDao.findByOsNameAndHypervisorOrderByCreatedDesc(mapping.getGuestOsName(), mapping.getHypervisorType(), mapping.getHypervisorVersion()); + long id = 0; if (guestOSHypervisorVO != null) { - guestOSHypervisorVO.getGuestOsId(); + id = guestOSHypervisorVO.getGuestOsId(); + } else { + LOG.warn(String.format("Unable to find the guest OS hypervisor mapping details for %s", mapping.toString())); } - - LOG.debug("Unable to find the guest OS hypervisor mapping details for " + mapping.toString()); - return 0; + return id; } public void addGuestOsAndHypervisorMappings(long categoryId, String displayName, List mappings) { diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java index 9cae72527075..5b90b5966ddb 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java @@ -70,7 +70,6 @@ public InputStream[] getPrepareScripts() { @Override public void performDataMigration(Connection conn) { correctGuestOsNames(conn); - updateGuestOsMappings(conn); } @Override @@ -250,130 +249,6 @@ private void correctGuestOsNames(final Connection conn) { guestOsMapper.updateGuestOsNameFromMapping("OpenSUSE Linux (32 bit)", mapping); } - private void updateGuestOsMappings(final Connection conn) { - LOG.debug("Updating guest OS mappings"); - - // Add support for SUSE Linux Enterprise Desktop 12 SP3 (64-bit) for Xenserver 8.1.0 - List mappings = new ArrayList(); - mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "SUSE Linux Enterprise Desktop 12 SP3 (64-bit)")); - guestOsMapper.addGuestOsAndHypervisorMappings (5, "SUSE Linux Enterprise Desktop 12 SP3 (64-bit)", mappings); - mappings.clear(); - - // Add support for SUSE Linux Enterprise Desktop 12 SP4 (64-bit) for Xenserver 8.1.0 - mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "SUSE Linux Enterprise Desktop 12 SP4 (64-bit)")); - guestOsMapper.addGuestOsAndHypervisorMappings (5, "SUSE Linux Enterprise Desktop 12 SP4 (64-bit)", mappings); - mappings.clear(); - - // Add support for SUSE Linux Enterprise Server 12 SP4 (64-bit) for Xenserver 8.1.0 - mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "SUSE Linux Enterprise Server 12 SP4 (64-bit)")); - mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "NeoKylin Linux Server 7")); - guestOsMapper.addGuestOsAndHypervisorMappings(5, "SUSE Linux Enterprise Server 12 SP4 (64-bit)", mappings); - mappings.clear(); - - // Add support for Scientific Linux 7 for Xenserver 8.1.0 - mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "Scientific Linux 7")); - guestOsMapper.addGuestOsAndHypervisorMappings (9, "Scientific Linux 7", mappings); - mappings.clear(); - - // Add support for NeoKylin Linux Server 7 for Xenserver 8.1.0 - guestOsMapper.addGuestOsAndHypervisorMappings(9, "NeoKylin Linux Server 7", mappings); //334 - mappings.clear(); - - // Pass Guest OS Ids to update pre-4.14 mappings - // Add support CentOS 8 for Xenserver 8.1.0 - guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "CentOS 8"), 297); - - // Add support for Debian Buster 10 for Xenserver 8.1.0 - guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "Debian Buster 10"), 292); - guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "Debian Buster 10"), 293); - - // Add support for SUSE Linux Enterprise 15 (64-bit) for Xenserver 8.1.0 - guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "SUSE Linux Enterprise 15 (64-bit)"), 291); - - // Add support for Ubuntu Focal Fossa 20.04 for Xenserver 8.2.0 - mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.2.0", "Ubuntu Focal Fossa 20.04")); - guestOsMapper.addGuestOsAndHypervisorMappings(10, "Ubuntu 20.04 LTS", mappings); - mappings.clear(); - - // Add support for darwin19_64Guest from VMware 7.0 - mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "darwin19_64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "macOS 10.15 (64 bit)", mappings); - mappings.clear(); - - // Add support for debian11_64Guest from VMware 7.0 - mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "debian11_64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(2, "Debian GNU/Linux 11 (64-bit)", mappings); - mappings.clear(); - - // Add support for debian11Guest from VMware 7.0 - mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "debian11Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(2, "Debian GNU/Linux 11 (32-bit)", mappings); - mappings.clear(); - - // Add support for windows2019srv_64Guest from VMware 7.0 - guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("VMware", "7.0", "windows2019srv_64Guest"), 276); - - // Add support for amazonlinux3_64Guest from VMware 7.0.1.0 - mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "amazonlinux3_64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "Amazon Linux 3 (64 bit)", mappings); - mappings.clear(); - - // Add support for asianux9_64Guest from VMware 7.0.1.0 - mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "asianux9_64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 9 (64 bit)", mappings); - mappings.clear(); - - // Add support for centos9_64Guest from VMware 7.0.1.0 - mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "centos9_64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(1, "CentOS 9", mappings); - mappings.clear(); - - // Add support for darwin20_64Guest from VMware 7.0.1.0 - mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "darwin20_64Guest")); - // Add support for darwin21_64Guest from VMware 7.0.1.0 - mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "darwin21_64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "macOS 11 (64 bit)", mappings); - mappings.clear(); - - // Add support for freebsd13_64Guest from VMware 7.0.1.0 - mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "freebsd13_64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(9, "FreeBSD 13 (64-bit)", mappings); - mappings.clear(); - - // Add support for freebsd13Guest from VMware 7.0.1.0 - mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "freebsd13Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(9, "FreeBSD 13 (32-bit)", mappings); - mappings.clear(); - - // Add support for oracleLinux9_64Guest from VMware 7.0.1.0 - mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "oracleLinux9_64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(3, "Oracle Linux 9", mappings); - mappings.clear(); - - // Add support for other5xLinux64Guest from VMware 7.0.1.0 - mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "other5xLinux64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(2, "Linux 5.x Kernel (64-bit)", mappings); - mappings.clear(); - - // Add support for other5xLinuxGuest from VMware 7.0.1.0 - mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "other5xLinuxGuest")); - guestOsMapper.addGuestOsAndHypervisorMappings(2, "Linux 5.x Kernel (32-bit)", mappings); - mappings.clear(); - - // Add support for rhel9_64Guest from VMware 7.0.1.0 - mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "rhel9_64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(4, "Red Hat Enterprise Linux 9.0", mappings); - mappings.clear(); - - // Add support for sles16_64Guest from VMware 7.0.1.0 - mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "sles16_64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(5, "SUSE Linux Enterprise Server 16 (64-bit)", mappings); - mappings.clear(); - - // Add support for windows2019srvNext_64Guest from VMware 7.0.1.0 - Pass Guest OS Ids to update pre-4.14 mappings - guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "windows2019srvNext_64Guest"), 276); - } - @Override public InputStream[] getCleanupScripts() { final String scriptFile = "META-INF/db/schema-41500to41510-cleanup.sql"; diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java index fae913100355..562b4f9b88b5 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java @@ -16,6 +16,8 @@ // under the License. package com.cloud.upgrade.dao; +import com.cloud.storage.GuestOSHypervisorMapping; +import com.cloud.upgrade.GuestOsMapper; import com.cloud.upgrade.SystemVmTemplateRegistration; import com.cloud.utils.exception.CloudRuntimeException; import org.apache.cloudstack.api.response.UsageTypeResponse; @@ -29,6 +31,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.LinkedHashMap; @@ -39,6 +42,8 @@ public class Upgrade41720to41800 implements DbUpgrade, DbUpgradeSystemVmTemplate final static Logger LOG = Logger.getLogger(Upgrade41720to41800.class); + private GuestOsMapper guestOsMapper = new GuestOsMapper(); + private SystemVmTemplateRegistration systemVmTemplateRegistration; @Override @@ -71,6 +76,7 @@ public InputStream[] getPrepareScripts() { public void performDataMigration(Connection conn) { convertQuotaTariffsToNewParadigm(conn); convertVmResourcesQuotaTypesToRunningVmQuotaType(conn); + updateGuestOsMappings(conn); } @Override @@ -230,4 +236,128 @@ protected void convertVmResourcesQuotaTypesToRunningVmQuotaType(Connection conn) throw new CloudRuntimeException(message, e); } } + + private void updateGuestOsMappings(final Connection conn) { + LOG.debug("Updating guest OS mappings"); + + // Add support for SUSE Linux Enterprise Desktop 12 SP3 (64-bit) for Xenserver 8.1.0 + List mappings = new ArrayList(); + mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "SUSE Linux Enterprise Desktop 12 SP3 (64-bit)")); + guestOsMapper.addGuestOsAndHypervisorMappings (5, "SUSE Linux Enterprise Desktop 12 SP3 (64-bit)", mappings); + mappings.clear(); + + // Add support for SUSE Linux Enterprise Desktop 12 SP4 (64-bit) for Xenserver 8.1.0 + mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "SUSE Linux Enterprise Desktop 12 SP4 (64-bit)")); + guestOsMapper.addGuestOsAndHypervisorMappings (5, "SUSE Linux Enterprise Desktop 12 SP4 (64-bit)", mappings); + mappings.clear(); + + // Add support for SUSE Linux Enterprise Server 12 SP4 (64-bit) for Xenserver 8.1.0 + mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "SUSE Linux Enterprise Server 12 SP4 (64-bit)")); + mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "NeoKylin Linux Server 7")); + guestOsMapper.addGuestOsAndHypervisorMappings(5, "SUSE Linux Enterprise Server 12 SP4 (64-bit)", mappings); + mappings.clear(); + + // Add support for Scientific Linux 7 for Xenserver 8.1.0 + mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "Scientific Linux 7")); + guestOsMapper.addGuestOsAndHypervisorMappings (9, "Scientific Linux 7", mappings); + mappings.clear(); + + // Add support for NeoKylin Linux Server 7 for Xenserver 8.1.0 + guestOsMapper.addGuestOsAndHypervisorMappings(9, "NeoKylin Linux Server 7", mappings); //334 + mappings.clear(); + + // Pass Guest OS Ids to update pre-4.14 mappings + // Add support CentOS 8 for Xenserver 8.1.0 + guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "CentOS 8"), 297); + + // Add support for Debian Buster 10 for Xenserver 8.1.0 + guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "Debian Buster 10"), 292); + guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "Debian Buster 10"), 293); + + // Add support for SUSE Linux Enterprise 15 (64-bit) for Xenserver 8.1.0 + guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "SUSE Linux Enterprise 15 (64-bit)"), 291); + + // Add support for Ubuntu Focal Fossa 20.04 for Xenserver 8.2.0 + mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.2.0", "Ubuntu Focal Fossa 20.04")); + guestOsMapper.addGuestOsAndHypervisorMappings(10, "Ubuntu 20.04 LTS", mappings); + mappings.clear(); + + // Add support for darwin19_64Guest from VMware 7.0 + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "darwin19_64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "macOS 10.15 (64 bit)", mappings); + mappings.clear(); + + // Add support for debian11_64Guest from VMware 7.0 + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "debian11_64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(2, "Debian GNU/Linux 11 (64-bit)", mappings); + mappings.clear(); + + // Add support for debian11Guest from VMware 7.0 + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "debian11Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(2, "Debian GNU/Linux 11 (32-bit)", mappings); + mappings.clear(); + + // Add support for windows2019srv_64Guest from VMware 7.0 + guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("VMware", "7.0", "windows2019srv_64Guest"), 276); + + // Add support for amazonlinux3_64Guest from VMware 7.0.1.0 + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "amazonlinux3_64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "Amazon Linux 3 (64 bit)", mappings); + mappings.clear(); + + // Add support for asianux9_64Guest from VMware 7.0.1.0 + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "asianux9_64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 9 (64 bit)", mappings); + mappings.clear(); + + // Add support for centos9_64Guest from VMware 7.0.1.0 + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "centos9_64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(1, "CentOS 9", mappings); + mappings.clear(); + + // Add support for darwin20_64Guest from VMware 7.0.1.0 + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "darwin20_64Guest")); + // Add support for darwin21_64Guest from VMware 7.0.1.0 + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "darwin21_64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "macOS 11 (64 bit)", mappings); + mappings.clear(); + + // Add support for freebsd13_64Guest from VMware 7.0.1.0 + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "freebsd13_64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(9, "FreeBSD 13 (64-bit)", mappings); + mappings.clear(); + + // Add support for freebsd13Guest from VMware 7.0.1.0 + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "freebsd13Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(9, "FreeBSD 13 (32-bit)", mappings); + mappings.clear(); + + // Add support for oracleLinux9_64Guest from VMware 7.0.1.0 + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "oracleLinux9_64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(3, "Oracle Linux 9", mappings); + mappings.clear(); + + // Add support for other5xLinux64Guest from VMware 7.0.1.0 + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "other5xLinux64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(2, "Linux 5.x Kernel (64-bit)", mappings); + mappings.clear(); + + // Add support for other5xLinuxGuest from VMware 7.0.1.0 + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "other5xLinuxGuest")); + guestOsMapper.addGuestOsAndHypervisorMappings(2, "Linux 5.x Kernel (32-bit)", mappings); + mappings.clear(); + + // Add support for rhel9_64Guest from VMware 7.0.1.0 + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "rhel9_64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(4, "Red Hat Enterprise Linux 9.0", mappings); + mappings.clear(); + + // Add support for sles16_64Guest from VMware 7.0.1.0 + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "sles16_64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(5, "SUSE Linux Enterprise Server 16 (64-bit)", mappings); + mappings.clear(); + + // Add support for windows2019srvNext_64Guest from VMware 7.0.1.0 - Pass Guest OS Ids to update pre-4.14 mappings + guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "windows2019srvNext_64Guest"), 276); + } } From f54e6ceda1fe4afc69f6cf894a82f363a25883dd Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 16 Jan 2023 09:47:48 +0100 Subject: [PATCH 2/8] move remaining mappings after fix --- .../upgrade/dao/Upgrade41400to41500.java | 235 ----------------- .../upgrade/dao/Upgrade41500to41510.java | 9 - .../upgrade/dao/Upgrade41720to41800.java | 239 ++++++++++++++++++ 3 files changed, 239 insertions(+), 244 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java index f35f10aacff3..d973efcfa7fd 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java @@ -67,7 +67,6 @@ public InputStream[] getPrepareScripts() { @Override public void performDataMigration(Connection conn) { addRolePermissionsForNewReadOnlyAndSupportRoles(conn); - updateGuestOsMappings(conn); } private void addRolePermissionsForNewReadOnlyAndSupportRoles(final Connection conn) { @@ -352,240 +351,6 @@ private void addRolePermissionsForSupportUser(final Connection conn) { } } - private void updateGuestOsMappings(final Connection conn) { - LOG.debug("Updating guest OS mappings"); - - // The below existing Guest OS Ids must be used for updating the guest OS hypervisor mappings - // CentOS - 1, Debian - 2, Oracle - 3, RedHat - 4, SUSE - 5, Windows - 6, Other - 7, Novel - 8, Unix - 9, Ubuntu - 10, None - 11 - - // OVF configured OS while registering deploy-as-is templates Linux 3.x Kernel OS - guestOsMapper.addGuestOsAndHypervisorMappings(11, "OVF Configured OS", null); - - List mappings = new ArrayList(); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "other3xLinux64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "other3xLinux64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "other3xLinux64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "other3xLinux64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "other3xLinux64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "other3xLinux64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(2, "Linux 3.x Kernel (64 bit)", mappings); - mappings.clear(); - - mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "other3xLinuxGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "other3xLinuxGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "other3xLinuxGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "other3xLinuxGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "other3xLinuxGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "other3xLinuxGuest")); - guestOsMapper.addGuestOsAndHypervisorMappings(2, "Linux 3.x Kernel (32 bit)", mappings); - mappings.clear(); - - // Add Amazonlinux as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "amazonlinux2_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "amazonlinux2_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "amazonlinux2_64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "Amazon Linux 2 (64 bit)", mappings); - mappings.clear(); - - // Add asianux4 32 as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "asianux4Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "asianux4Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "asianux4Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux4Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux4Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux4Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 4 (32 bit)", mappings); - mappings.clear(); - - // Add asianux4 64 as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "asianux4_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "asianux4_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "asianux4_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux4_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux4_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux4_64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 4 (64 bit)", mappings); - mappings.clear(); - - // Add asianux5 32 as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "asianux5Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "asianux5Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "asianux5Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux5Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux5Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux5Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 5 (32 bit)", mappings); - mappings.clear(); - - // Add asianux5 64 as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "asianux5_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "asianux5_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "asianux5_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux5_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux5_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux5_64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 5 (64 bit)", mappings); - mappings.clear(); - - // Add asianux7 32 as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "asianux7Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "asianux7Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux7Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux7Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux7Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 7 (32 bit)", mappings); - mappings.clear(); - - // Add asianux7 64 as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "asianux7_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "asianux7_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux7_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux7_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux7_64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 7 (64 bit)", mappings); - mappings.clear(); - - // Add asianux8 as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "asianux8_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux8_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux8_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux8_64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 8 (64 bit)", mappings); - mappings.clear(); - - // Add eComStation 2.0 as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "eComStation2Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "eComStation2Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "eComStation2Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "eComStation2Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "eComStation 2.0", mappings); - mappings.clear(); - - // Add macOS 10.13 (64 bit) as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "darwin17_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "darwin17_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "darwin17_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "darwin17_64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "macOS 10.13 (64 bit)", mappings); - mappings.clear(); - - // Add macOS 10.14 (64 bit) as support guest os, and VMWare guest os mapping - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "darwin18_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "darwin18_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "darwin18_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "darwin18_64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "macOS 10.14 (64 bit)", mappings); - mappings.clear(); - - // Add Fedora Linux (64 bit) as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "fedora64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "fedora64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "fedora64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "fedora64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "fedora64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "fedora64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "Fedora Linux (64 bit)", mappings); - mappings.clear(); - - // Add Fedora Linux as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "fedoraGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "fedoraGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "fedoraGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "fedoraGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "fedoraGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "fedoraGuest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "Fedora Linux", mappings); - mappings.clear(); - - // Add Mandrake Linux as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "mandrakeGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "mandrakeGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "mandrakeGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "mandrakeGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "mandrakeGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "mandrakeGuest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "Mandrake Linux", mappings); - mappings.clear(); - - // Add Mandriva Linux (64 bit) as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "mandriva64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "mandriva64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "mandriva64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "mandriva64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "mandriva64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "mandriva64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "Mandriva Linux (64 bit)", mappings); - mappings.clear(); - - // Add Mandriva Linux as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "mandrivaGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "mandrivaGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "mandrivaGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "mandrivaGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "mandrivaGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "mandrivaGuest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "Mandriva Linux", mappings); - mappings.clear(); - - // Add SCO OpenServer 5 as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "openServer5Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "openServer5Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "openServer5Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "openServer5Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "openServer5Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "openServer5Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "SCO OpenServer 5", mappings); - mappings.clear(); - - // Add SCO OpenServer 6 as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "openServer6Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "openServer6Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "openServer6Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "openServer6Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "openServer6Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "openServer6Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "SCO OpenServer 6", mappings); - mappings.clear(); - - // Add OpenSUSE Linux (64 bit) as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "opensuse64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "opensuse64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "opensuse64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "opensuse64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "opensuse64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "opensuse64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "OpenSUSE Linux (64 bit)", mappings); - mappings.clear(); - - // Add OpenSUSE Linux (32 bit) as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "opensuseGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "opensuseGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "opensuseGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "opensuseGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "opensuseGuest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "opensuseGuest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "OpenSUSE Linux (32 bit)", mappings); - mappings.clear(); - - // Add Solaris 11 (64 bit) as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "solaris11_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "solaris11_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "solaris11_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "solaris11_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "solaris11_64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "solaris11_64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "Solaris 11 (64 bit)", mappings); - mappings.clear(); - - // Add VMware Photon (64 bit) as support guest os, and VMWare guest os mappings - mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "vmwarePhoton64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "vmwarePhoton64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "vmwarePhoton64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "vmwarePhoton64Guest")); - mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "vmwarePhoton64Guest")); - guestOsMapper.addGuestOsAndHypervisorMappings(7, "VMware Photon (64 bit)", mappings); - } - @Override public InputStream[] getCleanupScripts() { final String scriptFile = "META-INF/db/schema-41400to41500-cleanup.sql"; diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java index 5b90b5966ddb..7b966cd8dd56 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java @@ -69,7 +69,6 @@ public InputStream[] getPrepareScripts() { @Override public void performDataMigration(Connection conn) { - correctGuestOsNames(conn); } @Override @@ -241,14 +240,6 @@ public void updateSystemVmTemplates(final Connection conn) { LOG.debug("Updating System Vm Template IDs Complete"); } - private void correctGuestOsNames(final Connection conn) { - guestOsMapper.updateGuestOsName(7, "Fedora Linux", "Fedora Linux (32 bit)"); - guestOsMapper.updateGuestOsName(7, "Mandriva Linux", "Mandriva Linux (32 bit)"); - - GuestOSHypervisorMapping mapping = new GuestOSHypervisorMapping("VMware", "6.7.3", "opensuseGuest"); - guestOsMapper.updateGuestOsNameFromMapping("OpenSUSE Linux (32 bit)", mapping); - } - @Override public InputStream[] getCleanupScripts() { final String scriptFile = "META-INF/db/schema-41500to41510-cleanup.sql"; diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java index 562b4f9b88b5..741f92614605 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java @@ -76,6 +76,8 @@ public InputStream[] getPrepareScripts() { public void performDataMigration(Connection conn) { convertQuotaTariffsToNewParadigm(conn); convertVmResourcesQuotaTypesToRunningVmQuotaType(conn); + correctGuestOsNames(conn); + updateGuestOsMappings(conn); updateGuestOsMappings(conn); } @@ -237,6 +239,14 @@ protected void convertVmResourcesQuotaTypesToRunningVmQuotaType(Connection conn) } } + private void correctGuestOsNames(final Connection conn) { + guestOsMapper.updateGuestOsName(7, "Fedora Linux", "Fedora Linux (32 bit)"); + guestOsMapper.updateGuestOsName(7, "Mandriva Linux", "Mandriva Linux (32 bit)"); + + GuestOSHypervisorMapping mapping = new GuestOSHypervisorMapping("VMware", "6.7.3", "opensuseGuest"); + guestOsMapper.updateGuestOsNameFromMapping("OpenSUSE Linux (32 bit)", mapping); + } + private void updateGuestOsMappings(final Connection conn) { LOG.debug("Updating guest OS mappings"); @@ -359,5 +369,234 @@ private void updateGuestOsMappings(final Connection conn) { // Add support for windows2019srvNext_64Guest from VMware 7.0.1.0 - Pass Guest OS Ids to update pre-4.14 mappings guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "windows2019srvNext_64Guest"), 276); + + // The below existing Guest OS Ids must be used for updating the guest OS hypervisor mappings + // CentOS - 1, Debian - 2, Oracle - 3, RedHat - 4, SUSE - 5, Windows - 6, Other - 7, Novel - 8, Unix - 9, Ubuntu - 10, None - 11 + + // OVF configured OS while registering deploy-as-is templates Linux 3.x Kernel OS + guestOsMapper.addGuestOsAndHypervisorMappings(11, "OVF Configured OS", null); + + mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "other3xLinux64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "other3xLinux64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "other3xLinux64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "other3xLinux64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "other3xLinux64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "other3xLinux64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(2, "Linux 3.x Kernel (64 bit)", mappings); + mappings.clear(); + + mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "other3xLinuxGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "other3xLinuxGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "other3xLinuxGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "other3xLinuxGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "other3xLinuxGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "other3xLinuxGuest")); + guestOsMapper.addGuestOsAndHypervisorMappings(2, "Linux 3.x Kernel (32 bit)", mappings); + mappings.clear(); + + // Add Amazonlinux as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "amazonlinux2_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "amazonlinux2_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "amazonlinux2_64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "Amazon Linux 2 (64 bit)", mappings); + mappings.clear(); + + // Add asianux4 32 as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "asianux4Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "asianux4Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "asianux4Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux4Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux4Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux4Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 4 (32 bit)", mappings); + mappings.clear(); + + // Add asianux4 64 as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "asianux4_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "asianux4_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "asianux4_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux4_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux4_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux4_64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 4 (64 bit)", mappings); + mappings.clear(); + + // Add asianux5 32 as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "asianux5Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "asianux5Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "asianux5Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux5Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux5Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux5Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 5 (32 bit)", mappings); + mappings.clear(); + + // Add asianux5 64 as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "asianux5_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "asianux5_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "asianux5_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux5_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux5_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux5_64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 5 (64 bit)", mappings); + mappings.clear(); + + // Add asianux7 32 as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "asianux7Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "asianux7Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux7Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux7Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux7Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 7 (32 bit)", mappings); + mappings.clear(); + + // Add asianux7 64 as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "asianux7_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "asianux7_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux7_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux7_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux7_64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 7 (64 bit)", mappings); + mappings.clear(); + + // Add asianux8 as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "asianux8_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux8_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux8_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux8_64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 8 (64 bit)", mappings); + mappings.clear(); + + // Add eComStation 2.0 as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "eComStation2Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "eComStation2Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "eComStation2Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "eComStation2Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "eComStation 2.0", mappings); + mappings.clear(); + + // Add macOS 10.13 (64 bit) as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "darwin17_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "darwin17_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "darwin17_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "darwin17_64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "macOS 10.13 (64 bit)", mappings); + mappings.clear(); + + // Add macOS 10.14 (64 bit) as support guest os, and VMWare guest os mapping + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "darwin18_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "darwin18_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "darwin18_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "darwin18_64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "macOS 10.14 (64 bit)", mappings); + mappings.clear(); + + // Add Fedora Linux (64 bit) as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "fedora64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "fedora64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "fedora64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "fedora64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "fedora64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "fedora64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "Fedora Linux (64 bit)", mappings); + mappings.clear(); + + // Add Fedora Linux as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "fedoraGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "fedoraGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "fedoraGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "fedoraGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "fedoraGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "fedoraGuest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "Fedora Linux", mappings); + mappings.clear(); + + // Add Mandrake Linux as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "mandrakeGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "mandrakeGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "mandrakeGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "mandrakeGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "mandrakeGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "mandrakeGuest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "Mandrake Linux", mappings); + mappings.clear(); + + // Add Mandriva Linux (64 bit) as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "mandriva64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "mandriva64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "mandriva64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "mandriva64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "mandriva64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "mandriva64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "Mandriva Linux (64 bit)", mappings); + mappings.clear(); + + // Add Mandriva Linux as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "mandrivaGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "mandrivaGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "mandrivaGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "mandrivaGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "mandrivaGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "mandrivaGuest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "Mandriva Linux", mappings); + mappings.clear(); + + // Add SCO OpenServer 5 as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "openServer5Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "openServer5Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "openServer5Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "openServer5Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "openServer5Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "openServer5Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "SCO OpenServer 5", mappings); + mappings.clear(); + + // Add SCO OpenServer 6 as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "openServer6Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "openServer6Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "openServer6Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "openServer6Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "openServer6Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "openServer6Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "SCO OpenServer 6", mappings); + mappings.clear(); + + // Add OpenSUSE Linux (64 bit) as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "opensuse64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "opensuse64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "opensuse64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "opensuse64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "opensuse64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "opensuse64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "OpenSUSE Linux (64 bit)", mappings); + mappings.clear(); + + // Add OpenSUSE Linux (32 bit) as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "opensuseGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "opensuseGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "opensuseGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "opensuseGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "opensuseGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "opensuseGuest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "OpenSUSE Linux (32 bit)", mappings); + mappings.clear(); + + // Add Solaris 11 (64 bit) as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.0", "solaris11_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "solaris11_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "solaris11_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "solaris11_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "solaris11_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "solaris11_64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "Solaris 11 (64 bit)", mappings); + mappings.clear(); + + // Add VMware Photon (64 bit) as support guest os, and VMWare guest os mappings + mappings.add(new GuestOSHypervisorMapping("VMware", "6.5", "vmwarePhoton64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7", "vmwarePhoton64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "vmwarePhoton64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "vmwarePhoton64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "vmwarePhoton64Guest")); + guestOsMapper.addGuestOsAndHypervisorMappings(7, "VMware Photon (64 bit)", mappings); } } From 2bf622d08a283f725b49ec5b6e3318aa5274f388 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 16 Jan 2023 10:13:20 +0100 Subject: [PATCH 3/8] imports --- .../main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java | 1 - .../main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java | 3 --- 2 files changed, 4 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java index d973efcfa7fd..180c92bdf774 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java @@ -29,7 +29,6 @@ import org.apache.log4j.Logger; -import com.cloud.storage.GuestOSHypervisorMapping; import com.cloud.upgrade.GuestOsMapper; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java index 7b966cd8dd56..27edd12aca93 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java @@ -22,17 +22,14 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Set; import org.apache.log4j.Logger; import com.cloud.hypervisor.Hypervisor; -import com.cloud.storage.GuestOSHypervisorMapping; import com.cloud.upgrade.GuestOsMapper; import com.cloud.utils.exception.CloudRuntimeException; From 111846ebc1f9b27609047cd5c197546711ff2658 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 16 Jan 2023 11:07:39 +0100 Subject: [PATCH 4/8] guestOsMapper.updateGuestOsIdInHypervisorMapping calls moved --- .../java/com/cloud/upgrade/dao/Upgrade41510to41520.java | 7 ------- .../java/com/cloud/upgrade/dao/Upgrade41520to41600.java | 7 ------- .../java/com/cloud/upgrade/dao/Upgrade41600to41610.java | 7 ------- .../java/com/cloud/upgrade/dao/Upgrade41720to41800.java | 6 ++++++ 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41510to41520.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41510to41520.java index 9f3e344142da..3d7b0d77b6ab 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41510to41520.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41510to41520.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.upgrade.dao; -import com.cloud.storage.GuestOSHypervisorMapping; import com.cloud.upgrade.GuestOsMapper; import com.cloud.utils.exception.CloudRuntimeException; @@ -58,12 +57,6 @@ public InputStream[] getPrepareScripts() { @Override public void performDataMigration(Connection conn) { - correctGuestOsIdsInHypervisorMapping(conn); - } - - private void correctGuestOsIdsInHypervisorMapping(final Connection conn) { - LOG.debug("Correcting guest OS ids in hypervisor mappings"); - guestOsMapper.updateGuestOsIdInHypervisorMapping(conn, 10, "Ubuntu 20.04 LTS", new GuestOSHypervisorMapping("Xenserver", "8.2.0", "Ubuntu Focal Fossa 20.04")); } @Override diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41520to41600.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41520to41600.java index 05eb2c7df556..7e368b6a067d 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41520to41600.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41520to41600.java @@ -25,7 +25,6 @@ import java.util.Arrays; import java.util.List; -import com.cloud.storage.GuestOSHypervisorMapping; import com.cloud.upgrade.GuestOsMapper; import com.cloud.upgrade.RolePermissionChecker; import com.cloud.upgrade.SystemVmTemplateRegistration; @@ -75,12 +74,6 @@ public InputStream[] getPrepareScripts() { public void performDataMigration(Connection conn) { generateUuidForExistingSshKeyPairs(conn); populateAnnotationPermissions(conn); - correctGuestOsIdsInHypervisorMapping(conn); - } - - private void correctGuestOsIdsInHypervisorMapping(final Connection conn) { - LOG.debug("Correcting guest OS ids in hypervisor mappings"); - guestOsMapper.updateGuestOsIdInHypervisorMapping(conn, 10, "Ubuntu 20.04 LTS", new GuestOSHypervisorMapping("Xenserver", "8.2.0", "Ubuntu Focal Fossa 20.04")); } private void populateAnnotationPermissions(Connection conn) { diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41600to41610.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41600to41610.java index 8fff153a6c15..a2bc714948bc 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41600to41610.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41600to41610.java @@ -17,7 +17,6 @@ package com.cloud.upgrade.dao; -import com.cloud.storage.GuestOSHypervisorMapping; import com.cloud.upgrade.GuestOsMapper; import com.cloud.upgrade.SystemVmTemplateRegistration; import com.cloud.utils.exception.CloudRuntimeException; @@ -60,12 +59,6 @@ public InputStream[] getPrepareScripts() { @Override public void performDataMigration(Connection conn) { - correctGuestOsIdsInHypervisorMapping(conn); - } - - private void correctGuestOsIdsInHypervisorMapping(final Connection conn) { - LOG.debug("Correcting guest OS ids in hypervisor mappings"); - guestOsMapper.updateGuestOsIdInHypervisorMapping(conn, 10, "Ubuntu 20.04 LTS", new GuestOSHypervisorMapping("Xenserver", "8.2.0", "Ubuntu Focal Fossa 20.04")); } @Override diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java index 741f92614605..b6f57e65a307 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java @@ -79,6 +79,7 @@ public void performDataMigration(Connection conn) { correctGuestOsNames(conn); updateGuestOsMappings(conn); updateGuestOsMappings(conn); + correctGuestOsIdsInHypervisorMapping(conn); } @Override @@ -599,4 +600,9 @@ private void updateGuestOsMappings(final Connection conn) { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "vmwarePhoton64Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "VMware Photon (64 bit)", mappings); } + + private void correctGuestOsIdsInHypervisorMapping(final Connection conn) { + LOG.debug("Correcting guest OS ids in hypervisor mappings"); + guestOsMapper.updateGuestOsIdInHypervisorMapping(conn, 10, "Ubuntu 20.04 LTS", new GuestOSHypervisorMapping("Xenserver", "8.2.0", "Ubuntu Focal Fossa 20.04")); + } } From 8e54f07d5bca10f1919b1bbb1b690840df1c9760 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Tue, 17 Jan 2023 13:48:53 +0100 Subject: [PATCH 5/8] cleanup --- .../java/com/cloud/upgrade/dao/Upgrade41510to41520.java | 3 +-- .../java/com/cloud/upgrade/dao/Upgrade41520to41600.java | 2 -- .../java/com/cloud/upgrade/dao/Upgrade41600to41610.java | 3 +-- .../java/com/cloud/upgrade/dao/Upgrade41720to41800.java | 9 ++++----- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41510to41520.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41510to41520.java index 3d7b0d77b6ab..bf91c8f7aceb 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41510to41520.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41510to41520.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.upgrade.dao; -import com.cloud.upgrade.GuestOsMapper; import com.cloud.utils.exception.CloudRuntimeException; import java.io.InputStream; @@ -27,7 +26,6 @@ public class Upgrade41510to41520 implements DbUpgrade { final static Logger LOG = Logger.getLogger(Upgrade41510to41520.class); - private GuestOsMapper guestOsMapper = new GuestOsMapper(); @Override public String[] getUpgradableVersionRange() { @@ -57,6 +55,7 @@ public InputStream[] getPrepareScripts() { @Override public void performDataMigration(Connection conn) { + // nothing to do } @Override diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41520to41600.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41520to41600.java index 7e368b6a067d..107742076fd2 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41520to41600.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41520to41600.java @@ -25,7 +25,6 @@ import java.util.Arrays; import java.util.List; -import com.cloud.upgrade.GuestOsMapper; import com.cloud.upgrade.RolePermissionChecker; import com.cloud.upgrade.SystemVmTemplateRegistration; import org.apache.cloudstack.acl.RoleType; @@ -39,7 +38,6 @@ public class Upgrade41520to41600 implements DbUpgrade, DbUpgradeSystemVmTemplate final static Logger LOG = Logger.getLogger(Upgrade41520to41600.class); private SystemVmTemplateRegistration systemVmTemplateRegistration; private RolePermissionChecker rolePermissionChecker = new RolePermissionChecker(); - private GuestOsMapper guestOsMapper = new GuestOsMapper(); public Upgrade41520to41600() { } diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41600to41610.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41600to41610.java index a2bc714948bc..8094a2e9a3c1 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41600to41610.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41600to41610.java @@ -17,7 +17,6 @@ package com.cloud.upgrade.dao; -import com.cloud.upgrade.GuestOsMapper; import com.cloud.upgrade.SystemVmTemplateRegistration; import com.cloud.utils.exception.CloudRuntimeException; import org.apache.log4j.Logger; @@ -29,7 +28,6 @@ public class Upgrade41600to41610 implements DbUpgrade, DbUpgradeSystemVmTemplate final static Logger LOG = Logger.getLogger(Upgrade41600to41610.class); private SystemVmTemplateRegistration systemVmTemplateRegistration; - private GuestOsMapper guestOsMapper = new GuestOsMapper(); @Override public String[] getUpgradableVersionRange() { @@ -59,6 +57,7 @@ public InputStream[] getPrepareScripts() { @Override public void performDataMigration(Connection conn) { + // nothing to do } @Override diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java index b6f57e65a307..33934c7abb77 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java @@ -76,9 +76,8 @@ public InputStream[] getPrepareScripts() { public void performDataMigration(Connection conn) { convertQuotaTariffsToNewParadigm(conn); convertVmResourcesQuotaTypesToRunningVmQuotaType(conn); - correctGuestOsNames(conn); - updateGuestOsMappings(conn); - updateGuestOsMappings(conn); + correctGuestOsNames(); + updateGuestOsMappings(); correctGuestOsIdsInHypervisorMapping(conn); } @@ -240,7 +239,7 @@ protected void convertVmResourcesQuotaTypesToRunningVmQuotaType(Connection conn) } } - private void correctGuestOsNames(final Connection conn) { + private void correctGuestOsNames() { guestOsMapper.updateGuestOsName(7, "Fedora Linux", "Fedora Linux (32 bit)"); guestOsMapper.updateGuestOsName(7, "Mandriva Linux", "Mandriva Linux (32 bit)"); @@ -248,7 +247,7 @@ private void correctGuestOsNames(final Connection conn) { guestOsMapper.updateGuestOsNameFromMapping("OpenSUSE Linux (32 bit)", mapping); } - private void updateGuestOsMappings(final Connection conn) { + private void updateGuestOsMappings() { LOG.debug("Updating guest OS mappings"); // Add support for SUSE Linux Enterprise Desktop 12 SP3 (64-bit) for Xenserver 8.1.0 From 9f9e057a2ba47a4d04b56ec4bfafdbf51f2dfeac Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Wed, 18 Jan 2023 16:47:36 +0100 Subject: [PATCH 6/8] add vmware 7 mappings --- .../upgrade/dao/Upgrade41720to41800.java | 108 +++++++++++++++++- 1 file changed, 103 insertions(+), 5 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java index 33934c7abb77..468e4ec8f431 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java @@ -253,26 +253,28 @@ private void updateGuestOsMappings() { // Add support for SUSE Linux Enterprise Desktop 12 SP3 (64-bit) for Xenserver 8.1.0 List mappings = new ArrayList(); mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "SUSE Linux Enterprise Desktop 12 SP3 (64-bit)")); - guestOsMapper.addGuestOsAndHypervisorMappings (5, "SUSE Linux Enterprise Desktop 12 SP3 (64-bit)", mappings); + guestOsMapper.addGuestOsAndHypervisorMappings(5, "SUSE Linux Enterprise Desktop 12 SP3 (64-bit)", mappings); mappings.clear(); // Add support for SUSE Linux Enterprise Desktop 12 SP4 (64-bit) for Xenserver 8.1.0 mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "SUSE Linux Enterprise Desktop 12 SP4 (64-bit)")); - guestOsMapper.addGuestOsAndHypervisorMappings (5, "SUSE Linux Enterprise Desktop 12 SP4 (64-bit)", mappings); + guestOsMapper.addGuestOsAndHypervisorMappings(5, "SUSE Linux Enterprise Desktop 12 SP4 (64-bit)", mappings); mappings.clear(); - // Add support for SUSE Linux Enterprise Server 12 SP4 (64-bit) for Xenserver 8.1.0 + // Add support for SUSE Linux Enterprise Server 12 SP4 (64-bit) and NeoKylin Linux Server 7 for Xenserver 8.1.0 mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "SUSE Linux Enterprise Server 12 SP4 (64-bit)")); mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "NeoKylin Linux Server 7")); guestOsMapper.addGuestOsAndHypervisorMappings(5, "SUSE Linux Enterprise Server 12 SP4 (64-bit)", mappings); mappings.clear(); - // Add support for Scientific Linux 7 for Xenserver 8.1.0 + // Add support for Scientific Linux 7 and NeoKylin Linux Server 7 for Xenserver 8.1.0 mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "Scientific Linux 7")); - guestOsMapper.addGuestOsAndHypervisorMappings (9, "Scientific Linux 7", mappings); + mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "NeoKylin Linux Server 7")); + guestOsMapper.addGuestOsAndHypervisorMappings(9, "Scientific Linux 7", mappings); mappings.clear(); // Add support for NeoKylin Linux Server 7 for Xenserver 8.1.0 + mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "NeoKylin Linux Server 7")); guestOsMapper.addGuestOsAndHypervisorMappings(9, "NeoKylin Linux Server 7", mappings); //334 mappings.clear(); @@ -382,6 +384,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "other3xLinux64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "other3xLinux64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "other3xLinux64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "other3xLinux64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "other3xLinux64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "other3xLinux64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "other3xLinux64Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(2, "Linux 3.x Kernel (64 bit)", mappings); mappings.clear(); @@ -391,6 +397,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "other3xLinuxGuest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "other3xLinuxGuest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "other3xLinuxGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "other3xLinuxGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "other3xLinuxGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "other3xLinuxGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "other3xLinuxGuest")); guestOsMapper.addGuestOsAndHypervisorMappings(2, "Linux 3.x Kernel (32 bit)", mappings); mappings.clear(); @@ -398,6 +408,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "amazonlinux2_64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "amazonlinux2_64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "amazonlinux2_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "amazonlinux2_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "amazonlinux2_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "amazonlinux2_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "amazonlinux2_64Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "Amazon Linux 2 (64 bit)", mappings); mappings.clear(); @@ -408,6 +422,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux4Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux4Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux4Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "asianux4Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "asianux4Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "asianux4Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "asianux4Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 4 (32 bit)", mappings); mappings.clear(); @@ -418,6 +436,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux4_64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux4_64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux4_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "asianux4_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "asianux4_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "asianux4_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "asianux4_64Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 4 (64 bit)", mappings); mappings.clear(); @@ -428,6 +450,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux5Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux5Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux5Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "asianux5Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "asianux5Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "asianux5Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "asianux5Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 5 (32 bit)", mappings); mappings.clear(); @@ -438,6 +464,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux5_64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux5_64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux5_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "asianux5_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "asianux5_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "asianux5_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "asianux5_64Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 5 (64 bit)", mappings); mappings.clear(); @@ -447,6 +477,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux7Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux7Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux7Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "asianux7Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "asianux7Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "asianux7Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "asianux7Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 7 (32 bit)", mappings); mappings.clear(); @@ -456,6 +490,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux7_64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux7_64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux7_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "asianux7_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "asianux7_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "asianux7_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "asianux7_64Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 7 (64 bit)", mappings); mappings.clear(); @@ -464,6 +502,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "asianux8_64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "asianux8_64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "asianux8_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "asianux8_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "asianux8_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "asianux8_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "asianux8_64Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "Asianux Server 8 (64 bit)", mappings); mappings.clear(); @@ -472,6 +514,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "eComStation2Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "eComStation2Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "eComStation2Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "eComStation2Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "eComStation2Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "eComStation2Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "eComStation2Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "eComStation 2.0", mappings); mappings.clear(); @@ -480,6 +526,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "darwin17_64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "darwin17_64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "darwin17_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "darwin17_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "darwin17_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "darwin17_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "darwin17_64Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "macOS 10.13 (64 bit)", mappings); mappings.clear(); @@ -488,6 +538,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "darwin18_64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "darwin18_64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "darwin18_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "darwin18_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "darwin18_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "darwin18_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "darwin18_64Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "macOS 10.14 (64 bit)", mappings); mappings.clear(); @@ -498,6 +552,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "fedora64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "fedora64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "fedora64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "fedora64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "fedora64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "fedora64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "fedora64Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "Fedora Linux (64 bit)", mappings); mappings.clear(); @@ -508,6 +566,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "fedoraGuest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "fedoraGuest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "fedoraGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "fedoraGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "fedoraGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "fedoraGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "fedoraGuest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "Fedora Linux", mappings); mappings.clear(); @@ -518,6 +580,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "mandrakeGuest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "mandrakeGuest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "mandrakeGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "mandrakeGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "mandrakeGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "mandrakeGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "mandrakeGuest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "Mandrake Linux", mappings); mappings.clear(); @@ -528,6 +594,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "mandriva64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "mandriva64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "mandriva64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "mandriva64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "mandriva64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "mandriva64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "mandriva64Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "Mandriva Linux (64 bit)", mappings); mappings.clear(); @@ -538,6 +608,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "mandrivaGuest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "mandrivaGuest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "mandrivaGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "mandrivaGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "mandrivaGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "mandrivaGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "mandrivaGuest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "Mandriva Linux", mappings); mappings.clear(); @@ -548,6 +622,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "openServer5Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "openServer5Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "openServer5Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "openServer5Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "openServer5Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "openServer5Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "openServer5Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "SCO OpenServer 5", mappings); mappings.clear(); @@ -558,6 +636,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "openServer6Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "openServer6Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "openServer6Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "openServer6Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "openServer6Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "openServer6Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "openServer6Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "SCO OpenServer 6", mappings); mappings.clear(); @@ -568,6 +650,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "opensuse64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "opensuse64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "opensuse64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "opensuse64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "opensuse64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "opensuse64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "opensuse64Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "OpenSUSE Linux (64 bit)", mappings); mappings.clear(); @@ -578,6 +664,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "opensuseGuest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "opensuseGuest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "opensuseGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "opensuseGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "opensuseGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "opensuseGuest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "opensuseGuest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "OpenSUSE Linux (32 bit)", mappings); mappings.clear(); @@ -588,6 +678,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "solaris11_64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "solaris11_64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "solaris11_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "solaris11_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "solaris11_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "solaris11_64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "solaris11_64Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "Solaris 11 (64 bit)", mappings); mappings.clear(); @@ -597,6 +691,10 @@ private void updateGuestOsMappings() { mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.1", "vmwarePhoton64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.2", "vmwarePhoton64Guest")); mappings.add(new GuestOSHypervisorMapping("VMware", "6.7.3", "vmwarePhoton64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0", "vmwarePhoton64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "vmwarePhoton64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.2.0", "vmwarePhoton64Guest")); + mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.3.0", "vmwarePhoton64Guest")); guestOsMapper.addGuestOsAndHypervisorMappings(7, "VMware Photon (64 bit)", mappings); } From cdf55c3fb60176a445afd03bbf27a650bfe11694 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Thu, 19 Jan 2023 12:45:44 +0100 Subject: [PATCH 7/8] minor sonar issues --- .../main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java | 1 - .../main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java index 180c92bdf774..214d0516d210 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java @@ -35,7 +35,6 @@ public class Upgrade41400to41500 implements DbUpgrade { final static Logger LOG = Logger.getLogger(Upgrade41400to41500.class); - private GuestOsMapper guestOsMapper = new GuestOsMapper(); @Override public String[] getUpgradableVersionRange() { diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java index 27edd12aca93..de9f60cac4b3 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java @@ -36,7 +36,6 @@ public class Upgrade41500to41510 implements DbUpgrade, DbUpgradeSystemVmTemplate { final static Logger LOG = Logger.getLogger(Upgrade41500to41510.class); - private GuestOsMapper guestOsMapper = new GuestOsMapper(); @Override public String[] getUpgradableVersionRange() { @@ -66,6 +65,7 @@ public InputStream[] getPrepareScripts() { @Override public void performDataMigration(Connection conn) { + // nothing to do for this upgrade } @Override From f83f8d469bc9dcddf2272d2f4ffb2d0f15798cae Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Thu, 19 Jan 2023 14:07:12 +0100 Subject: [PATCH 8/8] imports --- .../src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java | 1 - .../src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java | 1 - 2 files changed, 2 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java index 214d0516d210..ba969ae879e2 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java @@ -29,7 +29,6 @@ import org.apache.log4j.Logger; -import com.cloud.upgrade.GuestOsMapper; import com.cloud.utils.exception.CloudRuntimeException; public class Upgrade41400to41500 implements DbUpgrade { diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java index de9f60cac4b3..344bbccc95b2 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java @@ -30,7 +30,6 @@ import org.apache.log4j.Logger; import com.cloud.hypervisor.Hypervisor; -import com.cloud.upgrade.GuestOsMapper; import com.cloud.utils.exception.CloudRuntimeException; public class Upgrade41500to41510 implements DbUpgrade, DbUpgradeSystemVmTemplate {