UT for Upgrade42010to42100 and ConfigDepotImpl

Author: abh1sar

engine/schema/src/test/java/com/cloud/upgrade/dao/Upgrade42010to42100Test.java

@@ -0,0 +1,73 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.upgrade.dao;
+
+import static org.mockito.Mockito.when;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import com.cloud.utils.db.TransactionLegacy;
+
+@RunWith(MockitoJUnitRunner.class)
+public class Upgrade42010to42100Test {
+    @Spy
+    Upgrade42010to42100 upgrade;
+
+    @Mock
+    private Connection conn;
+
+    @Test
+    public void testPerformDataMigration() throws SQLException {
+        try (MockedStatic<DbUpgradeUtils> ignored = Mockito.mockStatic(DbUpgradeUtils.class)) {
+            DbUpgradeUtils dbUpgradeUtils = Mockito.mock(DbUpgradeUtils.class);
+            when(dbUpgradeUtils.getTableColumnType(conn, "configuration", "scope")).thenReturn("varchar(255)");
+
+            try (MockedStatic<TransactionLegacy> ignored2 = Mockito.mockStatic(TransactionLegacy.class)) {
+                TransactionLegacy txn = Mockito.mock(TransactionLegacy.class);
+                when(TransactionLegacy.currentTxn()).thenReturn(txn);
+                PreparedStatement pstmt = Mockito.mock(PreparedStatement.class);
+                String sql = "UPDATE configuration\n" +
+                        "SET new_scope =" +
+                        "     CASE" +
+                        "         WHEN scope = 'Global' THEN 1" +
+                        "         WHEN scope = 'Zone' THEN 2" +
+                        "         WHEN scope = 'Cluster' THEN 4" +
+                        "         WHEN scope = 'StoragePool' THEN 8" +
+                        "         WHEN scope = 'ManagementServer' THEN 16" +
+                        "         WHEN scope = 'ImageStore' THEN 32" +
+                        "         WHEN scope = 'Domain' THEN 64" +
+                        "         WHEN scope = 'Account' THEN 128" +
+                        "         ELSE 0" +
+                        "     END WHERE scope IS NOT NULL;";
+                when(txn.prepareAutoCloseStatement(sql)).thenReturn(pstmt);
+                upgrade.performDataMigration(conn);
+
+                Mockito.verify(pstmt, Mockito.times(1)).executeUpdate();
+            }
+        }
+    }
+}

framework/config/src/test/java/org/apache/cloudstack/framework/config/impl/ConfigDepotImplTest.java

@@ -25,6 +25,7 @@
 
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.framework.config.ScopedConfigStorage;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.framework.config.dao.ConfigurationSubGroupDao;
 import org.junit.Assert;
@@ -36,6 +37,8 @@
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 
+import com.cloud.utils.Pair;
+
 @RunWith(MockitoJUnitRunner.class)
 public class ConfigDepotImplTest {
 
@@ -114,7 +117,7 @@ public void testGetConfigStringValueAfterExpiry() {
     }
 
     @Test
-    public void testPopulateConfiguration() {
+    public void testPopulateConfigurationNewVO() {
         ConfigKey StorageDisableThreshold = new ConfigKey<>(ConfigKey.CATEGORY_ALERT, Double.class, "pool.storage.capacity.disablethreshold", "0.85",
                 "Percentage (as a value between 0 and 1) of storage utilization above which allocators will disable using the pool for low storage available.",
                 true, List.of(ConfigKey.Scope.StoragePool, ConfigKey.Scope.Zone));
@@ -138,4 +141,50 @@ public ConfigKey<?>[] getConfigKeys() {
                 configDepotImpl._scopeLevelConfigsMap.get(ConfigKey.Scope.StoragePool).iterator().next().key());
         Assert.assertEquals(0, configDepotImpl._scopeLevelConfigsMap.get(ConfigKey.Scope.Cluster).size());
     }
+
+    @Test
+    public void testPopulateConfiguration() {
+        ConfigKey StorageDisableThreshold = new ConfigKey<>(ConfigKey.CATEGORY_ALERT, Double.class, "pool.storage.capacity.disablethreshold", "0.85",
+                "Percentage (as a value between 0 and 1) of storage utilization above which allocators will disable using the pool for low storage available.",
+                true, List.of(ConfigKey.Scope.StoragePool, ConfigKey.Scope.Zone));
+        Configurable configurable = new Configurable() {
+            @Override
+            public String getConfigComponentName() {
+                return "test";
+            }
+
+            @Override
+            public ConfigKey<?>[] getConfigKeys() {
+                return new ConfigKey<?>[]{StorageDisableThreshold};
+            }
+        };
+        configDepotImpl.setConfigurables(List.of(configurable));
+
+        ConfigurationVO configurationVO = new ConfigurationVO(StorageDisableThreshold.category(), "DEFAULT", "component",
+                StorageDisableThreshold.key(), StorageDisableThreshold.defaultValue(), StorageDisableThreshold.description(),
+                StorageDisableThreshold.displayText(), StorageDisableThreshold.parent(), 1L, 10L);
+        Mockito.when(_configDao.findById("pool.storage.capacity.disablethreshold")).thenReturn(configurationVO);
+        configDepotImpl.populateConfigurations();
+
+        Mockito.verify(_configDao, Mockito.times(1)).persist(configurationVO);
+    }
+
+    @Test
+    public void getParentScopeWithValidScope() {
+        ConfigKey.Scope scope = ConfigKey.Scope.Cluster;
+        ScopedConfigStorage scopedConfigStorage = Mockito.mock(ScopedConfigStorage.class);
+        Long id = 1L;
+        ConfigKey.Scope parentScope = ConfigKey.Scope.Zone;
+        Long parentId = 2L;
+
+        Mockito.when(scopedConfigStorage.getScope()).thenReturn(scope);
+        Mockito.when(scopedConfigStorage.getParentScope(id)).thenReturn(new Pair<>(parentScope, parentId));
+
+        configDepotImpl.setScopedStorages(Collections.singletonList(scopedConfigStorage));
+        Pair<ConfigKey.Scope, Long> result = configDepotImpl.getParentScope(scope, id);
+
+        Assert.assertNotNull(result);
+        Assert.assertEquals(parentScope, result.first());
+        Assert.assertEquals(parentId, result.second());
+    }
 }

server/src/test/java/com/cloud/storage/StorageManagerImplTest.java

@@ -780,7 +780,6 @@ private Long testCheckPoolforSpaceForResizeSetup(StoragePoolVO pool, Long alloca
 
         Mockito.when(pool.getId()).thenReturn(poolId);
         Mockito.when(pool.getCapacityBytes()).thenReturn(capacityBytes);
-        Mockito.when(pool.getDataCenterId()).thenReturn(zoneId);
         Mockito.when(storagePoolDao.findById(poolId)).thenReturn(pool);
         Mockito.when(pool.getPoolType()).thenReturn(Storage.StoragePoolType.NetworkFilesystem);