config and ui changes

Author: sureshanaparti

api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgGroupsByCmd.java

@@ -31,7 +31,7 @@
 
 import com.cloud.utils.Pair;
 
-@APICommand(name = ListCfgGroupsByCmd.APINAME, description = "Lists all configuration groups.", responseObject = ConfigurationGroupResponse.class,
+@APICommand(name = ListCfgGroupsByCmd.APINAME, description = "Lists all configuration groups (primarily used for UI).", responseObject = ConfigurationGroupResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.17.0")
 public class ListCfgGroupsByCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListCfgGroupsByCmd.class.getName());

api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java

@@ -93,13 +93,13 @@ public class ListCfgsByCmd extends BaseListCmd {
             description = "the ID of the Image Store to update the parameter value for corresponding image store")
     private Long imageStoreId;
 
-    @Parameter(name = ApiConstants.GROUP, type = CommandType.STRING, description = "lists configuration by group name", since = "4.17.0")
+    @Parameter(name = ApiConstants.GROUP, type = CommandType.STRING, description = "lists configuration by group name (primarily used for UI)", since = "4.17.0")
     private String groupName;
 
-    @Parameter(name = ApiConstants.SUBGROUP, type = CommandType.STRING, description = "lists configuration by subgroup name", since = "4.17.0")
+    @Parameter(name = ApiConstants.SUBGROUP, type = CommandType.STRING, description = "lists configuration by subgroup name (primarily used for UI)", since = "4.17.0")
     private String subGroupName;
 
-    @Parameter(name = ApiConstants.PARENT, type = CommandType.STRING, description = "lists configuration by parent name", since = "4.17.0")
+    @Parameter(name = ApiConstants.PARENT, type = CommandType.STRING, description = "lists configuration by parent name (primarily used for UI)", since = "4.17.0")
     private String parentName;
 
     // ///////////////////////////////////////////////////

engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java

@@ -265,7 +265,7 @@ Vlan createVlanAndPublicIpRange(long zoneId, long networkId, long physicalNetwor
 
     String getConfigurationType(String configName); // Value type
 
-    Pair<String, String> getConfigurationGroup(String configName);
+    Pair<String, String> getConfigurationGroupAndSubGroup(String configName);
 
     List<ConfigurationSubGroupVO> getConfigurationSubGroups(Long groupId);
 }

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41610to41700.java

@@ -113,14 +113,15 @@ private void updateConfigurationGroups(Connection conn) {
                 }
 
                 for (int index = 0; index < nameWords.length; index++) {
-                    Pair<Long, Long> configGroup = getConfigurationGroup(conn, nameWords[index]);
-                    if (configGroup.first() != 0 && configGroup.second() != 0) {
-                        stmt = "UPDATE `cloud`.`configuration` SET subgroup_id = ? , group_id = ? WHERE name = ?";
+                    Pair<Long, Long> configGroupAndSubGroup = getConfigurationGroupAndSubGroup(conn, nameWords[index]);
+                    if (configGroupAndSubGroup.first() != 1 && configGroupAndSubGroup.second() != 1) {
+                        stmt = "UPDATE `cloud`.`configuration` SET group_id = ?, subgroup_id = ? WHERE name = ?";
                         pstmt = conn.prepareStatement(stmt);
-                        pstmt.setLong(1, configGroup.first());
-                        pstmt.setLong(2, configGroup.second());
+                        pstmt.setLong(1, configGroupAndSubGroup.first());
+                        pstmt.setLong(2, configGroupAndSubGroup.second());
                         pstmt.setString(3, configName);
                         pstmt.executeUpdate();
+                        break;
                     }
                 }
             }
@@ -135,25 +136,25 @@ private void updateConfigurationGroups(Connection conn) {
         }
     }
 
-    private Pair<Long, Long> getConfigurationGroup(Connection conn, String subGroupName) {
-        Long subGroupId = 0L;
-        Long groupId = 0L;
+    private Pair<Long, Long> getConfigurationGroupAndSubGroup(Connection conn, String name) {
+        Long subGroupId = 1L;
+        Long groupId = 1L;
         try {
             String stmt = "SELECT id, group_id FROM `cloud`.`configuration_subgroup` WHERE name = ?";
             PreparedStatement pstmt = conn.prepareStatement(stmt);
-            pstmt.setString(1, subGroupName);
+            pstmt.setString(1, name);
             ResultSet rs = pstmt.executeQuery();
             if (rs.next()) {
                 subGroupId = rs.getLong(1);
                 groupId = rs.getLong(2);
             } else {
                 // Try with keywords in the configuration subgroup
-                stmt = "SELECT id, group_id, keywords FROM `cloud`.`configuration_subgroup`";
+                stmt = "SELECT id, group_id, keywords FROM `cloud`.`configuration_subgroup` WHERE keywords IS NOT NULL";
                 pstmt = conn.prepareStatement(stmt);
                 ResultSet rsConfigurationSubGroups = pstmt.executeQuery();
                 while (rsConfigurationSubGroups.next()) {
-                    subGroupId = rsConfigurationSubGroups.getLong(1);
-                    groupId = rsConfigurationSubGroups.getLong(2);
+                    Long keywordsSubGroupId = rsConfigurationSubGroups.getLong(1);
+                    Long keywordsGroupId = rsConfigurationSubGroups.getLong(2);
                     String keywords = rsConfigurationSubGroups.getString(3);
                     if(StringUtils.isBlank(keywords)) {
                         continue;
@@ -168,8 +169,10 @@ private Pair<Long, Long> getConfigurationGroup(Connection conn, String subGroupN
                     for (String configKeyword : keywordsList) {
                         if (StringUtils.isNotBlank(configKeyword)) {
                             configKeyword = configKeyword.strip();
-                            if (configKeyword.equalsIgnoreCase(subGroupName) || configKeyword.toLowerCase().startsWith(subGroupName.toLowerCase())) {
-                                break;
+                            if (configKeyword.equalsIgnoreCase(name) || configKeyword.toLowerCase().startsWith(name.toLowerCase())) {
+                                subGroupId = keywordsSubGroupId;
+                                groupId = keywordsGroupId;
+                                return new Pair<Long, Long>(groupId, subGroupId);
                             }
                         }
                     }
@@ -182,6 +185,6 @@ private Pair<Long, Long> getConfigurationGroup(Connection conn, String subGroupN
             LOG.error("Failed to get configuration subgroup due to " + e.getMessage(), e);
         }
 
-        return new Pair<Long, Long>(subGroupId, groupId);
+        return new Pair<Long, Long>(groupId, subGroupId);
     }
 }