address remaining comments

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

engine/schema/src/test/java/com/cloud/upgrade/DatabaseUpgradeCheckerTest.java

@@ -52,6 +52,7 @@
 import com.cloud.upgrade.dao.Upgrade42020to42030;
 import com.cloud.upgrade.dao.Upgrade42030to42040;
 import com.cloud.upgrade.dao.Upgrade42040to42100;
+import com.cloud.upgrade.dao.Upgrade42300to2400;
 import com.cloud.upgrade.dao.Upgrade452to453;
 import com.cloud.upgrade.dao.Upgrade453to460;
 import com.cloud.upgrade.dao.Upgrade460to461;
@@ -79,6 +80,8 @@ public class DatabaseUpgradeCheckerTest {
     ResultSet resultSet;
 
     private DataSource backupDataSource;
+    private String previousCsMajorVersion;
+    private String previousCsTinyVersion;
 
     @Before
     public void setup() throws Exception {
@@ -90,13 +93,19 @@ public void setup() throws Exception {
         Mockito.when(dataSource.getConnection()).thenReturn(connection);
         Mockito.when(connection.prepareStatement(ArgumentMatchers.anyString())).thenReturn(preparedStatement);
         Mockito.when(preparedStatement.executeQuery()).thenReturn(resultSet);
+
+        previousCsMajorVersion = SystemVmTemplateRegistration.CS_MAJOR_VERSION;
+        previousCsTinyVersion = SystemVmTemplateRegistration.CS_TINY_VERSION;
     }
 
     @After
     public void cleanup() throws Exception {
         Field dsField = TransactionLegacy.class.getDeclaredField("s_ds");
         dsField.setAccessible(true);
         dsField.set(null, backupDataSource);
+
+        SystemVmTemplateRegistration.CS_MAJOR_VERSION = previousCsMajorVersion;
+        SystemVmTemplateRegistration.CS_TINY_VERSION = previousCsTinyVersion;
     }
 
     @Test
@@ -422,6 +431,26 @@ public void testCalculateUpgradePath42010to42100() {
         assertEquals(currentVersion.toString(), upgrades[2].getUpgradedVersion());
     }
 
+    @Test
+    public void testCalculateUpgradePath42300to2400() {
+
+        final CloudStackVersion dbVersion = CloudStackVersion.parse("4.23.0.0");
+        assertNotNull(dbVersion);
+
+        final CloudStackVersion currentVersion = CloudStackVersion.parse("24.0.0");
+        assertNotNull(currentVersion);
+
+        final DatabaseUpgradeChecker checker = new DatabaseUpgradeChecker();
+        final DbUpgrade[] upgrades = checker.calculateUpgradePath(dbVersion, currentVersion);
+
+        assertNotNull(upgrades);
+        assertEquals(1, upgrades.length);
+        assertTrue(upgrades[0] instanceof Upgrade42300to2400);
+
+        assertArrayEquals(new String[]{"4.23.0.0", "24.0.0"}, upgrades[0].getUpgradableVersionRange());
+        assertEquals(currentVersion.toString(), upgrades[0].getUpgradedVersion());
+    }
+
     @Test
     public void testUpdateSystemVmTemplateVersionBelowCutover() {
         DatabaseUpgradeChecker.updateSystemVmTemplateVersion(CloudStackVersion.parse("4.22.1.0"));

plugins/integrations/veeam-control-service/src/test/java/org/apache/cloudstack/veeam/api/dto/VersionTest.java

@@ -62,6 +62,40 @@ public void fromPackageAndCSVersion_IncompleteVersion_DoesNotSetFullVersion() {
         }
     }
 
+    @Test
+    public void fromPackageAndCSVersion_NewVersioningZeroSecurity_MapsSecurityToBuildAndOmitsRevision() {
+        CloudStackVersion csVersion = CloudStackVersion.parse("24.0.0");
+        try (MockedStatic<VeeamControlService> mocked = Mockito.mockStatic(VeeamControlService.class)) {
+            mocked.when(VeeamControlService::getPackageVersion).thenReturn("24.0.0");
+            mocked.when(VeeamControlService::getCSVersion).thenReturn(csVersion);
+
+            Version version = Version.fromPackageAndCSVersion(true);
+
+            assertEquals("24.0.0", version.getFullVersion());
+            assertEquals("24", version.getMajor());
+            assertEquals("0", version.getMinor());
+            assertEquals("0", version.getBuild());
+            assertNull(version.getRevision());
+        }
+    }
+
+    @Test
+    public void fromPackageAndCSVersion_NewVersioningNonZeroSecurity_MapsSecurityToBuildAndOmitsRevision() {
+        CloudStackVersion csVersion = CloudStackVersion.parse("24.1.3");
+        try (MockedStatic<VeeamControlService> mocked = Mockito.mockStatic(VeeamControlService.class)) {
+            mocked.when(VeeamControlService::getPackageVersion).thenReturn("24.1.3");
+            mocked.when(VeeamControlService::getCSVersion).thenReturn(csVersion);
+
+            Version version = Version.fromPackageAndCSVersion(true);
+
+            assertEquals("24.1.3", version.getFullVersion());
+            assertEquals("24", version.getMajor());
+            assertEquals("1", version.getMinor());
+            assertEquals("3", version.getBuild());
+            assertNull(version.getRevision());
+        }
+    }
+
     @Test
     public void fromPackageAndCSVersion_NullCloudStackVersion_ReturnsWithoutNumericParts() {
         try (MockedStatic<VeeamControlService> mocked = Mockito.mockStatic(VeeamControlService.class)) {