Guest os mappings improvements by DaanHoogland · Pull Request #6979 · apache/cloudstack

DaanHoogland · 2022-12-12T17:26:13Z

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

Screenshots (if appropriate):

How Has This Been Tested?

github-actions · 2022-12-12T17:57:53Z

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

GutoVeronezi

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.

api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java

api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java

vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java

engine/schema/src/main/java/com/cloud/upgrade/GuestOsMapper.java

...ns/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java

...d/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckGuestOsMappingCommandWrapper.java

...rvisor/xenserver/resource/wrapper/xenbase/CitrixGetHypervisorGuestOsNamesCommandWrapper.java

harikrishna-patnala · 2022-12-13T06:13:01Z

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

DaanHoogland · 2022-12-13T17:57:09Z

@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 · 2022-12-30T10:54:37Z

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

api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java

api/src/main/java/org/apache/cloudstack/api/response/HypervisorGuestOsNamesResponse.java

server/src/main/java/com/cloud/api/ApiResponseHelper.java

server/src/main/java/com/cloud/server/ManagementServerImpl.java

ui/public/locales/en.json

vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ClusterMO.java

...d/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckGuestOsMappingCommandWrapper.java

...rvisor/xenserver/resource/wrapper/xenbase/CitrixGetHypervisorGuestOsNamesCommandWrapper.java

api/src/main/java/org/apache/cloudstack/api/response/GuestOSResponse.java

harikrishna-patnala · 2023-01-09T10:57:53Z

@blueorangutan test matrix

blueorangutan · 2023-01-09T10:59:03Z

@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 · 2023-01-09T11:59:44Z

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

harikrishna-patnala · 2023-01-09T21:40:31Z

@blueorangutan package

blueorangutan · 2023-01-09T21:41:04Z

@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 · 2023-01-09T22:17:49Z

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 · 2023-01-09T22:33:29Z

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

blueorangutan · 2023-01-10T00:17:53Z

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 · 2023-01-10T00:27:53Z

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 · 2023-06-26T03:56:41Z

@blueorangutan package

blueorangutan · 2023-06-26T03:58:03Z

@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 · 2023-06-26T05:00:19Z

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

harikrishna-patnala · 2023-06-26T05:01:25Z

@blueorangutan test matrix

blueorangutan · 2023-06-26T05:02:03Z

@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 · 2023-06-26T08:21:38Z

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

DaanHoogland · 2023-06-26T09:30:46Z

@blueorangutan package

blueorangutan · 2023-06-26T09:32:03Z

@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 · 2023-06-26T10:29:19Z

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

blueorangutan · 2023-06-26T15:32:13Z

[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 · 2023-06-26T16:58:48Z

[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 · 2023-06-26T17:22:42Z

[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

vladimirpetrov

LGTM based on manual testing.

vladimirpetrov

LGTM

weizhouapache

code lgtm

boring-cyborg bot added component:api component:management-server component:storage component:UI component:vmware component:XenServer labels Dec 12, 2022

github-actions bot added the status:has-conflicts label Dec 12, 2022

GutoVeronezi reviewed Dec 12, 2022

View reviewed changes

harikrishna-patnala force-pushed the guest-os-mappings-improvements branch from 0edd76a to 936c008 Compare December 30, 2022 07:46

github-actions bot removed the status:has-conflicts label Dec 30, 2022

DaanHoogland assigned harikrishna-patnala Jan 2, 2023

harikrishna-patnala force-pushed the guest-os-mappings-improvements branch from f69cdfb to 2d053a7 Compare January 4, 2023 08:06

weizhouapache reviewed Jan 5, 2023

View reviewed changes

harikrishna-patnala mentioned this pull request Jan 6, 2023

Guest OS and hypervisor mappings apache/cloudstack-documentation#300

Merged

github-actions bot added the status:has-conflicts label Jan 9, 2023

github-actions bot removed the status:has-conflicts label Jan 9, 2023

harikrishna-patnala force-pushed the guest-os-mappings-improvements branch from 231dfb3 to 13a0c29 Compare January 9, 2023 21:40

harikrishna-patnala added 6 commits June 26, 2023 09:25

Added deduplication for the list guest OS API

1d00e9d

Fixed linter failure

6af5e86

Few bug fixes and UI changes

23db142

Few improvements

e09a7a6

Addressed code smells

85035c6

Fixed UI issues after rebase

19de5db

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

github-actions bot added the status:has-conflicts label Jun 26, 2023

Merge branch 'main' into guest-os-mappings-improvements

3d704f5

github-actions bot removed the status:has-conflicts label Jun 26, 2023

vladimirpetrov approved these changes Jun 27, 2023

View reviewed changes

apache deleted a comment from blueorangutan Jun 27, 2023

vladimirpetrov approved these changes Jun 27, 2023

View reviewed changes

weizhouapache approved these changes Jun 27, 2023

View reviewed changes

harikrishna-patnala merged commit 06caf32 into apache:main Jun 27, 2023

harikrishna-patnala deleted the guest-os-mappings-improvements branch June 27, 2023 08:19

BryanMLima mentioned this pull request Aug 3, 2023

Details on add guest os optional #7812

Merged

12 tasks

weizhouapache mentioned this pull request Oct 24, 2023

Fix os type response isuserdefined #8128

Merged

13 tasks

Conversation

DaanHoogland commented Dec 12, 2022 • edited by harikrishna-patnala Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

github-actions bot commented Dec 12, 2022

Uh oh!

GutoVeronezi left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

harikrishna-patnala commented Dec 13, 2022

Uh oh!

DaanHoogland commented Dec 13, 2022

Uh oh!

codecov bot commented Dec 30, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

harikrishna-patnala commented Jan 9, 2023

Uh oh!

blueorangutan commented Jan 9, 2023

Uh oh!

github-actions bot commented Jan 9, 2023

Uh oh!

harikrishna-patnala commented Jan 9, 2023

Uh oh!

blueorangutan commented Jan 9, 2023

Uh oh!

blueorangutan commented Jan 9, 2023

Uh oh!

blueorangutan commented Jan 9, 2023

Uh oh!

blueorangutan commented Jan 10, 2023

Uh oh!

blueorangutan commented Jan 10, 2023

Uh oh!

harikrishna-patnala commented Jun 26, 2023

Uh oh!

blueorangutan commented Jun 26, 2023

Uh oh!

blueorangutan commented Jun 26, 2023

Uh oh!

harikrishna-patnala commented Jun 26, 2023

Uh oh!

blueorangutan commented Jun 26, 2023

Uh oh!

github-actions bot commented Jun 26, 2023

Uh oh!

DaanHoogland commented Jun 26, 2023

Uh oh!

blueorangutan commented Jun 26, 2023

Uh oh!

blueorangutan commented Jun 26, 2023

Uh oh!

blueorangutan commented Jun 26, 2023

Uh oh!

DaanHoogland commented Dec 12, 2022 •

edited by harikrishna-patnala

Loading

codecov bot commented Dec 30, 2022 •

edited

Loading