mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-02 20:02:29 +01:00
fix guestOsMapper and move mapping code to latest upgrade (#7095)
This commit is contained in:
dahn
GitHub
parent
07e4debeab
commit
221118289b
@ -53,22 +53,24 @@ public class GuestOsMapper {
|
|||||||
|
|
||||||
private long getGuestOsId(long categoryId, String displayName) {
|
private long getGuestOsId(long categoryId, String displayName) {
|
||||||
GuestOSVO guestOS = guestOSDao.findByCategoryIdAndDisplayNameOrderByCreatedDesc(categoryId, displayName);
|
GuestOSVO guestOS = guestOSDao.findByCategoryIdAndDisplayNameOrderByCreatedDesc(categoryId, displayName);
|
||||||
|
long id = 0l;
|
||||||
if (guestOS != null) {
|
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));
|
||||||
}
|
}
|
||||||
|
return id;
|
||||||
LOG.warn("Unable to find the guest OS details with category id: " + categoryId + " and display name: " + displayName);
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private long getGuestOsIdFromHypervisorMapping(GuestOSHypervisorMapping mapping) {
|
private long getGuestOsIdFromHypervisorMapping(GuestOSHypervisorMapping mapping) {
|
||||||
GuestOSHypervisorVO guestOSHypervisorVO = guestOSHypervisorDao.findByOsNameAndHypervisorOrderByCreatedDesc(mapping.getGuestOsName(), mapping.getHypervisorType(), mapping.getHypervisorVersion());
|
GuestOSHypervisorVO guestOSHypervisorVO = guestOSHypervisorDao.findByOsNameAndHypervisorOrderByCreatedDesc(mapping.getGuestOsName(), mapping.getHypervisorType(), mapping.getHypervisorVersion());
|
||||||
|
long id = 0;
|
||||||
if (guestOSHypervisorVO != null) {
|
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()));
|
||||||
}
|
}
|
||||||
|
return id;
|
||||||
LOG.debug("Unable to find the guest OS hypervisor mapping details for " + mapping.toString());
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addGuestOsAndHypervisorMappings(long categoryId, String displayName, List<GuestOSHypervisorMapping> mappings) {
|
public void addGuestOsAndHypervisorMappings(long categoryId, String displayName, List<GuestOSHypervisorMapping> mappings) {
|
||||||
|
|||||||
@ -29,14 +29,11 @@ import java.util.Map;
|
|||||||
|
|
||||||
import org.apache.log4j.Logger;
|
import org.apache.log4j.Logger;
|
||||||
|
|
||||||
import com.cloud.storage.GuestOSHypervisorMapping;
|
|
||||||
import com.cloud.upgrade.GuestOsMapper;
|
|
||||||
import com.cloud.utils.exception.CloudRuntimeException;
|
import com.cloud.utils.exception.CloudRuntimeException;
|
||||||
|
|
||||||
public class Upgrade41400to41500 implements DbUpgrade {
|
public class Upgrade41400to41500 implements DbUpgrade {
|
||||||
|
|
||||||
final static Logger LOG = Logger.getLogger(Upgrade41400to41500.class);
|
final static Logger LOG = Logger.getLogger(Upgrade41400to41500.class);
|
||||||
private GuestOsMapper guestOsMapper = new GuestOsMapper();
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] getUpgradableVersionRange() {
|
public String[] getUpgradableVersionRange() {
|
||||||
@ -67,7 +64,6 @@ public class Upgrade41400to41500 implements DbUpgrade {
|
|||||||
@Override
|
@Override
|
||||||
public void performDataMigration(Connection conn) {
|
public void performDataMigration(Connection conn) {
|
||||||
addRolePermissionsForNewReadOnlyAndSupportRoles(conn);
|
addRolePermissionsForNewReadOnlyAndSupportRoles(conn);
|
||||||
updateGuestOsMappings(conn);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addRolePermissionsForNewReadOnlyAndSupportRoles(final Connection conn) {
|
private void addRolePermissionsForNewReadOnlyAndSupportRoles(final Connection conn) {
|
||||||
@ -352,240 +348,6 @@ public class Upgrade41400to41500 implements DbUpgrade {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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<GuestOSHypervisorMapping> mappings = new ArrayList<GuestOSHypervisorMapping>();
|
|
||||||
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
|
@Override
|
||||||
public InputStream[] getCleanupScripts() {
|
public InputStream[] getCleanupScripts() {
|
||||||
final String scriptFile = "META-INF/db/schema-41400to41500-cleanup.sql";
|
final String scriptFile = "META-INF/db/schema-41400to41500-cleanup.sql";
|
||||||
|
|||||||
@ -22,24 +22,19 @@ import java.sql.Connection;
|
|||||||
import java.sql.PreparedStatement;
|
import java.sql.PreparedStatement;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.apache.log4j.Logger;
|
import org.apache.log4j.Logger;
|
||||||
|
|
||||||
import com.cloud.hypervisor.Hypervisor;
|
import com.cloud.hypervisor.Hypervisor;
|
||||||
import com.cloud.storage.GuestOSHypervisorMapping;
|
|
||||||
import com.cloud.upgrade.GuestOsMapper;
|
|
||||||
import com.cloud.utils.exception.CloudRuntimeException;
|
import com.cloud.utils.exception.CloudRuntimeException;
|
||||||
|
|
||||||
public class Upgrade41500to41510 implements DbUpgrade, DbUpgradeSystemVmTemplate {
|
public class Upgrade41500to41510 implements DbUpgrade, DbUpgradeSystemVmTemplate {
|
||||||
|
|
||||||
final static Logger LOG = Logger.getLogger(Upgrade41500to41510.class);
|
final static Logger LOG = Logger.getLogger(Upgrade41500to41510.class);
|
||||||
private GuestOsMapper guestOsMapper = new GuestOsMapper();
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] getUpgradableVersionRange() {
|
public String[] getUpgradableVersionRange() {
|
||||||
@ -69,8 +64,7 @@ public class Upgrade41500to41510 implements DbUpgrade, DbUpgradeSystemVmTemplate
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void performDataMigration(Connection conn) {
|
public void performDataMigration(Connection conn) {
|
||||||
correctGuestOsNames(conn);
|
// nothing to do for this upgrade
|
||||||
updateGuestOsMappings(conn);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -242,138 +236,6 @@ public class Upgrade41500to41510 implements DbUpgrade, DbUpgradeSystemVmTemplate
|
|||||||
LOG.debug("Updating System Vm Template IDs Complete");
|
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
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<GuestOSHypervisorMapping> mappings = new ArrayList<GuestOSHypervisorMapping>();
|
|
||||||
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
|
@Override
|
||||||
public InputStream[] getCleanupScripts() {
|
public InputStream[] getCleanupScripts() {
|
||||||
final String scriptFile = "META-INF/db/schema-41500to41510-cleanup.sql";
|
final String scriptFile = "META-INF/db/schema-41500to41510-cleanup.sql";
|
||||||
|
|||||||
@ -16,8 +16,6 @@
|
|||||||
// under the License.
|
// under the License.
|
||||||
package com.cloud.upgrade.dao;
|
package com.cloud.upgrade.dao;
|
||||||
|
|
||||||
import com.cloud.storage.GuestOSHypervisorMapping;
|
|
||||||
import com.cloud.upgrade.GuestOsMapper;
|
|
||||||
import com.cloud.utils.exception.CloudRuntimeException;
|
import com.cloud.utils.exception.CloudRuntimeException;
|
||||||
|
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
@ -28,7 +26,6 @@ import org.apache.log4j.Logger;
|
|||||||
public class Upgrade41510to41520 implements DbUpgrade {
|
public class Upgrade41510to41520 implements DbUpgrade {
|
||||||
|
|
||||||
final static Logger LOG = Logger.getLogger(Upgrade41510to41520.class);
|
final static Logger LOG = Logger.getLogger(Upgrade41510to41520.class);
|
||||||
private GuestOsMapper guestOsMapper = new GuestOsMapper();
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] getUpgradableVersionRange() {
|
public String[] getUpgradableVersionRange() {
|
||||||
@ -58,12 +55,7 @@ public class Upgrade41510to41520 implements DbUpgrade {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void performDataMigration(Connection conn) {
|
public void performDataMigration(Connection conn) {
|
||||||
correctGuestOsIdsInHypervisorMapping(conn);
|
// nothing to do
|
||||||
}
|
|
||||||
|
|
||||||
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
|
@Override
|
||||||
|
|||||||
@ -25,8 +25,6 @@ import java.sql.SQLException;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.cloud.storage.GuestOSHypervisorMapping;
|
|
||||||
import com.cloud.upgrade.GuestOsMapper;
|
|
||||||
import com.cloud.upgrade.RolePermissionChecker;
|
import com.cloud.upgrade.RolePermissionChecker;
|
||||||
import com.cloud.upgrade.SystemVmTemplateRegistration;
|
import com.cloud.upgrade.SystemVmTemplateRegistration;
|
||||||
import org.apache.cloudstack.acl.RoleType;
|
import org.apache.cloudstack.acl.RoleType;
|
||||||
@ -40,7 +38,6 @@ public class Upgrade41520to41600 implements DbUpgrade, DbUpgradeSystemVmTemplate
|
|||||||
final static Logger LOG = Logger.getLogger(Upgrade41520to41600.class);
|
final static Logger LOG = Logger.getLogger(Upgrade41520to41600.class);
|
||||||
private SystemVmTemplateRegistration systemVmTemplateRegistration;
|
private SystemVmTemplateRegistration systemVmTemplateRegistration;
|
||||||
private RolePermissionChecker rolePermissionChecker = new RolePermissionChecker();
|
private RolePermissionChecker rolePermissionChecker = new RolePermissionChecker();
|
||||||
private GuestOsMapper guestOsMapper = new GuestOsMapper();
|
|
||||||
|
|
||||||
public Upgrade41520to41600() {
|
public Upgrade41520to41600() {
|
||||||
}
|
}
|
||||||
@ -75,12 +72,6 @@ public class Upgrade41520to41600 implements DbUpgrade, DbUpgradeSystemVmTemplate
|
|||||||
public void performDataMigration(Connection conn) {
|
public void performDataMigration(Connection conn) {
|
||||||
generateUuidForExistingSshKeyPairs(conn);
|
generateUuidForExistingSshKeyPairs(conn);
|
||||||
populateAnnotationPermissions(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) {
|
private void populateAnnotationPermissions(Connection conn) {
|
||||||
|
|||||||
@ -17,8 +17,6 @@
|
|||||||
|
|
||||||
package com.cloud.upgrade.dao;
|
package com.cloud.upgrade.dao;
|
||||||
|
|
||||||
import com.cloud.storage.GuestOSHypervisorMapping;
|
|
||||||
import com.cloud.upgrade.GuestOsMapper;
|
|
||||||
import com.cloud.upgrade.SystemVmTemplateRegistration;
|
import com.cloud.upgrade.SystemVmTemplateRegistration;
|
||||||
import com.cloud.utils.exception.CloudRuntimeException;
|
import com.cloud.utils.exception.CloudRuntimeException;
|
||||||
import org.apache.log4j.Logger;
|
import org.apache.log4j.Logger;
|
||||||
@ -30,7 +28,6 @@ public class Upgrade41600to41610 implements DbUpgrade, DbUpgradeSystemVmTemplate
|
|||||||
|
|
||||||
final static Logger LOG = Logger.getLogger(Upgrade41600to41610.class);
|
final static Logger LOG = Logger.getLogger(Upgrade41600to41610.class);
|
||||||
private SystemVmTemplateRegistration systemVmTemplateRegistration;
|
private SystemVmTemplateRegistration systemVmTemplateRegistration;
|
||||||
private GuestOsMapper guestOsMapper = new GuestOsMapper();
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] getUpgradableVersionRange() {
|
public String[] getUpgradableVersionRange() {
|
||||||
@ -60,12 +57,7 @@ public class Upgrade41600to41610 implements DbUpgrade, DbUpgradeSystemVmTemplate
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void performDataMigration(Connection conn) {
|
public void performDataMigration(Connection conn) {
|
||||||
correctGuestOsIdsInHypervisorMapping(conn);
|
// nothing to do
|
||||||
}
|
|
||||||
|
|
||||||
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
|
@Override
|
||||||
|
|||||||
@ -16,6 +16,8 @@
|
|||||||
// under the License.
|
// under the License.
|
||||||
package com.cloud.upgrade.dao;
|
package com.cloud.upgrade.dao;
|
||||||
|
|
||||||
|
import com.cloud.storage.GuestOSHypervisorMapping;
|
||||||
|
import com.cloud.upgrade.GuestOsMapper;
|
||||||
import com.cloud.upgrade.SystemVmTemplateRegistration;
|
import com.cloud.upgrade.SystemVmTemplateRegistration;
|
||||||
import com.cloud.utils.exception.CloudRuntimeException;
|
import com.cloud.utils.exception.CloudRuntimeException;
|
||||||
import org.apache.cloudstack.api.response.UsageTypeResponse;
|
import org.apache.cloudstack.api.response.UsageTypeResponse;
|
||||||
@ -29,6 +31,7 @@ import java.sql.Connection;
|
|||||||
import java.sql.PreparedStatement;
|
import java.sql.PreparedStatement;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
@ -39,6 +42,8 @@ public class Upgrade41720to41800 implements DbUpgrade, DbUpgradeSystemVmTemplate
|
|||||||
|
|
||||||
final static Logger LOG = Logger.getLogger(Upgrade41720to41800.class);
|
final static Logger LOG = Logger.getLogger(Upgrade41720to41800.class);
|
||||||
|
|
||||||
|
private GuestOsMapper guestOsMapper = new GuestOsMapper();
|
||||||
|
|
||||||
private SystemVmTemplateRegistration systemVmTemplateRegistration;
|
private SystemVmTemplateRegistration systemVmTemplateRegistration;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -71,6 +76,9 @@ public class Upgrade41720to41800 implements DbUpgrade, DbUpgradeSystemVmTemplate
|
|||||||
public void performDataMigration(Connection conn) {
|
public void performDataMigration(Connection conn) {
|
||||||
convertQuotaTariffsToNewParadigm(conn);
|
convertQuotaTariffsToNewParadigm(conn);
|
||||||
convertVmResourcesQuotaTypesToRunningVmQuotaType(conn);
|
convertVmResourcesQuotaTypesToRunningVmQuotaType(conn);
|
||||||
|
correctGuestOsNames();
|
||||||
|
updateGuestOsMappings();
|
||||||
|
correctGuestOsIdsInHypervisorMapping(conn);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -230,4 +238,468 @@ public class Upgrade41720to41800 implements DbUpgrade, DbUpgradeSystemVmTemplate
|
|||||||
throw new CloudRuntimeException(message, e);
|
throw new CloudRuntimeException(message, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void correctGuestOsNames() {
|
||||||
|
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() {
|
||||||
|
LOG.debug("Updating guest OS mappings");
|
||||||
|
|
||||||
|
// Add support for SUSE Linux Enterprise Desktop 12 SP3 (64-bit) for Xenserver 8.1.0
|
||||||
|
List<GuestOSHypervisorMapping> mappings = new ArrayList<GuestOSHypervisorMapping>();
|
||||||
|
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) 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 and NeoKylin Linux Server 7 for Xenserver 8.1.0
|
||||||
|
mappings.add(new GuestOSHypervisorMapping("Xenserver", "8.1.0", "Scientific Linux 7"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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);
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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();
|
||||||
|
|
||||||
|
// 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"));
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
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"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user