merging fixes

Author: bernardodemarco

api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterUserKeyCmd.java

@@ -757,45 +757,3 @@ SET `cs`.`domain_id` = (
 
 -- 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';
-
--- Create "api_keypair" table for api and secret keys
-CREATE TABLE IF NOT EXISTS `cloud`.`api_keypair` (
-    `id` bigint(20) unsigned NOT NULL auto_increment,
-    `uuid` varchar(40) UNIQUE NOT NULL,
-    `name` varchar(255) NOT NULL,
-    `domain_id` bigint(20) unsigned NOT NULL,
-    `account_id` bigint(20) unsigned NOT NULL,
-    `user_id` bigint(20) unsigned NOT NULL,
-    `start_date` datetime,
-    `end_date` datetime,
-    `description` varchar(100),
-    `api_key` varchar(255) NOT NULL,
-    `secret_key` varchar(255) NOT NULL,
-    `created` datetime NOT NULL,
-    `removed` datetime,
-    PRIMARY KEY (`id`),
-    CONSTRAINT `fk_api_keypair__user_id` FOREIGN KEY(`user_id`) REFERENCES `cloud`.`user`(`id`),
-    CONSTRAINT `fk_api_keypair__account_id` FOREIGN KEY(`account_id`) REFERENCES `cloud`.`account`(`id`),
-    CONSTRAINT `fk_api_keypair__domain_id` FOREIGN KEY(`domain_id`) REFERENCES `cloud`.`domain`(`id`)
-);
-
-CREATE TABLE IF NOT EXISTS `cloud`.`api_keypair_permissions` (
-    `id` bigint(20) unsigned NOT NULL auto_increment,
-    `uuid` varchar(40) UNIQUE,
-    `sort_order` bigint(20) unsigned NOT NULL DEFAULT 0,
-    `rule` varchar(255) NOT NULL,
-    `api_keypair_id` bigint(20) unsigned NOT NULL,
-    `permission` varchar(255) NOT NULL,
-    `description` varchar(255),
-    PRIMARY KEY (`id`),
-    CONSTRAINT `fk_keypair_permissions__api_keypair_id` FOREIGN KEY(`api_keypair_id`) REFERENCES `cloud`.`api_keypair`(`id`)
-);
-
-INSERT INTO `cloud`.`api_keypair` (uuid, user_id, domain_id, account_id, api_key, secret_key, created, name)
-SELECT  uuid(), user.id, account.domain_id, account.id, user.api_key, user.secret_key, now(), 'Active key pair'
-FROM    `cloud`.`user` AS user
-JOIN    `cloud`.`account` AS account ON user.account_id = account.id
-WHERE   user.api_key IS NOT NULL
-  AND     user.secret_key IS NOT NULL;
-
-ALTER TABLE `cloud`.`user` DROP COLUMN api_key, DROP COLUMN secret_key;

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

@@ -39,3 +39,45 @@ CREATE TABLE IF NOT EXISTS `cloud`.`webhook_filter` (
     INDEX `i_webhook_filter__webhook_id`(`webhook_id`),
     CONSTRAINT `fk_webhook_filter__webhook_id` FOREIGN KEY(`webhook_id`) REFERENCES `webhook`(`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- Create "api_keypair" table for api and secret keys
+CREATE TABLE IF NOT EXISTS `cloud`.`api_keypair` (
+    `id` bigint(20) unsigned NOT NULL auto_increment,
+    `uuid` varchar(40) UNIQUE NOT NULL,
+    `name` varchar(255) NOT NULL,
+    `domain_id` bigint(20) unsigned NOT NULL,
+    `account_id` bigint(20) unsigned NOT NULL,
+    `user_id` bigint(20) unsigned NOT NULL,
+    `start_date` datetime,
+    `end_date` datetime,
+    `description` varchar(100),
+    `api_key` varchar(255) NOT NULL,
+    `secret_key` varchar(255) NOT NULL,
+    `created` datetime NOT NULL,
+    `removed` datetime,
+    PRIMARY KEY (`id`),
+    CONSTRAINT `fk_api_keypair__user_id` FOREIGN KEY(`user_id`) REFERENCES `cloud`.`user`(`id`),
+    CONSTRAINT `fk_api_keypair__account_id` FOREIGN KEY(`account_id`) REFERENCES `cloud`.`account`(`id`),
+    CONSTRAINT `fk_api_keypair__domain_id` FOREIGN KEY(`domain_id`) REFERENCES `cloud`.`domain`(`id`)
+);
+
+CREATE TABLE IF NOT EXISTS `cloud`.`api_keypair_permissions` (
+    `id` bigint(20) unsigned NOT NULL auto_increment,
+    `uuid` varchar(40) UNIQUE,
+    `sort_order` bigint(20) unsigned NOT NULL DEFAULT 0,
+    `rule` varchar(255) NOT NULL,
+    `api_keypair_id` bigint(20) unsigned NOT NULL,
+    `permission` varchar(255) NOT NULL,
+    `description` varchar(255),
+    PRIMARY KEY (`id`),
+    CONSTRAINT `fk_keypair_permissions__api_keypair_id` FOREIGN KEY(`api_keypair_id`) REFERENCES `cloud`.`api_keypair`(`id`)
+);
+
+INSERT INTO `cloud`.`api_keypair` (uuid, user_id, domain_id, account_id, api_key, secret_key, created, name)
+SELECT  uuid(), user.id, account.domain_id, account.id, user.api_key, user.secret_key, now(), 'Active key pair'
+FROM    `cloud`.`user` AS user
+JOIN    `cloud`.`account` AS account ON user.account_id = account.id
+WHERE   user.api_key IS NOT NULL
+  AND     user.secret_key IS NOT NULL;
+
+ALTER TABLE `cloud`.`user` DROP COLUMN api_key, DROP COLUMN secret_key;

engine/schema/src/main/resources/META-INF/db/schema-42210to42300.sql

@@ -114,7 +114,6 @@
 import com.cloud.network.Network;
 import com.cloud.network.Network.Capability;
 import com.cloud.network.Network.IpAddresses;
-import com.cloud.network.NetworkModel;
 import com.cloud.network.as.AutoScaleCounter.AutoScaleCounterParam;
 import com.cloud.network.as.dao.AutoScalePolicyConditionMapDao;
 import com.cloud.network.as.dao.AutoScalePolicyDao;

server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java

@@ -81,7 +81,7 @@
 import org.apache.cloudstack.api.command.admin.user.ListUserKeyRulesCmd;
 import org.apache.cloudstack.api.command.admin.user.ListUserKeysCmd;
 import org.apache.cloudstack.api.command.admin.user.MoveUserCmd;
-import org.apache.cloudstack.api.command.admin.user.RegisterUserKeyCmd;
+import org.apache.cloudstack.api.command.admin.user.RegisterUserKeysCmd;
 import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
 import org.apache.cloudstack.api.response.ApiKeyPairResponse;
 import org.apache.cloudstack.api.response.BaseRolePermissionResponse;