move changes to 4.21

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCategoryCmd.java

@@ -35,7 +35,7 @@
         responseObject = GuestOSCategoryResponse.class,
         requestHasSensitiveInfo = false,
         responseHasSensitiveInfo = false,
-        since = "4.20.1",
+        since = "4.21.0",
         authorized = {RoleType.Admin})
 public class AddGuestOsCategoryCmd extends BaseCmd {
 

api/src/main/java/org/apache/cloudstack/api/command/admin/guest/DeleteGuestOsCategoryCmd.java

@@ -36,7 +36,7 @@
         responseObject = SuccessResponse.class,
         requestHasSensitiveInfo = false,
         responseHasSensitiveInfo = false,
-        since = "4.20.1",
+        since = "4.21.0",
         authorized = {RoleType.Admin})
 public class DeleteGuestOsCategoryCmd extends BaseCmd {
 

api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCategoryCmd.java

@@ -35,7 +35,7 @@
         responseObject = GuestOSCategoryResponse.class,
         requestHasSensitiveInfo = false,
         responseHasSensitiveInfo = false,
-        since = "4.20.1",
+        since = "4.21.0",
         authorized = {RoleType.Admin})
 public class UpdateGuestOsCategoryCmd extends BaseCmd {
 

api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java

@@ -60,7 +60,7 @@ public class UpdateGuestOsCmd extends BaseAsyncCmd {
     private Boolean display;
 
     @Parameter(name = ApiConstants.OS_CATEGORY_ID, type = CommandType.UUID, entityType = GuestOSCategoryResponse.class,
-            description = "the ID of the OS category", since = "4.20.1")
+            description = "the ID of the OS category", since = "4.21.0")
     private Long osCategoryId;
 
 

api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java

@@ -50,13 +50,13 @@ public class ListGuestOsCategoriesCmd extends BaseListCmd {
     @Parameter(name = ApiConstants.IS_FEATURED,
             type = CommandType.BOOLEAN,
             description = "List available OS categories by featured or not",
-            since = "4.20.1")
+            since = "4.21.0")
     private Boolean featured;
 
     @Parameter(name = ApiConstants.IS_ISO,
             type = CommandType.BOOLEAN,
             description = "List OS categories for which an ISO is available",
-            since = "4.20.1")
+            since = "4.21.0")
     private Boolean iso;
 
     @Parameter(name = ApiConstants.IS_VNF, type = CommandType.BOOLEAN,
@@ -68,19 +68,19 @@ public class ListGuestOsCategoriesCmd extends BaseListCmd {
             type = CommandType.UUID,
             entityType = ZoneResponse.class,
             description = "List available OS categories types for the zone",
-            since = "4.20.1")
+            since = "4.21.0")
     private Long zoneId;
 
     @Parameter(name = ApiConstants.ARCH,
             type = CommandType.STRING,
             description = "List OS categories types available for given CPU architecture",
-            since = "4.20.1")
+            since = "4.21.0")
     private String arch;
 
     @Parameter(name = ApiConstants.SHOW_RESOURCE_ICON,
             type = CommandType.BOOLEAN,
             description = "flag to display the resource image for the OS category",
-            since = "4.20.1")
+            since = "4.21.0")
     private Boolean showIcon;
 
     /////////////////////////////////////////////////////

api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java

@@ -99,7 +99,7 @@ public class ListIsosCmd extends BaseListTaggedResourcesCmd implements UserCmd {
 
     @Parameter(name = ApiConstants.OS_CATEGORY_ID, type = CommandType.UUID, entityType= GuestOSCategoryResponse.class,
             description = "the ID of the OS category for the ISO",
-            since = "4.20.1")
+            since = "4.21.0")
     private Long osCategoryId;
 
     /////////////////////////////////////////////////////

api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java

@@ -115,7 +115,7 @@ public class ListTemplatesCmd extends BaseListTaggedResourcesCmd implements User
 
     @Parameter(name = ApiConstants.OS_CATEGORY_ID, type = CommandType.UUID, entityType= GuestOSCategoryResponse.class,
             description = "the ID of the OS category for the template",
-            since = "4.20.1")
+            since = "4.21.0")
     private Long osCategoryId;
 
     /////////////////////////////////////////////////////

api/src/main/java/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java

@@ -38,11 +38,11 @@ public class GuestOSCategoryResponse extends BaseResponse implements SetResource
     private String name;
 
     @SerializedName(ApiConstants.IS_FEATURED)
