Schema change and UT fix

Author: abh1sar

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

@@ -26,7 +26,6 @@
 
 import javax.annotation.PostConstruct;
 
-import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
 import com.cloud.usage.UsageVolumeVO;

engine/schema/src/main/java/com/cloud/usage/dao/UsageVolumeDaoImpl.java

@@ -21,3 +21,10 @@
 
 -- 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)');
+
+-- Add vm_id column to usage_event table for volume usage events
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.usage_event','vm_id', 'bigint UNSIGNED NULL COMMENT "VM ID associated with volume usage events"');
+CALL `cloud_usage`.`IDEMPOTENT_ADD_COLUMN`('cloud_usage.usage_event','vm_id', 'bigint UNSIGNED NULL COMMENT "VM ID associated with volume usage events"');
+
+-- Add vm_id column to cloud_usage.usage_volume table
+CALL `cloud_usage`.`IDEMPOTENT_ADD_COLUMN`('cloud_usage.usage_volume','vm_id', 'bigint UNSIGNED NULL COMMENT "VM ID associated with the volume usage"');

engine/schema/src/main/resources/META-INF/db/schema-41930to41940.sql

@@ -449,7 +449,6 @@ public class UserVmManagerImplTest {
     private DiskOfferingVO largerDisdkOffering = prepareDiskOffering(10l * GiB_TO_BYTES, 2l, 10L, 20L);
     Class<InvalidParameterValueException> expectedInvalidParameterValueException = InvalidParameterValueException.class;
     Class<CloudRuntimeException> expectedCloudRuntimeException = CloudRuntimeException.class;
-    private MockedStatic<UsageEventUtils> usageEventUtilsMocked;
 
     @Before
     public void beforeTest() {
@@ -473,13 +472,11 @@ public void beforeTest() {
         lenient().doNothing().when(resourceLimitMgr).decrementResourceCount(anyLong(), any(Resource.ResourceType.class), anyLong());
 
         Mockito.when(virtualMachineProfile.getId()).thenReturn(vmId);
-        usageEventUtilsMocked = Mockito.mockStatic(UsageEventUtils.class);
     }
 
     @After
     public void afterTest() {
         CallContext.unregister();
-        usageEventUtilsMocked.close();
     }
 
     @Test
@@ -1105,10 +1102,12 @@ public void testResetVMUserDataSuccessResetWithUserdataId() {
     public void recoverRootVolumeTestDestroyState() {
         Mockito.doReturn(Volume.State.Destroy).when(volumeVOMock).getState();
 
-        userVmManagerImpl.recoverRootVolume(volumeVOMock, vmId);
+        try (MockedStatic<UsageEventUtils> ignored = Mockito.mockStatic(UsageEventUtils.class)) {
+            userVmManagerImpl.recoverRootVolume(volumeVOMock, vmId);
 
-        Mockito.verify(volumeApiService).recoverVolume(volumeVOMock.getId());
-        Mockito.verify(volumeDaoMock).attachVolume(volumeVOMock.getId(), vmId, UserVmManagerImpl.ROOT_DEVICE_ID);
+            Mockito.verify(volumeApiService).recoverVolume(volumeVOMock.getId());
+            Mockito.verify(volumeDaoMock).attachVolume(volumeVOMock.getId(), vmId, UserVmManagerImpl.ROOT_DEVICE_ID);
+        }
     }
 
     @Test(expected = InvalidParameterValueException.class)

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

@@ -1432,7 +1432,7 @@ private void createIPHelperEvent(UsageEventVO event) {
     private void deleteExistingSecondaryStorageUsageForVolume(long volId, long accountId, Date deletedDate) {
         List<UsageStorageVO> storageVOs = _usageStorageDao.listById(accountId, volId, StorageTypes.VOLUME);
         for (UsageStorageVO storageVO : storageVOs) {
-            s_logger.debug(String.format("Setting the volume with id: {} to 'deleted' in the usage_storage table for account: {}.", volId, accountId));
+            logger.debug(String.format("Setting the volume with id: {} to 'deleted' in the usage_storage table for account: {}.", volId, accountId));
             storageVO.setDeleted(deletedDate);
             _usageStorageDao.update(storageVO);
         }
@@ -1442,7 +1442,7 @@ private void deleteExistingInstanceVolumeUsage(long volId, long accountId, Date
         List<UsageVolumeVO> volumesVOs = _usageVolumeDao.listByVolumeId(volId, accountId);
         for (UsageVolumeVO volumesVO : volumesVOs) {
             if (volumesVO.getVmId() != null) {
-                s_logger.debug(String.format("Setting the volume with id: {} for instance id: {} to 'deleted' in the usage_volume table for account {}.",
+                logger.debug(String.format("Setting the volume with id: {} for instance id: {} to 'deleted' in the usage_volume table for account {}.",
                         volumesVO.getVolumeId(), volumesVO.getVmId(), accountId));
                 volumesVO.setDeleted(deletedDate);
                 _usageVolumeDao.update(volumesVO.getId(), volumesVO);
@@ -1453,7 +1453,7 @@ private void deleteExistingInstanceVolumeUsage(long volId, long accountId, Date
     private void deleteExistingVolumeUsage(long volId, long accountId, Date deletedDate) {
         List<UsageVolumeVO> volumesVOs = _usageVolumeDao.listByVolumeId(volId, accountId);
         for (UsageVolumeVO volumesVO : volumesVOs) {
-            s_logger.debug(String.format("Setting the volume with id: {} to 'deleted' in the usage_storage table for account: {}.", volId, accountId));
+            logger.debug(String.format("Setting the volume with id: {} to 'deleted' in the usage_storage table for account: {}.", volId, accountId));
             volumesVO.setDeleted(deletedDate);
             _usageVolumeDao.update(volumesVO.getId(), volumesVO);
         }