ui alignment and test changes

Author: sureshanaparti

framework/config/src/main/java/org/apache/cloudstack/framework/config/dao/ConfigurationGroupDaoImpl.java

@@ -18,21 +18,26 @@
 
 import org.apache.cloudstack.framework.config.impl.ConfigurationGroupVO;
 import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
 
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 
+@Component
 public class ConfigurationGroupDaoImpl extends GenericDaoBase<ConfigurationGroupVO, Long> implements ConfigurationGroupDao {
     private static final Logger s_logger = Logger.getLogger(ConfigurationGroupDaoImpl.class);
 
     final SearchBuilder<ConfigurationGroupVO> NameSearch;
 
     public ConfigurationGroupDaoImpl() {
+        super();
+
         NameSearch = createSearchBuilder();
         NameSearch.and("name", NameSearch.entity().getName(), SearchCriteria.Op.EQ);
     }
 
+    @Override
     public ConfigurationGroupVO findByName(String name) {
         SearchCriteria<ConfigurationGroupVO> sc = NameSearch.create();
         sc.setParameters("name", name);

framework/config/src/main/java/org/apache/cloudstack/framework/config/dao/ConfigurationSubGroupDaoImpl.java

@@ -22,12 +22,14 @@
 import org.apache.cloudstack.framework.config.impl.ConfigurationSubGroupVO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
 
 import com.cloud.utils.db.Filter;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 
+@Component
 public class ConfigurationSubGroupDaoImpl extends GenericDaoBase<ConfigurationSubGroupVO, Long> implements ConfigurationSubGroupDao {
     private static final Logger s_logger = Logger.getLogger(ConfigurationSubGroupDaoImpl.class);
 
@@ -36,6 +38,8 @@ public class ConfigurationSubGroupDaoImpl extends GenericDaoBase<ConfigurationSu
     final SearchBuilder<ConfigurationSubGroupVO> NameAndGroupSearch;
 
     public ConfigurationSubGroupDaoImpl() {
+        super();
+
         NameSearch = createSearchBuilder();
         NameSearch.and("name", NameSearch.entity().getName(), SearchCriteria.Op.LIKE);
         NameSearch.done();

server/src/test/java/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java

@@ -19,6 +19,8 @@
 
 import java.io.IOException;
 
+import org.apache.cloudstack.framework.config.dao.ConfigurationGroupDaoImpl;
+import org.apache.cloudstack.framework.config.dao.ConfigurationSubGroupDaoImpl;
 import org.mockito.Mockito;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -70,8 +72,8 @@
 import com.cloud.vm.dao.VMInstanceDaoImpl;
 
 @Configuration
-@ComponentScan(basePackageClasses = {SecurityGroupRulesDaoImpl.class, UserVmDaoImpl.class, AccountDaoImpl.class, ConfigurationDaoImpl.class,
-    SecurityGroupWorkDaoImpl.class, VmRulesetLogDaoImpl.class, VMInstanceDaoImpl.class, DomainDaoImpl.class, UsageEventDaoImpl.class,
+@ComponentScan(basePackageClasses = {SecurityGroupRulesDaoImpl.class, UserVmDaoImpl.class, AccountDaoImpl.class, ConfigurationDaoImpl.class, ConfigurationGroupDaoImpl.class,
+    ConfigurationSubGroupDaoImpl.class, SecurityGroupWorkDaoImpl.class, VmRulesetLogDaoImpl.class, VMInstanceDaoImpl.class, DomainDaoImpl.class, UsageEventDaoImpl.class,
     ResourceTagsDaoImpl.class, HostDaoImpl.class, HostDetailsDaoImpl.class, HostTagsDaoImpl.class, ClusterDaoImpl.class, HostPodDaoImpl.class,
     DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class, HostTransferMapDaoImpl.class, SecurityGroupManagerImpl2.class, SecurityGroupDaoImpl.class,
     SecurityGroupVMMapDaoImpl.class, UserVmDetailsDaoImpl.class, DataCenterIpAddressDaoImpl.class, DataCenterLinkLocalIpAddressDaoImpl.class,

server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java

@@ -37,6 +37,8 @@
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.ScopedConfigStorage;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.framework.config.dao.ConfigurationGroupDao;
+import org.apache.cloudstack.framework.config.dao.ConfigurationSubGroupDao;
 import org.apache.cloudstack.framework.config.impl.ConfigDepotImpl;
 import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
@@ -116,6 +118,10 @@ public class FirstFitPlannerTest {
     @Inject
     ConfigurationDao configDao;
     @Inject
+    ConfigurationGroupDao configGroupDao;
+    @Inject
+    ConfigurationSubGroupDao configSubGroupDao;
+    @Inject
     CapacityDao capacityDao;
     @Inject
     AccountManager accountMgr;
@@ -431,6 +437,16 @@ public ConfigurationDao configurationDao() {
             return Mockito.mock(ConfigurationDao.class);
         }
 
+        @Bean
+        public ConfigurationGroupDao configurationGroupDao() {
+            return Mockito.mock(ConfigurationGroupDao.class);
+        }
+
+        @Bean
+        public ConfigurationSubGroupDao configurationSubGroupDao() {
+            return Mockito.mock(ConfigurationSubGroupDao.class);
+        }
+
         @Bean
         public PrimaryDataStoreDao primaryDataStoreDao() {
             return Mockito.mock(PrimaryDataStoreDao.class);

server/src/test/java/com/cloud/vpc/VpcTestConfiguration.java

@@ -19,6 +19,8 @@
 
 import java.io.IOException;
 
+import org.apache.cloudstack.framework.config.dao.ConfigurationGroupDaoImpl;
+import org.apache.cloudstack.framework.config.dao.ConfigurationSubGroupDaoImpl;
 import org.mockito.Mockito;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -107,9 +109,9 @@
 import com.cloud.vpc.dao.MockVpcOfferingServiceMapDaoImpl;
 
 @Configuration
-@ComponentScan(basePackageClasses = {VpcManagerImpl.class, NetworkElement.class, VpcOfferingDao.class, ConfigurationDaoImpl.class, IPAddressDaoImpl.class,
-    DomainRouterDaoImpl.class, VpcGatewayDaoImpl.class, PrivateIpDaoImpl.class, StaticRouteDaoImpl.class, PhysicalNetworkDaoImpl.class,
-    ResourceTagsDaoImpl.class, FirewallRulesDaoImpl.class, VlanDaoImpl.class, AccountDaoImpl.class, ResourceCountDaoImpl.class,
+@ComponentScan(basePackageClasses = {VpcManagerImpl.class, NetworkElement.class, VpcOfferingDao.class, ConfigurationDaoImpl.class, ConfigurationGroupDaoImpl.class,
+    ConfigurationSubGroupDaoImpl.class, IPAddressDaoImpl.class, DomainRouterDaoImpl.class, VpcGatewayDaoImpl.class, PrivateIpDaoImpl.class, StaticRouteDaoImpl.class,
+    PhysicalNetworkDaoImpl.class, ResourceTagsDaoImpl.class, FirewallRulesDaoImpl.class, VlanDaoImpl.class, AccountDaoImpl.class, ResourceCountDaoImpl.class,
     Site2SiteVpnGatewayDaoImpl.class, PodVlanMapDaoImpl.class, AccountVlanMapDaoImpl.class, DomainVlanMapDaoImpl.class, HostDaoImpl.class, HostDetailsDaoImpl.class,
     HostTagsDaoImpl.class, HostTransferMapDaoImpl.class, ClusterDaoImpl.class, HostPodDaoImpl.class, RouterNetworkDaoImpl.class,
     UserStatisticsDaoImpl.class, PhysicalNetworkTrafficTypeDaoImpl.class, FirewallRulesCidrsDaoImpl.class, ResourceLimitManagerImpl.class,

ui/src/views/setting/ConfigurationRow.vue

@@ -18,10 +18,10 @@
 <template>
     <a-container class="config-row">
       <a-row :gutter="12">
-          <a-col :md="18">
+          <a-col :md="17">
             <b> {{configrecord.displaytext }} </b> {{ ' (' + configrecord.name + ')' }} <br/> {{ configrecord.description }}
           </a-col>
-          <a-col :md="6">
+          <a-col :md="7">
             <ConfigurationValue :configrecord="configrecord" :loading="loading" />
           </a-col>
       </a-row>

ui/src/views/setting/ConfigurationValue.vue

@@ -49,7 +49,7 @@
         />
       </span>
       <span v-else-if="configrecord.type ==='Range'">
-        <a-row :gutter="1">
+        <a-row :gutter="12">
           <a-col :md="10" :lg="10">
             <a-slider
               :defaultValue="configrecord.value * 100"
@@ -62,7 +62,7 @@
               @change="value => setConfigurationEditable(configrecord, value)"
             />
           </a-col>
-          <a-col :md="2" :lg="2">
+          <a-col :md="4" :lg="4">
             <a-input-number
               :defaultValue="configrecord.value * 100"
               :disabled=true
@@ -88,7 +88,7 @@
       </span>
       <span v-else>
         <a-input
-          style="width: 15vw;float: right;margin-bottom: 10px; z-index: 8;"
+          style="width: 13vw;float: right;margin-bottom: 10px; z-index: 8;"
           :defaultValue="configrecord.value"
           :disabled="!('updateConfiguration' in $store.getters.apis)"
           v-model:value="editableValue"
@@ -113,7 +113,6 @@
         <tooltip-button
           :tooltip="$t('label.reset.config.value')"
           @onClick="resetConfigurationValue(configrecord)"
-          v-if="editableValueKey !== null"
           icon="reload-outlined"
           :disabled="!('updateConfiguration' in $store.getters.apis)" />
       </span>