Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

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

wants to merge 4 commits into from

Conversation

shwstppr
Copy link
Contributor

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

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

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

@codecov Codecov
Copy link

codecov bot commented Apr 16, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 28.92562% with 86 lines in your changes missing coverage. Please review.

Project coverage is 16.32%. Comparing base (2dfe6a6) to head (ffc009e).
Report is 53 commits behind head on main.

Files with missing lines Patch % Lines
...n/java/com/cloud/vm/VirtualMachineManagerImpl.java 12.50% 14 Missing ⚠️
.../src/main/java/com/cloud/vm/UserVmManagerImpl.java 12.50% 10 Missing and 4 partials ⚠️
...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 11 more
Additional details and impacted files 
@@             Coverage Diff              @@
##               main   #10736      +/-   ##
============================================
+ Coverage     16.30%   16.32%   +0.01%     
- Complexity    13448    13466      +18     
============================================
  Files          5674     5676       +2     
  Lines        499203   499412     +209     
  Branches      60369    60395      +26     
============================================
+ Hits          81408    81510     +102     
- Misses       408726   408822      +96     
- Partials       9069     9080      +11
Flag Coverage Δ
uitests 3.99% <ø> (-0.01%) ⬇️
unittests 17.18% <28.92%> (+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.

@shwstppr shwstppr force-pushed the rename-uservmdetail-vminstancedetail branch from 02bee47 to e392611 Compare April 16, 2025 10:35
@shwstppr
schema, refactor: rename cloud.user_vm_details to cloud.vm_instance_d…
2f4c7a2 
…etails

Fixes apache#9975

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
@shwstppr shwstppr force-pushed the rename-uservmdetail-vminstancedetail branch from e392611 to 2f4c7a2 Compare April 16, 2025 11:16
@shwstppr
fix
daafb22 
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
@shwstppr
fix view
c2703d3 
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
@shwstppr
Copy link
Contributor Author

@blueorangutan package

@blueorangutan
Copy link

@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
Copy link

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

@DaanHoogland
Copy link
Contributor

thanks for this @shwstppr

@DaanHoogland
Copy link
Contributor

@blueorangutan test

@blueorangutan
Copy link

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

@blueorangutan
Copy link

[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
Copy link
Contributor Author

@blueorangutan test matrix

@blueorangutan
Copy link

@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
Copy link

[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
Copy link

[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
Copy link

[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
Copy link

[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

@shwstppr shwstppr marked this pull request as ready for review April 21, 2025 07:10
DaanHoogland
DaanHoogland reviewed Apr 23, 2025
View reviewed changes
tools/marvin/setup.py Outdated
@@ -27,7 +27,7 @@
raise RuntimeError("python setuptools is required to build Marvin")


VERSION = "4.21.0.0-SNAPSHOT"
VERSION = "4.21.0.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reverted

shwstppr
shwstppr commented Apr 23, 2025
View reviewed changes
DaanHoogland
DaanHoogland approved these changes Apr 23, 2025
View reviewed changes
Copy link
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clgtm, we need to test upgrades from 4.20.0 and 4.19.2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DaanHoogland DaanHoogland DaanHoogland approved these changes

Assignees
No one assigned
Labels
component:compute component:dpdk component:kubernetes component:kvm component:networking component:orchestration component:quota component:storage
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

align systemvm details and user vm detail in a more intuitive way
3 participants
@shwstppr @blueorangutan @DaanHoogland