Skip to content
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.

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

Guest os mappings improvements #6979

Merged

Conversation

DaanHoogland
Copy link
Contributor

@DaanHoogland DaanHoogland commented Dec 12, 2022

Description

This PR is a followup of #6561

This includes the following Guest OS hypervisor mapping improvements.

  • Support for the Guest OS / hypervisor mapping addition from upgrade path (using GuestOsMapper)
  • Support to copy hypervisor mappings from older version from upgrade path (using GuestOsMapper)
  • Provision to validate the OS mapping name in hypervisor when enabled using the new parameter 'osmappingcheckenabled' in addGuestOsMapping API
  • Provision to get/check the hypervisor guest OS names (that can be used to add proper mapping) for VMware and XenServer using new API: getHypervisorGuestOsNames.
  • Display the Guest OS hypervisor mappings in UI.

Document PR : apache/cloudstack-documentation#300

Fixes: #3609

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)

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?

@github-actions
Copy link

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

Copy link
Contributor

@GutoVeronezi GutoVeronezi left a comment

Choose a reason for hiding this comment

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

Overall, code looks good.

@DaanHoogland, could we extend the description to better describe the changes? The new API creation, the changes in existing APIs, the changes in the UI, and so on.

@harikrishna-patnala
Copy link
Contributor

Do we need to close the old PR#6561 @DaanHoogland ?

@DaanHoogland
Copy link
Contributor Author

@harikrishna-patnala yes, I think so. As @GutoVeronezi asks we should also copy the description from there. Only @sureshanaparti can reach the other branch and I don't think he has time for it.

@codecov
Copy link

codecov bot commented Dec 30, 2022

Codecov Report

Merging #6979 (3d704f5) into main (fa3f2a7) will increase coverage by 0.02%.
The diff coverage is 32.34%.

@@             Coverage Diff              @@
##               main    #6979      +/-   ##
============================================
+ Coverage     13.30%   13.33%   +0.02%     
- Complexity     9259     9283      +24     
============================================
  Files          2735     2737       +2     
  Lines        257825   258048     +223     
  Branches      40167    40207      +40     
============================================
+ Hits          34308    34400      +92     
- Misses       219189   219317     +128     
- Partials       4328     4331       +3     
Impacted Files Coverage Δ
...src/main/java/com/cloud/api/ApiResponseHelper.java 3.78% <0.00%> (-0.03%) ⬇️
...in/java/com/cloud/server/ManagementServerImpl.java 5.53% <0.00%> (-0.12%) ⬇️
...in/java/com/cloud/hypervisor/vmware/mo/HostMO.java 0.14% <0.00%> (-0.01%) ⬇️
...CitrixGetHypervisorGuestOsNamesCommandWrapper.java 8.33% <8.33%> (ø)
...nbase/CitrixCheckGuestOsMappingCommandWrapper.java 10.00% <10.00%> (ø)
...ain/java/com/cloud/storage/dao/GuestOSDaoImpl.java 40.00% <33.33%> (+3.15%) ⬆️
.../src/main/java/com/cloud/host/dao/HostDaoImpl.java 28.74% <50.00%> (+0.31%) ⬆️
...om/cloud/storage/dao/GuestOSHypervisorDaoImpl.java 33.66% <50.00%> (+1.40%) ⬆️
...java/com/cloud/hypervisor/vmware/mo/ClusterMO.java 2.53% <60.00%> (+2.27%) ⬆️
...oud/hypervisor/vmware/resource/VmwareResource.java 5.26% <83.72%> (+0.75%) ⬆️
... and 1 more

... and 3 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@harikrishna-patnala
Copy link
Contributor

@blueorangutan test matrix

@blueorangutan
Copy link

@harikrishna-patnala a Trillian-Jenkins matrix job (centos7 mgmt + xenserver71, rocky8 mgmt + vmware67u3, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

@github-actions
Copy link

github-actions bot commented Jan 9, 2023

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

@harikrishna-patnala
Copy link
Contributor

@blueorangutan package

@blueorangutan
Copy link

@harikrishna-patnala a 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

Trillian test result (tid-5762)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 39528 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6979-t5762-xenserver-71.zip
Smoke tests completed. 108 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File

@blueorangutan
Copy link

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5216

@blueorangutan
Copy link

Trillian test result (tid-5763)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server r8
Total time taken: 46612 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6979-t5763-vmware-67u3.zip
Smoke tests completed. 107 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_08_upgrade_kubernetes_ha_cluster Failure 617.08 test_kubernetes_clusters.py

@blueorangutan
Copy link

Trillian test result (tid-5764)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 47213 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6979-t5764-kvm-centos7.zip
Smoke tests completed. 106 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_02_upgrade_kubernetes_cluster Failure 488.27 test_kubernetes_clusters.py
test_05_rvpc_multi_tiers Failure 426.08 test_vpc_redundant.py

@harikrishna-patnala harikrishna-patnala force-pushed the guest-os-mappings-improvements branch from 4b9cbb2 to 19de5db Compare June 26, 2023 03:56
@harikrishna-patnala
Copy link
Contributor

@blueorangutan package

@blueorangutan
Copy link

@harikrishna-patnala a [SF] 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]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 6333

@harikrishna-patnala
Copy link
Contributor

@blueorangutan test matrix

@blueorangutan
Copy link

@harikrishna-patnala a [SF] Trillian-Jenkins matrix job (centos7 mgmt + xenserver71, rocky8 mgmt + vmware67u3, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

@github-actions
Copy link

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

@DaanHoogland
Copy link
Contributor Author

@blueorangutan package

@blueorangutan
Copy link

@DaanHoogland a [SF] 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]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 6336

@blueorangutan
Copy link

[SF] Trillian test result (tid-6848)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server r8
Total time taken: 43692 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6979-t6848-vmware-67u3.zip
Smoke tests completed. 112 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File

@blueorangutan
Copy link

[SF] Trillian test result (tid-6850)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 41628 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6979-t6850-xenserver-71.zip
Smoke tests completed. 111 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_02_cancel_host_maintenace_with_migration_jobs Error 1768.97 test_host_maintenance.py
test_02_cancel_host_maintenace_with_migration_jobs Error 1769.02 test_host_maintenance.py

@blueorangutan
Copy link

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

Test Result Time (s) Test File
test_01_migrate_VM_and_root_volume Error 78.79 test_vm_life_cycle.py
test_02_migrate_VM_with_two_data_disks Error 58.73 test_vm_life_cycle.py

Copy link
Contributor

@vladimirpetrov vladimirpetrov left a comment

Choose a reason for hiding this comment

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

LGTM based on manual testing.

@apache apache deleted a comment from blueorangutan Jun 27, 2023
Copy link
Contributor

@vladimirpetrov vladimirpetrov left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@weizhouapache weizhouapache left a comment

Choose a reason for hiding this comment

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

code lgtm

@harikrishna-patnala harikrishna-patnala merged commit 06caf32 into apache:main Jun 27, 2023
@harikrishna-patnala harikrishna-patnala deleted the guest-os-mappings-improvements branch June 27, 2023 08:19
@BryanMLima BryanMLima mentioned this pull request Aug 3, 2023
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Improve Guest OS additions and mappings
10 participants