abh1sar opened a new pull request, #11531: URL: https://github.com/apache/cloudstack/pull/11531
### Description This PR fixes #10985 Some users have asked to show the virtualmachineid also in volume usage, to track it per instance. There will be two kinds of records now. - Without the virtualmachineid - tracking the cumulative volume usage in the usage window. This is to be consistent with the current behaviour. - With virtualmachineid - tracking the volume usage for the time it was attached to the vm in the usage window. If the volume was attached to multiple instances in the same usage window, we will have separate entries for each VM. #### Schema changes - Add column vm_id to cloud.usage_event and cloud_usage.usage_event - Add column vm_id to cloud_usage.usage_volume I have also done some code refactoring in createVolumeHelperEvent() to make it easier to follow. <!--- Describe your changes in DETAIL - And how has behaviour functionally changed. --> <!-- For new features, provide link to FS, dev ML discussion etc. --> <!-- In case of bug fix, the expected and actual behaviours, steps to reproduce. --> <!-- When "Fixes: #<id>" is specified, the issue/PR will automatically be closed when this PR gets merged --> <!-- For addressing multiple issues/PRs, use multiple "Fixes: #<id>" --> <!-- Fixes: # --> <!--- ******************************************************************************* --> <!--- NOTE: AUTOMATION USES THE DESCRIPTIONS TO SET LABELS AND PRODUCE DOCUMENTATION. --> <!--- PLEASE PUT AN 'X' in only **ONE** box --> <!--- ******************************************************************************* --> ### Types of changes - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] New feature (non-breaking change which adds functionality) - [ ] Bug fix (non-breaking change which fixes an issue) - [x] Enhancement (improves an existing feature and functionality) - [ ] Cleanup (Code refactoring and cleanup, that may add test cases) - [ ] build/CI - [ ] test (unit or integration test code) ### Feature/Enhancement Scale or Bug Severity #### Feature/Enhancement Scale - [ ] Major - [x] Minor #### Bug Severity - [ ] BLOCKER - [ ] Critical - [ ] Major - [ ] Minor - [ ] Trivial ### Screenshots (if appropriate): listUsageRecords for a volume in a 2 minute (0.033333 hours) window. The volume was created, then attached to VM-00a42c28-74ae-4а0c-b38a-4e3b88f11241. It was then detached and attached to another VM QA-d6df4657-2fb4-4e26-b7de-21743c5463cd. So we have 3 records. <img width="2226" height="1180" alt="Screenshot 2025-08-29 at 2 42 20 AM" src="https://github.com/user-attachments/assets/6ae299d6-269b-4b07-a80f-01023168ecd8" /> ### How Has This Been Tested? <!-- Please describe in detail how you tested your changes. --> <!-- Include details of your testing environment, and the tests you ran to --> #### How did you try to break this feature and the system with this change? <!-- see how your change affects other areas of the code, etc. --> <!-- Please read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/main/CONTRIBUTING.md) document --> -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@cloudstack.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org