From 5d3fae2fe4e1f5ed087b912808b05158d141cfe2 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Mon, 16 May 2011 19:53:12 +0530 Subject: [PATCH] bug 9250:Need a new Guest OS type for XenServer: "Other PV" adding new guest OS type "Other PV" --- .../com/cloud/hypervisor/xen/resource/CitrixHelper.java | 6 ++++++ setup/db/db/schema-224to225.sql | 7 +++++++ setup/db/templates.sql | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java index 8541a0067d9..aa9e584e8b8 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java @@ -94,6 +94,8 @@ public class CitrixHelper { _xcpGuestOsMap.put("Windows XP SP2 (32-bit)", "Windows XP SP2"); _xcpGuestOsMap.put("Windows XP SP3 (32-bit)", "Windows XP SP3"); _xcpGuestOsMap.put("Other install media", "Other install media"); + _xcpGuestOsMap.put("Other PV (32-bit)", "CentOS 5.5 (32-bit)"); + _xcpGuestOsMap.put("Other PV (64-bit)", "CentOS 5.5 (64-bit)"); } static { @@ -156,6 +158,8 @@ public class CitrixHelper { _xenServerGuestOsMap.put("Windows XP SP2 (32-bit)", "Windows XP SP2 (32-bit)"); _xenServerGuestOsMap.put("Windows XP SP3 (32-bit)", "Windows XP SP3 (32-bit)"); _xenServerGuestOsMap.put("Other install media", "Other install media"); + _xenServerGuestOsMap.put("Other PV (32-bit)", "CentOS 5.4 (32-bit)"); + _xenServerGuestOsMap.put("Other PV (64-bit)", "CentOS 5.4 (64-bit)"); // _xenServerGuestOsMap.put("Ubuntu 10.04 (32-bit)", "CentOS 5.3 (32-bit"); // _xenServerGuestOsMap.put("Ubuntu 10.04 (64-bit)", "CentOS 5.3 (64-bit"); } @@ -231,6 +235,8 @@ public class CitrixHelper { _xenServer56FP1GuestOsMap.put("Ubuntu Lucid Lynx 10.04 (32-bit)", "Ubuntu Lucid Lynx 10.04 (32-bit) (experimental)"); _xenServer56FP1GuestOsMap.put("Ubuntu Lucid Lynx 10.04 (64-bit)", "Ubuntu Lucid Lynx 10.04 (64-bit) (experimental)"); _xenServer56FP1GuestOsMap.put("Other install media", "Other install media"); + _xenServer56FP1GuestOsMap.put("Other PV (32-bit)", "CentOS 5.5 (32-bit)"); + _xenServer56FP1GuestOsMap.put("Other PV (64-bit)", "CentOS 5.5 (64-bit)"); // _xenServer56FP1GuestOsMap.put("Ubuntu 10.04 (32-bit)", "CentOS 5 (32-bit)"); // _xenServer56FP1GuestOsMap.put("Ubuntu 10.04 (64-bit)", "CentOS 5 (64-bit)"); } diff --git a/setup/db/db/schema-224to225.sql b/setup/db/db/schema-224to225.sql index 463501414bc..8c7d3043371 100644 --- a/setup/db/db/schema-224to225.sql +++ b/setup/db/db/schema-224to225.sql @@ -54,3 +54,10 @@ ALTER TABLE `cloud`.`vm_template` ADD COLUMN `source_template_id` bigint unsigne ALTER TABLE `cloud`.`op_dc_link_local_ip_address_alloc` ADD INDEX `i_op_dc_link_local_ip_address_alloc__pod_id`(`pod_id`); ALTER TABLE `cloud`.`op_dc_link_local_ip_address_alloc` ADD INDEX `i_op_dc_link_local_ip_address_alloc__data_center_id`(`data_center_id`); ALTER TABLE `cloud`.`op_dc_link_local_ip_address_alloc` ADD INDEX `i_op_dc_link_local_ip_address_alloc__nic_id_reservation_id`(`nic_id`,`reservation_id`); + +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (139, 7, 'Other PV (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (140, 7, 'Other PV (64-bit)'); + +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ('XenServer', 'Other PV (32-bit)', 139); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ('XenServer', 'Other PV (64-bit)', 140); + diff --git a/setup/db/templates.sql b/setup/db/templates.sql index d293fcead32..715ae134bbe 100755 --- a/setup/db/templates.sql +++ b/setup/db/templates.sql @@ -167,6 +167,8 @@ INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (135, 3, ' INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (136, 4, 'Red Hat Enterprise Linux 6.0 (32-bit)'); INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (137, 4, 'Red Hat Enterprise Linux 6.0 (64-bit)'); INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (138, 7, 'None'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (139, 7, 'Other PV (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (140, 7, 'Other PV (64-bit)'); INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("XenServer", 'CentOS 4.5 (32-bit)', 1); @@ -241,6 +243,8 @@ INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ('XenServer', 'Other install media', 129); INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ('XenServer', 'Other install media', 125); INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ('XenServer', 'Other install media', 130); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ('XenServer', 'Other PV (32-bit)', 139); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ('XenServer', 'Other PV (64-bit)', 140); INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows 7(32-bit)', 48);