-    @Param(description = "Whether the OS category is featured", since = "4.20.1")
+    @Param(description = "Whether the OS category is featured", since = "4.21.0")
     private Boolean featured;
 
     @SerializedName(ApiConstants.RESOURCE_ICON)
-    @Param(description = "Base64 string representation of the resource icon", since = "4.20.1")
+    @Param(description = "Base64 string representation of the resource icon", since = "4.21.0")
     private ResourceIconResponse resourceIconResponse;
 
     @SerializedName(ApiConstants.CREATED)

engine/schema/src/main/resources/META-INF/db/schema-42000to42010.sql

@@ -131,93 +131,3 @@ CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Support Admin - Default', 'vali
 
 -- Re-apply VPC: update default network offering for vpc tier to conserve_mode=1 (#8309)
 UPDATE `cloud`.`network_offerings` SET conserve_mode=1 WHERE name='DefaultIsolatedNetworkOfferingForVpcNetworks';
-
--- Add featured column for guest_os_category
-CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os_category', 'featured', 'tinyint(1) NOT NULL DEFAULT 0 COMMENT "whether the category is featured or not" AFTER `uuid`');
-CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os_category', 'sort_key', 'int NOT NULL DEFAULT 0 COMMENT "sort key used for customising sort method" AFTER `featured`');
-CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os_category', 'created', 'date COMMENT "date on which the category was created" AFTER `sort_key`');
-CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os_category', 'removed', 'date COMMENT "date removed if not null" AFTER `created`');
-UPDATE `cloud`.`guest_os_category` SET `featured` = 1 WHERE `name` NOT IN ('Novel', 'None');
-
--- Begin: Changes for Guest OS category cleanup
--- Add new OS categories if not present
-DROP PROCEDURE IF EXISTS `cloud`.`INSERT_CATEGORY_IF_NOT_EXIST`;
-CREATE PROCEDURE `cloud`.`INSERT_CATEGORY_IF_NOT_EXIST`(IN os_name VARCHAR(255))
-BEGIN
-    IF NOT EXISTS ((SELECT 1 FROM `cloud`.`guest_os_category` WHERE name = os_name))
-    THEN
-        INSERT INTO `cloud`.`guest_os_category` (name, uuid)
-            VALUES (os_name, UUID())
-;   END IF
-; END;
-
-CALL `cloud`.`INSERT_CATEGORY_IF_NOT_EXIST`('Fedora');
-CALL `cloud`.`INSERT_CATEGORY_IF_NOT_EXIST`('Rocky Linux');
-CALL `cloud`.`INSERT_CATEGORY_IF_NOT_EXIST`('Alma Linux');
-
--- Move existing guest OS to new categories
-DROP PROCEDURE IF EXISTS `cloud`.`UPDATE_CATEGORY_FOR_GUEST_OSES`;
-CREATE PROCEDURE `cloud`.`UPDATE_CATEGORY_FOR_GUEST_OSES`(IN category_name VARCHAR(255), IN os_name VARCHAR(255))
-BEGIN
-    DECLARE category_id BIGINT
-;   SELECT `id` INTO category_id
-    FROM `cloud`.`guest_os_category`
-    WHERE `name` = category_name
-    LIMIT 1
-;   IF category_id IS NULL THEN
-        SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'Category not found'
-;   END IF
-;   UPDATE `cloud`.`guest_os`
-    SET `category_id` = category_id
-    WHERE `display_name` LIKE CONCAT('%', os_name, '%')
-; END;
-CALL `cloud`.`UPDATE_CATEGORY_FOR_GUEST_OSES`('Rocky Linux', 'Rocky Linux');
-CALL `cloud`.`UPDATE_CATEGORY_FOR_GUEST_OSES`('Alma Linux', 'Alma Linux');
-CALL `cloud`.`UPDATE_CATEGORY_FOR_GUEST_OSES`('Fedora', 'Fedora');
-
--- Move existing guest OS whose category will be deleted to Other category
-DROP PROCEDURE IF EXISTS `cloud`.`UPDATE_NEW_AND_DELETE_OLD_CATEGORY_FOR_GUEST_OS`;
-CREATE PROCEDURE `cloud`.`UPDATE_NEW_AND_DELETE_OLD_CATEGORY_FOR_GUEST_OS`(IN to_category_name VARCHAR(255), IN from_category_name VARCHAR(255))
-BEGIN
-    DECLARE done INT DEFAULT 0
-;   DECLARE to_category_id BIGINT
-;   SELECT id INTO to_category_id
-    FROM `cloud`.`guest_os_category`
-    WHERE `name` = to_category_name
-    LIMIT 1
-;   IF to_category_id IS NULL THEN
-        SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'ToCategory not found'
-;   END IF
-;   UPDATE `cloud`.`guest_os`
-    SET `category_id` = to_category_id
-    WHERE `category_id` = (SELECT `id` FROM `cloud`.`guest_os_category` WHERE `name` = from_category_name)
-;   UPDATE `cloud`.`guest_os_category` SET `removed``=now() WHERE `name` = from_category_name
-; END;
-CALL `cloud`.`UPDATE_NEW_AND_DELETE_OLD_CATEGORY_FOR_GUEST_OS`('Other', 'Novel');
-CALL `cloud`.`UPDATE_NEW_AND_DELETE_OLD_CATEGORY_FOR_GUEST_OS`('Other', 'None');
-CALL `cloud`.`UPDATE_NEW_AND_DELETE_OLD_CATEGORY_FOR_GUEST_OS`('Other', 'Unix');
-CALL `cloud`.`UPDATE_NEW_AND_DELETE_OLD_CATEGORY_FOR_GUEST_OS`('Other', 'Mac');
-
--- Add featured column for cloud.guest_os_category
-CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os_category', 'featured', 'tinyint(1) NOT NULL DEFAULT 0 COMMENT "whether the category is featured or not" AFTER `uuid`');
-UPDATE `cloud`.`guest_os_category` SET featured = 1;
--- Add sort_key column for cloud.guest_os_category
-CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os_category', 'sort_key', 'int NOT NULL DEFAULT 0 COMMENT "sort key used for customising sort method" AFTER `featured`');
-
--- Update sort order for all guest OS categories
-UPDATE `cloud`.`guest_os_category`
-SET `sort_key` = CASE
-    WHEN `name` = 'Ubuntu' THEN 1
-    WHEN `name` = 'Debian' THEN 2
-    WHEN `name` = 'Fedora' THEN 3
-    WHEN `name` = 'CentOS' THEN 4
-    WHEN `name` = 'Rocky Linux' THEN 5
-    WHEN `name` = 'Alma Linux' THEN 6
-    WHEN `name` = 'Oracle' THEN 7
-    WHEN `name` = 'RedHat' THEN 8
-    WHEN `name` = 'SUSE' THEN 9
-    WHEN `name` = 'Windows' THEN 10
-    WHEN `name` = 'Other' THEN 11
-    ELSE `sort_key`
-END;
--- End: Changes for Guest OS category cleanup

engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql

@@ -80,3 +80,93 @@ CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.host', 'storage_access_groups', 'var
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.cluster', 'storage_access_groups', 'varchar(255) DEFAULT NULL COMMENT "storage access groups for the hosts in the cluster"');
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.host_pod_ref', 'storage_access_groups', 'varchar(255) DEFAULT NULL COMMENT "storage access groups for the hosts in the pod"');
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.data_center', 'storage_access_groups', 'varchar(255) DEFAULT NULL COMMENT "storage access groups for the hosts in the zone"');
+
+-- Add featured column for guest_os_category
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os_category', 'featured', 'tinyint(1) NOT NULL DEFAULT 0 COMMENT "whether the category is featured or not" AFTER `uuid`');
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os_category', 'sort_key', 'int NOT NULL DEFAULT 0 COMMENT "sort key used for customising sort method" AFTER `featured`');
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os_category', 'created', 'date COMMENT "date on which the category was created" AFTER `sort_key`');
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os_category', 'removed', 'date COMMENT "date removed if not null" AFTER `created`');
+UPDATE `cloud`.`guest_os_category` SET `featured` = 1 WHERE `name` NOT IN ('Novel', 'None');
+
+-- Begin: Changes for Guest OS category cleanup
+-- Add new OS categories if not present
+DROP PROCEDURE IF EXISTS `cloud`.`INSERT_CATEGORY_IF_NOT_EXIST`;
+CREATE PROCEDURE `cloud`.`INSERT_CATEGORY_IF_NOT_EXIST`(IN os_name VARCHAR(255))
+BEGIN
+    IF NOT EXISTS ((SELECT 1 FROM `cloud`.`guest_os_category` WHERE name = os_name))
+    THEN
+        INSERT INTO `cloud`.`guest_os_category` (name, uuid)
+            VALUES (os_name, UUID())
+;   END IF
+; END;
+
+CALL `cloud`.`INSERT_CATEGORY_IF_NOT_EXIST`('Fedora');
+CALL `cloud`.`INSERT_CATEGORY_IF_NOT_EXIST`('Rocky Linux');
+CALL `cloud`.`INSERT_CATEGORY_IF_NOT_EXIST`('Alma Linux');
+
+-- Move existing guest OS to new categories
+DROP PROCEDURE IF EXISTS `cloud`.`UPDATE_CATEGORY_FOR_GUEST_OSES`;
+CREATE PROCEDURE `cloud`.`UPDATE_CATEGORY_FOR_GUEST_OSES`(IN category_name VARCHAR(255), IN os_name VARCHAR(255))
+BEGIN
+    DECLARE category_id BIGINT
+;   SELECT `id` INTO category_id
+    FROM `cloud`.`guest_os_category`
+    WHERE `name` = category_name
+    LIMIT 1
+;   IF category_id IS NULL THEN
+        SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'Category not found'
+;   END IF
+;   UPDATE `cloud`.`guest_os`
+    SET `category_id` = category_id
+    WHERE `display_name` LIKE CONCAT('%', os_name, '%')
+; END;
+CALL `cloud`.`UPDATE_CATEGORY_FOR_GUEST_OSES`('Rocky Linux', 'Rocky Linux');
+CALL `cloud`.`UPDATE_CATEGORY_FOR_GUEST_OSES`('Alma Linux', 'Alma Linux');
+CALL `cloud`.`UPDATE_CATEGORY_FOR_GUEST_OSES`('Fedora', 'Fedora');
+
+-- Move existing guest OS whose category will be deleted to Other category
+DROP PROCEDURE IF EXISTS `cloud`.`UPDATE_NEW_AND_DELETE_OLD_CATEGORY_FOR_GUEST_OS`;
+CREATE PROCEDURE `cloud`.`UPDATE_NEW_AND_DELETE_OLD_CATEGORY_FOR_GUEST_OS`(IN to_category_name VARCHAR(255), IN from_category_name VARCHAR(255))
+BEGIN
+    DECLARE done INT DEFAULT 0
+;   DECLARE to_category_id BIGINT
+;   SELECT id INTO to_category_id
+    FROM `cloud`.`guest_os_category`
+    WHERE `name` = to_category_name
+    LIMIT 1
+;   IF to_category_id IS NULL THEN
+        SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'ToCategory not found'
+;   END IF
+;   UPDATE `cloud`.`guest_os`
+    SET `category_id` = to_category_id
+    WHERE `category_id` = (SELECT `id` FROM `cloud`.`guest_os_category` WHERE `name` = from_category_name)
+;   UPDATE `cloud`.`guest_os_category` SET `removed``=now() WHERE `name` = from_category_name
+; END;
+CALL `cloud`.`UPDATE_NEW_AND_DELETE_OLD_CATEGORY_FOR_GUEST_OS`('Other', 'Novel');
+CALL `cloud`.`UPDATE_NEW_AND_DELETE_OLD_CATEGORY_FOR_GUEST_OS`('Other', 'None');
+CALL `cloud`.`UPDATE_NEW_AND_DELETE_OLD_CATEGORY_FOR_GUEST_OS`('Other', 'Unix');
+CALL `cloud`.`UPDATE_NEW_AND_DELETE_OLD_CATEGORY_FOR_GUEST_OS`('Other', 'Mac');
+
+-- Add featured column for cloud.guest_os_category
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os_category', 'featured', 'tinyint(1) NOT NULL DEFAULT 0 COMMENT "whether the category is featured or not" AFTER `uuid`');
+UPDATE `cloud`.`guest_os_category` SET featured = 1;
+-- Add sort_key column for cloud.guest_os_category
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os_category', 'sort_key', 'int NOT NULL DEFAULT 0 COMMENT "sort key used for customising sort method" AFTER `featured`');
+
+-- Update sort order for all guest OS categories
+UPDATE `cloud`.`guest_os_category`
+SET `sort_key` = CASE
+    WHEN `name` = 'Ubuntu' THEN 1
+    WHEN `name` = 'Debian' THEN 2
+    WHEN `name` = 'Fedora' THEN 3
+    WHEN `name` = 'CentOS' THEN 4
+    WHEN `name` = 'Rocky Linux' THEN 5
+    WHEN `name` = 'Alma Linux' THEN 6
+    WHEN `name` = 'Oracle' THEN 7
+    WHEN `name` = 'RedHat' THEN 8
+    WHEN `name` = 'SUSE' THEN 9
+    WHEN `name` = 'Windows' THEN 10
+    WHEN `name` = 'Other' THEN 11
+    ELSE `sort_key`
+END;
+-- End: Changes for Guest OS category cleanup