schema, refactor: rename cloud.user_vm_details to cloud.vm_instance_details #10736

shwstppr · 2025-04-16T10:21:25Z

Description

Fixes #9975
Renames cloud.user_vm_details to cloud.vm_instance_details to allow adding details for different types on VMs

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)
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
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

codecov · 2025-04-16T10:28:47Z

Codecov Report

❌ Patch coverage is 32.59259% with 91 lines in your changes missing coverage. Please review.
✅ Project coverage is 16.74%. Comparing base (666784f) to head (821a5e7).
⚠️ Report is 155 commits behind head on main.

Files with missing lines	Patch %	Lines
.../src/main/java/com/cloud/vm/UserVmManagerImpl.java	37.03%	17 Missing ⚠️
...n/java/com/cloud/vm/VirtualMachineManagerImpl.java	12.50%	13 Missing and 1 partial ⚠️
...stack/engine/orchestration/VolumeOrchestrator.java	0.00%	6 Missing ⚠️
...ava/com/cloud/api/query/dao/UserVmJoinDaoImpl.java	14.28%	5 Missing and 1 partial ⚠️
...n/java/com/cloud/storage/VolumeApiServiceImpl.java	0.00%	6 Missing ⚠️
...cloudstack/quota/dao/VMInstanceDetailsDaoImpl.java	0.00%	5 Missing ⚠️
...oud/network/element/ConfigDriveNetworkElement.java	44.44%	5 Missing ⚠️
...udstack/consoleproxy/ConsoleAccessManagerImpl.java	0.00%	4 Missing ⚠️
...dstack/engine/orchestration/CloudOrchestrator.java	0.00%	3 Missing ⚠️
...apache/cloudstack/quota/vo/VMInstanceDetailVO.java	0.00%	3 Missing ⚠️
... and 12 more

Additional details and impacted files

@@             Coverage Diff              @@
##               main   #10736      +/-   ##
============================================
- Coverage     16.74%   16.74%   -0.01%     
+ Complexity    14067    14062       -5     
============================================
  Files          5724     5724              
  Lines        507785   507785              
  Branches      61732    61732              
============================================
- Hits          85052    85039      -13     
- Misses       413251   413263      +12     
- Partials       9482     9483       +1

