Skip to content

avoid hard coded guest OS IDs #7279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 3 commits into from
Feb 23, 2023
Merged

avoid hard coded guest OS IDs #7279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3495bd
avoid hard coded guest OS IDs
DaanHoogland Feb 22, 2023
6ab852f
add logging in case of missing hypervisor
DaanHoogland Feb 22, 2023
0a13424
warn -> error
DaanHoogland Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion engine/schema/src/main/java/com/cloud/upgrade/GuestOsMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,16 @@ private boolean addGuestOs(long categoryId, String displayName) {
guestOS = guestOSDao.persist(guestOS);
return (guestOS != null);
}
public void addGuestOsHypervisorMapping(GuestOSHypervisorMapping mapping, long category, String displayName) {
long guestOsId = getGuestOsId(category, displayName);
if (guestOsId == 0) {
LOG.error(String.format("no guest os found for category %d and name %s, skipping mapping it to %s/%s", guestOsId, displayName, mapping.getHypervisorType(), mapping.getHypervisorVersion()));
} else {
addGuestOsHypervisorMapping(mapping, guestOsId);
}
}

public void addGuestOsHypervisorMapping(GuestOSHypervisorMapping mapping, long guestOsId) {
private void addGuestOsHypervisorMapping(GuestOSHypervisorMapping mapping, long guestOsId) {
if(!isValidGuestOSHypervisorMapping(mapping)) {
return;
}
Expand Down
18 changes: 12 additions & 6 deletions engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,14 +283,18 @@ private void updateGuestOsMappings() {

// 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);
guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "CentOS 8"),
1, "CentOS 8");

// 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);
guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "Debian Buster 10"),
2, "Debian GNU/Linux 10 (32-bit)");
guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "Debian Buster 10"),
2, "Debian GNU/Linux 10 (64-bit)");

// 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);
guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "SUSE Linux Enterprise 15 (64-bit)"),
5, "SUSE Linux Enterprise Server 15 (64-bit)");

// 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"));
Expand All @@ -313,7 +317,8 @@ private void updateGuestOsMappings() {
mappings.clear();

// Add support for windows2019srv_64Guest from VMware 7.0
guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("VMware", "7.0", "windows2019srv_64Guest"), 276);
guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("VMware", "7.0", "windows2019srv_64Guest"),
6, "Windows Server 2019 (64-bit)");

// Add support for amazonlinux3_64Guest from VMware 7.0.1.0
mappings.add(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "amazonlinux3_64Guest"));
Expand Down Expand Up @@ -373,7 +378,8 @@ private void updateGuestOsMappings() {
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);
guestOsMapper.addGuestOsHypervisorMapping(new GuestOSHypervisorMapping("VMware", "7.0.1.0", "windows2019srvNext_64Guest"),
6, "Windows Server 2019 (64-bit)");

// 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
Expand Down