cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devd...@apache.org
Subject git commit: updated refs/heads/master to d6ebcd1
Date Fri, 09 Aug 2013 10:07:04 GMT
Updated Branches:
  refs/heads/master 0eb67bff1 -> d6ebcd192


CLOUDSTACK-4187: 2.2.1 - 4.2 Upgrade: Few Guest OS Types information is inconsistent on the
Upgraded Setup when compared with the fresh 4.2 Installation.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d6ebcd19
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d6ebcd19
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d6ebcd19

Branch: refs/heads/master
Commit: d6ebcd1924ad6fb0638a22386c921399fc68ae2d
Parents: 0eb67bf
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Authored: Thu Aug 8 17:38:54 2013 +0530
Committer: Devdeep Singh <devdeep@gmail.com>
Committed: Fri Aug 9 15:27:56 2013 +0530

----------------------------------------------------------------------
 .../com/cloud/hypervisor/xen/resource/CitrixHelper.java   | 10 ++++++++++
 setup/db/db/schema-410to420.sql                           |  2 ++
 setup/db/templates.sql                                    |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d6ebcd19/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
index bb7f340..eec957b 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
@@ -258,10 +258,15 @@ public class CitrixHelper {
         _xenServerGuestOsMap.put("Windows 7 (64-bit)", "Windows 7 (64-bit)");
         _xenServerGuestOsMap.put("Windows Server 2003 (32-bit)", "Windows Server 2003 (32-bit)");
         _xenServerGuestOsMap.put("Windows Server 2003 (64-bit)", "Windows Server 2003 (64-bit)");
+        _xenServerGuestOsMap.put("Windows Server 2003 Enterprise Edition(32-bit)", "Windows
Server 2003 (32-bit)");
+        _xenServerGuestOsMap.put("Windows Server 2003 Enterprise Edition(64-bit)", "Windows
Server 2003 (64-bit)");
+        _xenServerGuestOsMap.put("Windows Server 2003 DataCenter Edition(32-bit)", "Windows
Server 2003 (32-bit)");
+        _xenServerGuestOsMap.put("Windows Server 2003 DataCenter Edition(64-bit)", "Windows
Server 2003 (64-bit)");
         _xenServerGuestOsMap.put("Windows Server 2008 (32-bit)", "Windows Server 2008 (32-bit)");
         _xenServerGuestOsMap.put("Windows Server 2008 (64-bit)", "Windows Server 2008 (64-bit)");
         _xenServerGuestOsMap.put("Windows Server 2008 R2 (64-bit)", "Windows Server 2008
R2 (64-bit)");
         _xenServerGuestOsMap.put("Windows 2000 SP4 (32-bit)", "Windows 2000 SP4 (32-bit)");
+        _xenServerGuestOsMap.put("Windows 2000 Server SP4 (32-bit)", "Windows 2000 SP4 (32-bit)");
         _xenServerGuestOsMap.put("Windows Vista (32-bit)", "Windows Vista (32-bit)");
         _xenServerGuestOsMap.put("Windows XP SP2 (32-bit)", "Windows XP SP2 (32-bit)");
         _xenServerGuestOsMap.put("Windows XP SP3 (32-bit)", "Windows XP SP3 (32-bit)");
@@ -335,10 +340,15 @@ public class CitrixHelper {
         _xenServer56FP1GuestOsMap.put("Windows 7 (64-bit)", "Windows 7 (64-bit)");
         _xenServer56FP1GuestOsMap.put("Windows Server 2003 (32-bit)", "Windows Server 2003
(32-bit)");
         _xenServer56FP1GuestOsMap.put("Windows Server 2003 (64-bit)", "Windows Server 2003
(64-bit)");
+        _xenServer56FP1GuestOsMap.put("Windows Server 2003 Enterprise Edition(32-bit)", "Windows
Server 2003 (32-bit)");
+        _xenServer56FP1GuestOsMap.put("Windows Server 2003 Enterprise Edition(64-bit)", "Windows
Server 2003 (64-bit)");
+        _xenServer56FP1GuestOsMap.put("Windows Server 2003 DataCenter Edition(32-bit)", "Windows
Server 2003 (32-bit)");
+        _xenServer56FP1GuestOsMap.put("Windows Server 2003 DataCenter Edition(64-bit)", "Windows
Server 2003 (64-bit)");
         _xenServer56FP1GuestOsMap.put("Windows Server 2008 (32-bit)", "Windows Server 2008
(32-bit)");
         _xenServer56FP1GuestOsMap.put("Windows Server 2008 (64-bit)", "Windows Server 2008
(64-bit)");
         _xenServer56FP1GuestOsMap.put("Windows Server 2008 R2 (64-bit)", "Windows Server
2008 R2 (64-bit)");
         _xenServer56FP1GuestOsMap.put("Windows 2000 SP4 (32-bit)", "Windows 2000 SP4 (32-bit)");
+        _xenServer56FP1GuestOsMap.put("Windows 2000 Server SP4 (32-bit)", "Windows 2000 SP4
(32-bit)");
         _xenServer56FP1GuestOsMap.put("Windows Vista (32-bit)", "Windows Vista (32-bit)");
         _xenServer56FP1GuestOsMap.put("Windows XP SP3 (32-bit)", "Windows XP SP3 (32-bit)");
         _xenServer56FP1GuestOsMap.put("Ubuntu 10.04 (32-bit)", "Ubuntu Lucid Lynx 10.04 (32-bit)
(experimental)");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d6ebcd19/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index c77419c..55f3c18 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -298,6 +298,8 @@ UPDATE `cloud`.`vm_template` set guest_os_id = 166 where guest_os_id =
206;
 UPDATE `cloud`.`vm_instance` set guest_os_id = 166 where guest_os_id = 206;
 DELETE IGNORE FROM `cloud`.`guest_os` where id=206;
 
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (141,
UUID(), 1, 'CentOS 5.6 (32-bit)');
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (142,
UUID(), 1, 'CentOS 5.6 (64-bit)');
 INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (169,
UUID(), 10, 'Ubuntu 11.04 (32-bit)');
 INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (170,
UUID(), 10, 'Ubuntu 11.04 (64-bit)');
 INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (171,
UUID(), 1, 'CentOS 6.3 (32-bit)');

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d6ebcd19/setup/db/templates.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.sql b/setup/db/templates.sql
index e030852..5bc2f67 100755
--- a/setup/db/templates.sql
+++ b/setup/db/templates.sql
@@ -109,7 +109,7 @@ INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES
(55,
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (56, UUID(),
6, 'Windows Vista (32-bit)');
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (57, UUID(),
6, 'Windows XP SP2 (32-bit)');
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (58, UUID(),
6, 'Windows XP SP3 (32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (59, UUID(),
10, 'Other Ubuntu (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (59, UUID(),
7, 'Other Ubuntu (32-bit)');
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (60, UUID(),
7, 'Other (32-bit)');
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (61, UUID(),
6, 'Windows 2000 Server');
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (62, UUID(),
6, 'Windows 98');


Mime
View raw message