Flag	Coverage Δ
uitests	`3.89% <ø> (ø)`
unittests	`17.66% <32.59%> (-0.01%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

…etails Fixes apache#9975 Signed-off-by: Abhishek Kumar <[email protected]>

Signed-off-by: Abhishek Kumar <[email protected]>

shwstppr · 2025-04-16T18:22:26Z

@blueorangutan package

blueorangutan · 2025-04-16T18:24:04Z

@shwstppr a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-04-16T19:53:16Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 13080

DaanHoogland · 2025-04-17T07:43:36Z

thanks for this @shwstppr

DaanHoogland · 2025-04-17T07:43:44Z

@blueorangutan test

blueorangutan · 2025-04-17T07:44:04Z

@DaanHoogland a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2025-04-18T00:13:55Z

[SF] Trillian test result (tid-13029)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 56454 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10736-t13029-kvm-ol8.zip
Smoke tests completed. 140 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_list_zones_metrics	`Error`	0.21	test_metrics_api.py

shwstppr · 2025-04-19T22:47:11Z

@blueorangutan test matrix

blueorangutan · 2025-04-19T22:48:04Z

@shwstppr a [SL] Trillian-Jenkins matrix job (EL8 mgmt + EL8 KVM, Ubuntu22 mgmt + Ubuntu22 KVM, EL8 mgmt + VMware 7.0u3, EL9 mgmt + XCP-ng 8.2 ) has been kicked to run smoke tests

blueorangutan · 2025-04-20T15:35:58Z

[SF] Trillian test result (tid-13064)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 57777 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10736-t13064-kvm-ol8.zip
Smoke tests completed. 140 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_list_zones_metrics	`Error`	0.19	test_metrics_api.py

blueorangutan · 2025-04-20T15:58:01Z

[SF] Trillian test result (tid-13065)
Environment: kvm-ubuntu22 (x2), Advanced Networking with Mgmt server u22
Total time taken: 59640 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10736-t13065-kvm-ubuntu22.zip
Smoke tests completed. 139 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_list_zones_metrics	`Error`	0.22	test_metrics_api.py
test_oobm_multiple_mgmt_server_ownership	`Failure`	31.84	test_outofbandmanagement.py

blueorangutan · 2025-04-20T19:34:32Z

[SF] Trillian test result (tid-13066)
Environment: vmware-70u3 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 72391 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10736-t13066-vmware-70u3.zip
Smoke tests completed. 133 look OK, 8 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_01_events_resource	`Error`	342.84	test_events_resource.py
test_3d_gpu_support	`Error`	284.06	test_deploy_vgpu_enabled_vm.py
test_list_vms_metrics_admin	`Error`	3621.94	test_metrics_api.py
test_list_vms_metrics_history	`Error`	5.79	test_metrics_api.py
test_list_volumes_metrics_history	`Error`	3616.02	test_metrics_api.py
test_list_zones_metrics	`Error`	0.23	test_metrics_api.py
test_01_prepare_and_cancel_maintenance	`Error`	0.15	test_ms_maintenance_and_safe_shutdown.py
test_04_deploy_vm_for_other_user_and_test_vm_operations	`Error`	127.04	test_network_permissions.py
test_01_deployVMInSharedNetwork	`Failure`	7.59	test_network.py
ContextSuite context=TestSharedNetworkWithConfigDrive>:teardown	`Error`	8.68	test_network.py
test_02_restore_vm_with_disk_offering	`Error`	55.11	test_restore_vm.py
test_03_restore_vm_with_disk_offering_custom_size	`Error`	58.22	test_restore_vm.py
test_02_restore_vm_strict_tags_failure	`Error`	60.45	test_vm_strict_host_tags.py

blueorangutan · 2025-04-20T20:53:35Z

[SF] Trillian test result (tid-13067)
Environment: xcpng82 (x2), Advanced Networking with Mgmt server ol9
Total time taken: 77554 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10736-t13067-xcpng82.zip
Smoke tests completed. 134 look OK, 7 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestClusterDRS>:setup	`Error`	0.00	test_cluster_drs.py
test_list_zones_metrics	`Error`	0.21	test_metrics_api.py
test_01_prepare_and_cancel_maintenance	`Error`	0.15	test_ms_maintenance_and_safe_shutdown.py
ContextSuite context=TestSharedNetworkWithConfigDrive>:setup	`Error`	7.44	test_network.py
test_01_non_strict_host_anti_affinity	`Error`	231.12	test_nonstrict_affinity_group.py
test_02_non_strict_host_affinity	`Error`	118.38	test_nonstrict_affinity_group.py
test_02_create_volume	`Error`	3.24	test_resource_names.py
test_05_scale_vm_dont_allow_disk_offering_change	`Failure`	66.53	test_scale_vm.py

DaanHoogland · 2025-04-23T09:55:56Z

tools/marvin/setup.py



-VERSION = "4.21.0.0-SNAPSHOT"
+VERSION = "4.21.0.0"


don’t think we want to merge this bit, yet.

tools/marvin/setup.py

sureshanaparti

clgtm (upgrade tests needed)

Copilot

Pull Request Overview

This PR renames the database table and related code from cloud.user_vm_details to cloud.vm_instance_details to support storing details for different types of VMs, not just user VMs. This is a schema refactoring that enhances flexibility by allowing VM details storage for all VM types.

Reviewed Changes

Copilot reviewed 66 out of 66 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
Schema migration file	Adds SQL migration to rename database table from `user_vm_details` to `vm_instance_details`
DAO classes	Renames `UserVmDetailsDao` to `VMInstanceDetailsDao` and updates implementation
VO classes	Renames `UserVmDetailVO` to `VMInstanceDetailVO` and updates table mapping
Test files	Updates all test references to use new class names
Service implementations	Updates all service layer code to use renamed DAO and VO classes
Database view	Updates SQL view to reference new table name
Spring configuration	Updates bean definitions to use new class names

Comments suppressed due to low confidence (1)

server/src/test/resources/createNetworkOffering.xml:53

The bean id 'UservmDetailsDaoImpl' is inconsistent with the new class name 'VMInstanceDetailsDaoImpl'. The bean id should be updated to match the new naming convention, such as 'vmInstanceDetailsDaoImpl'.

    <bean id="UservmDetailsDaoImpl" class="com.cloud.vm.dao.VMInstanceDetailsDaoImpl" />

blueorangutan · 2025-07-20T19:05:52Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 14270

sureshanaparti · 2025-07-20T19:34:50Z

@blueorangutan test

blueorangutan · 2025-07-20T19:36:04Z

@sureshanaparti a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2025-07-21T11:19:11Z

[SF] Trillian test result (tid-13830)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 53530 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10736-t13830-kvm-ol8.zip
Smoke tests completed. 141 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_list_zones_metrics	`Error`	0.20	test_metrics_api.py

JoaoJandre

Same boat as @DaanHoogland and @sureshanaparti , CLGTM, but needs testing.

github-actions · 2025-07-23T07:52:27Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

DaanHoogland · 2025-07-23T09:35:27Z

@blueorangutan package

blueorangutan · 2025-07-23T09:36:03Z

@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-07-23T11:41:53Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✖️ debian ✔️ suse15. SL-JID 14311

DaanHoogland · 2025-07-23T12:08:30Z

running upgrade tests ...

DaanHoogland · 2025-07-24T10:08:11Z

running upgrade tests ...

I did upgrade tests from 4.19 and 4.20. destroyed the cpvm and it came up again, restarted a network and a vpc with cleanup. no problems either.

Continuation of apache#10736 Signed-off-by: Abhishek Kumar <[email protected]>

* schema,framework/db,server: fix user_vm_details usage Continuation of #10736 * python files Signed-off-by: Abhishek Kumar <[email protected]>

…etails (apache#10736) Signed-off-by: Abhishek Kumar <[email protected]> Co-authored-by: Suresh Kumar Anaparti <[email protected]> Co-authored-by: dahn <[email protected]>

* schema,framework/db,server: fix user_vm_details usage Continuation of apache#10736 * python files Signed-off-by: Abhishek Kumar <[email protected]>

boring-cyborg bot added component:compute component:dpdk component:kubernetes component:kvm component:networking component:orchestration component:quota labels Apr 16, 2025

shwstppr force-pushed the rename-uservmdetail-vminstancedetail branch from 02bee47 to e392611 Compare April 16, 2025 10:35

schema, refactor: rename cloud.user_vm_details to cloud.vm_instance_d…

2f4c7a2

…etails Fixes apache#9975 Signed-off-by: Abhishek Kumar <[email protected]>

shwstppr force-pushed the rename-uservmdetail-vminstancedetail branch from e392611 to 2f4c7a2 Compare April 16, 2025 11:16

fix

daafb22

Signed-off-by: Abhishek Kumar <[email protected]>

boring-cyborg bot added the component:storage label Apr 16, 2025

fix view

c2703d3

Signed-off-by: Abhishek Kumar <[email protected]>

shwstppr marked this pull request as ready for review April 21, 2025 07:10

DaanHoogland reviewed Apr 23, 2025

View reviewed changes

shwstppr commented Apr 23, 2025

View reviewed changes

tools/marvin/setup.py Outdated Show resolved Hide resolved

sureshanaparti approved these changes Jul 20, 2025

View reviewed changes

sureshanaparti requested review from JoaoJandre and Copilot July 20, 2025 16:08

Copilot AI reviewed Jul 20, 2025

View reviewed changes

sureshanaparti added the status:needs-testing label Jul 20, 2025

JoaoJandre approved these changes Jul 21, 2025

View reviewed changes

github-actions bot added the status:has-conflicts label Jul 23, 2025

Merge branch 'main' into rename-uservmdetail-vminstancedetail

821a5e7

github-actions bot removed the status:has-conflicts label Jul 23, 2025

DaanHoogland self-assigned this Jul 23, 2025

DaanHoogland merged commit 83bccea into apache:main Jul 24, 2025
23 of 26 checks passed

github-project-automation bot moved this from In Progress to Done in Apache CloudStack 4.21.0 Jul 24, 2025

DaanHoogland deleted the rename-uservmdetail-vminstancedetail branch July 24, 2025 10:08

shwstppr added a commit to shapeblue/cloudstack that referenced this pull request Jul 25, 2025

schema,framework/db,server: fix user_vm_details usage

70272b3

Continuation of apache#10736 Signed-off-by: Abhishek Kumar <[email protected]>

shwstppr mentioned this pull request Jul 25, 2025

schema,framework/db,server: fix user_vm_details usage #11292

Merged

14 tasks

sureshanaparti pushed a commit that referenced this pull request Jul 26, 2025

schema,framework/db,server: fix user_vm_details usage (#11292)

407072f

* schema,framework/db,server: fix user_vm_details usage Continuation of #10736 * python files Signed-off-by: Abhishek Kumar <[email protected]>

sureshanaparti added the type:improvement label Aug 20, 2025

weizhouapache mentioned this pull request Sep 8, 2025

Save systemvm template details for cpvm, ssvm and vr's. #9721

Closed

14 tasks



		VERSION = "4.21.0.0-SNAPSHOT"
		VERSION = "4.21.0.0"

schema, refactor: rename cloud.user_vm_details to cloud.vm_instance_details #10736

schema, refactor: rename cloud.user_vm_details to cloud.vm_instance_details #10736

Uh oh!

Conversation

shwstppr commented Apr 16, 2025

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Uh oh!

codecov bot commented Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

shwstppr commented Apr 16, 2025

Uh oh!

blueorangutan commented Apr 16, 2025

Uh oh!

blueorangutan commented Apr 16, 2025

Uh oh!

DaanHoogland commented Apr 17, 2025

Uh oh!

DaanHoogland commented Apr 17, 2025

Uh oh!

blueorangutan commented Apr 17, 2025

Uh oh!

blueorangutan commented Apr 18, 2025

Uh oh!

shwstppr commented Apr 19, 2025

Uh oh!

blueorangutan commented Apr 19, 2025

Uh oh!

blueorangutan commented Apr 20, 2025

Uh oh!

blueorangutan commented Apr 20, 2025

Uh oh!

blueorangutan commented Apr 20, 2025

Uh oh!

blueorangutan commented Apr 20, 2025

Uh oh!

DaanHoogland Apr 23, 2025

Choose a reason for hiding this comment

Uh oh!

shwstppr Apr 23, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

sureshanaparti left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

blueorangutan commented Jul 20, 2025

Uh oh!

sureshanaparti commented Jul 20, 2025

Uh oh!

blueorangutan commented Jul 20, 2025

Uh oh!

blueorangutan commented Jul 21, 2025

Uh oh!

JoaoJandre left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jul 23, 2025

Uh oh!

DaanHoogland commented Jul 23, 2025

Uh oh!

blueorangutan commented Jul 23, 2025

Uh oh!

blueorangutan commented Jul 23, 2025

Uh oh!

DaanHoogland commented Jul 23, 2025

codecov bot commented Apr 16, 2025 •

edited

Loading

sureshanaparti left a comment •

edited

Loading