Address comments

Author: vishesh92

engine/schema/src/main/resources/META-INF/db/schema-42100to42200.sql

@@ -21,3 +21,18 @@
 
 -- Increase length of scripts_version column to 128 due to md5sum to sha512sum change
 CALL `cloud`.`IDEMPOTENT_CHANGE_COLUMN`('cloud.domain_router', 'scripts_version', 'scripts_version', 'VARCHAR(128)');
+
+UPDATE `cloud`.`configuration`
+SET subgroup_id = (SELECT id FROM `cloud`.`configuration_subgroup` WHERE name = 'ConsoleProxyVM'),
+    group_id = (SELECT id FROM `cloud`.`configuration_group` WHERE name = 'System VMs')
+WHERE name = 'consoleproxy.userdata';
+
+UPDATE `cloud`.`configuration`
+SET subgroup_id = (SELECT id FROM `cloud`.`configuration_subgroup` WHERE name = 'SecStorageVM'),
+    group_id = (SELECT id FROM `cloud`.`configuration_group` WHERE name = 'System VMs')
+WHERE name = 'secstorage.userdata';
+
+UPDATE `cloud`.`configuration`
+SET subgroup_id = (SELECT id FROM `cloud`.`configuration_subgroup` WHERE name = 'VirtualRouter'),
+    group_id = (SELECT id FROM `cloud`.`configuration_group` WHERE name = 'System VMs')
+WHERE name = 'router.userdata';

framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java

@@ -42,6 +42,7 @@ public class ConfigKey<T> {
     public static final String CATEGORY_ALERT = "Alert";
     public static final String CATEGORY_NETWORK = "Network";
     public static final String CATEGORY_SYSTEM = "System";
+    public static final String CATEGORY_SECURE = "Secure";
 
     public enum Scope {
         Global(null, 1),

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -50,6 +50,9 @@
 import javax.naming.ConfigurationException;
 
 import com.cloud.consoleproxy.ConsoleProxyManager;
+import com.cloud.network.router.VirtualNetworkApplianceManager;
+import com.cloud.storage.secondary.SecondaryStorageVmManager;
+import com.cloud.vm.VirtualMachineManager;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.acl.SecurityChecker;
 import org.apache.cloudstack.affinity.AffinityGroup;
@@ -638,6 +641,11 @@ protected void overProvisioningFactorsForValidation() {
     protected void populateConfigKeysAllowedOnlyForDefaultAdmin() {
         configKeysAllowedOnlyForDefaultAdmin.add(AccountManagerImpl.listOfRoleTypesAllowedForOperationsOfSameRoleType.key());
         configKeysAllowedOnlyForDefaultAdmin.add(AccountManagerImpl.allowOperationsOnUsersInSameAccount.key());
+
+        configKeysAllowedOnlyForDefaultAdmin.add(VirtualMachineManager.SystemVmEnableUserData.key());
+        configKeysAllowedOnlyForDefaultAdmin.add(ConsoleProxyManager.ConsoleProxyUserData.key());
+        configKeysAllowedOnlyForDefaultAdmin.add(SecondaryStorageVmManager.SecondaryStorageUserData.key());
+        configKeysAllowedOnlyForDefaultAdmin.add(VirtualNetworkApplianceManager.RouterUserData.key());
     }
 
     private void initMessageBusListener() {

server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManager.java

@@ -93,7 +93,7 @@ public interface ConsoleProxyManager extends Manager, ConsoleProxyService {
     ConfigKey<String> ConsoleProxyManagementLastState = new ConfigKey<String>(ConfigKey.CATEGORY_ADVANCED, String.class, "consoleproxy.management.state.last", com.cloud.consoleproxy.ConsoleProxyManagementState.Auto.toString(),
             "last console proxy service management state", false, ConfigKey.Kind.Select, consoleProxyManagementStates);
 
-    ConfigKey<String> ConsoleProxyUserData = new ConfigKey<>(String.class, "consoleproxy.userdata", "Advanced", "",
+    ConfigKey<String> ConsoleProxyUserData = new ConfigKey<>(String.class, "consoleproxy.userdata", ConfigKey.CATEGORY_SECURE, "",
             "Default user data for console proxy VMs. This works only when systemvm.userdata.enabled is set to true.",
             true, ConfigKey.Scope.Zone, null);
 

server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManager.java

@@ -64,7 +64,7 @@ public interface VirtualNetworkApplianceManager extends Manager, VirtualNetworkA
     ConfigKey<String> RouterTemplateOvm3 = new ConfigKey<>(String.class, RouterTemplateOvm3CK, "Advanced", "SystemVM Template (Ovm3)",
             "Name of the default router template on Ovm3.", true, ConfigKey.Scope.Zone, null);
 
-    ConfigKey<String> RouterUserData = new ConfigKey<>(String.class, "router.userdata", "Advanced", "",
+    ConfigKey<String> RouterUserData = new ConfigKey<>(String.class, "router.userdata", ConfigKey.CATEGORY_SECURE, "",
             "Default user data for virtual router. This works only when systemvm.userdata.enabled is set to true.",
             true, ConfigKey.Scope.Zone, null);
 

server/src/main/java/com/cloud/storage/secondary/SecondaryStorageVmManager.java

@@ -44,7 +44,7 @@ public interface SecondaryStorageVmManager extends Manager {
             "The time interval(in millisecond) to scan whether or not system needs more SSVM to ensure minimal standby capacity",
             false);
 
-    ConfigKey<String> SecondaryStorageUserData = new ConfigKey<>(String.class, "secstorage.userdata", "Advanced", "",
+    ConfigKey<String> SecondaryStorageUserData = new ConfigKey<>(String.class, "secstorage.userdata", ConfigKey.CATEGORY_SECURE, "",
             "Default user data for secondary storage VMs. This works only when systemvm.userdata.enabled is set to true.", true, ConfigKey.Scope.Zone, null);