engine-schema: fix finding guestos mapping with parent version by shwstppr · Pull Request #8426 · apache/cloudstack

shwstppr · 2024-01-02T09:18:50Z

Description

Fixes#8412

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

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 · 2024-01-02T09:26:41Z

Codecov Report

Attention: 14 lines in your changes are missing coverage. Please review.

Comparison is base (08749d8) 13.12% compared to head (a707e27) 30.76%.

Files	Patch %	Lines
...om/cloud/storage/dao/GuestOSHypervisorDaoImpl.java	22.22%	13 Missing and 1 partial ⚠️

Additional details and impacted files

@@ Coverage Diff @@## 4.18 #8426 +/- ##
=============================================
+ Coverage 13.12% 30.76% +17.63% - Complexity 9141 33951 +24810 
=============================================
Files 2720 5341 +2621 Lines 257726 374888 +117162 Branches 40177 54526 +14349 =============================================
+ Hits 33838 115331 +81493 - Misses 219598 244320 +24722 - Partials 4290 15237 +10947

Flag	Coverage Δ
simulator-marvin-tests	`24.64% <22.22%> (?)`
uitests	`4.39% <ø> (?)`
unit-tests	`16.46% <5.55%> (?)`

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.

shwstppr · 2024-01-02T10:01:18Z

@blueorangutan package

blueorangutan · 2024-01-02T10:06:03Z

@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 · 2024-01-02T11:31:08Z

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

shwstppr · 2024-01-03T04:36:17Z

@blueorangutan package

blueorangutan · 2024-01-03T04:38:03Z

@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 · 2024-01-03T05:38:47Z

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

DaanHoogland

clgtm

DaanHoogland · 2024-01-03T07:38:18Z

@blueorangutan test matrix

blueorangutan · 2024-01-03T07:40:03Z

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

blueorangutan · 2024-01-03T20:03:40Z

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

Test	Result	Time (s)	Test File

blueorangutan · 2024-01-03T21:32:13Z

[SF] Trillian test result (tid-8710)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 48372 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8426-t8710-kvm-centos7.zip
Smoke tests completed. 119 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_list_cpvm_vm	`Failure`	0.03	test_ssvm.py
test_04_cpvm_internals	`Failure`	0.04	test_ssvm.py
test_02_upgrade_kubernetes_cluster	`Failure`	451.07	test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster	`Failure`	3623.08	test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster	`Failure`	0.04	test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster	`Failure`	0.03	test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster	`Failure`	46.77	test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown	`Error`	117.58	test_kubernetes_clusters.py

blueorangutan · 2024-01-03T22:43:24Z

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

Test	Result	Time (s)	Test File
ContextSuite context=TestAddVmToSubDomain>:setup	`Error`	13.50	test_accounts.py
test_DeleteDomain	`Error`	13.50	test_accounts.py
test_forceDeleteDomain	`Failure`	13.53	test_accounts.py
test_01_user_remove_VM_running	`Error`	2.30	test_accounts.py
test_03_network_operations_on_created_vm_of_otheruser	`Error`	2.54	test_network_permissions.py
test_03_network_operations_on_created_vm_of_otheruser	`Error`	2.54	test_network_permissions.py
test_04_deploy_vm_for_other_user_and_test_vm_operations	`Failure`	1.44	test_network_permissions.py
ContextSuite context=TestNetworkPermissions>:teardown	`Error`	1.44	test_network_permissions.py
test_02_balanced_drs_algorithm	`Error`	424.30	test_cluster_drs.py
test_02_upgrade_kubernetes_cluster	`Failure`	490.30	test_kubernetes_clusters.py

shwstppr · 2024-01-04T06:04:23Z

@blueorangutan test rocky8 vmware-67u3

blueorangutan · 2024-01-04T06:06:03Z

@shwstppr a [SL] Trillian-Jenkins test job (rocky8 mgmt + vmware-67u3) has been kicked to run smoke tests

shwstppr · 2024-01-04T06:08:13Z

@blueorangutan test

blueorangutan · 2024-01-04T06:10:04Z

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

harikrishna-patnala

code LGTM. I see this definetely fix the VMware VM ingestion part. We can think about support of parent version for hypervisor capabilities separately.

blueorangutan · 2024-01-04T19:54:50Z

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

Test	Result	Time (s)	Test File
test_01_list_sec_storage_vm	`Failure`	0.06	test_ssvm.py
test_03_ssvm_internals	`Failure`	0.06	test_ssvm.py
test_05_stop_ssvm	`Failure`	0.05	test_ssvm.py
test_12_destroy_cpvm	`Error`	7.46	test_ssvm.py
test_02_balanced_drs_algorithm	`Error`	430.00	test_cluster_drs.py

weizhouapache

code lgtm

weizhouapache · 2024-01-04T21:54:15Z

@shwstppr
Should it be re-targeted to 4.18?

blueorangutan · 2024-01-04T21:55:40Z

[SF] Trillian test result (tid-8721)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 55240 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8426-t8721-kvm-centos7.zip
Smoke tests completed. 118 look OK, 3 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`	919.94	test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster	`Failure`	3616.66	test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster	`Failure`	56.46	test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown	`Error`	117.89	test_kubernetes_clusters.py
test_08_migrate_vm	`Error`	44.96	test_vm_life_cycle.py
test_hostha_kvm_host_degraded	`Error`	700.11	test_hostha_kvm.py
test_hostha_kvm_host_fencing	`Error`	671.32	test_hostha_kvm.py
test_hostha_kvm_host_recovering	`Error`	725.54	test_hostha_kvm.py

shwstppr · 2024-01-05T06:31:08Z

@shwstppr Should it be re-targeted to 4.18?

will make the change

shwstppr · 2024-01-05T07:28:33Z

@blueorangutan package

blueorangutan · 2024-01-05T07:30:03Z

@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 · 2024-01-05T08:32:45Z

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

Fixesapache#8412 Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

shwstppr · 2024-01-05T09:50:44Z

@blueorangutan package

blueorangutan · 2024-01-05T09:52: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 · 2024-01-05T11:29:59Z

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

shwstppr · 2024-01-05T11:34:46Z

@blueorangutan test matrix

blueorangutan · 2024-01-05T11:36:03Z

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

blueorangutan · 2024-01-05T23:19:18Z

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

Test	Result	Time (s)	Test File

blueorangutan · 2024-01-05T23:26:17Z

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

Test	Result	Time (s)	Test File

blueorangutan · 2024-01-06T01:23:31Z

[SF] Trillian test result (tid-8734)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server r8
Total time taken: 48151 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8426-t8734-vmware-67u3.zip
Smoke tests completed. 108 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_upgrade_kubernetes_cluster	`Failure`	494.21	test_kubernetes_clusters.py

shwstppr · 2024-01-08T09:29:33Z

Tested Rocky Linux 9 VM import with VMware 8.0.0.2 hypervisor.

(localcloud) 🐱 > list hypervisorcapabilities hypervisor=VMware filter=id,hypervisor,hypervisorversion,
{
"count": 19,
"hypervisorCapabilities": [
{
"hypervisor": "VMware",
"hypervisorversion": "default",
"id": "8"
},
{
"hypervisor": "VMware",
"hypervisorversion": "4.0",
"id": "9"
},
{
"hypervisor": "VMware",
"hypervisorversion": "4.1",
"id": "10"
},
{
"hypervisor": "VMware",
"hypervisorversion": "5.0",
"id": "11"
},
{
"hypervisor": "VMware",
"hypervisorversion": "5.1",
"id": "12"
},
{
"hypervisor": "VMware",
"hypervisorversion": "5.5",
"id": "c57558bf-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "6.0",
"id": "cbaae7e7-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "6.5",
"id": "cd741f46-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "6.7",
"id": "cf92dd65-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "6.7.1",
"id": "cf92e9d9-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "6.7.2",
"id": "cf92f45c-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "6.7.3",
"id": "cf92fed5-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "7.0",
"id": "d14750d0-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "7.0.1.0",
"id": "d1487eae-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "7.0.2.0",
"id": "d2c839eb-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "7.0.3.0",
"id": "d2c96de9-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "8.0",
"id": "d414b048-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "8.0.0.1",
"id": "d414bc3b-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "8.0.1",
"id": "d67c19b1-abc1-11ee-8957-1e00da000152"
}
]
}

Import in UI,

import-vmw-8002.mp4

In Logs,

2024-01-08 09:23:51,845 DEBUG [c.c.a.t.Request] (API-Job-Executor-31:ctx-dfff55c7 job-38 ctx-4a1de5f8) (logid:7f598e47) Seq 1-5056135006653522013: Received: { Ans: , MgmtId: 167780543, via: 1(10.0.35.115), Ver: v1, Flags: 10, { GetUnmanagedInstancesAnswer } }
2024-01-08 09:23:51,845 DEBUG [c.c.a.m.AgentManagerImpl] (API-Job-Executor-31:ctx-dfff55c7 job-38 ctx-4a1de5f8) (logid:7f598e47) Details from executing class com.cloud.agent.api.GetUnmanagedInstancesCommand: 2024-01-08 09:23:51,854 DEBUG [c.c.s.d.GuestOSHypervisorDaoImpl] (API-Job-Executor-31:ctx-dfff55c7 job-38 ctx-4a1de5f8) (logid:7f598e47) Mapping for guest OS ID: rockylinux_64Guest for hypervisor: VMware with version: 8.0.0.2 can not be found. Trying to find one for the parent version: 8.0
2024-01-08 09:23:51,862 DEBUG [c.c.u.AccountManagerImpl] (API-Job-Executor-31:ctx-dfff55c7 job-38 ctx-4a1de5f8) (logid:7f598e47) Access granted to Account [{"accountName":"admin","id":2,"uuid":"e06f184a-abc1-11ee-8957-1e00da000152"}] to Service offering {"id":1,"name":"Small Instance","uuid":"5aebc1b7-5e3a-405f-98cf-dec841af8453"}. by AffinityGroupAccessChecker

weizhouapache · 2024-01-08T09:45:47Z

Tested Rocky Linux 9 VM import with VMware 8.0.0.2 hypervisor.

(localcloud) 🐱 > list hypervisorcapabilities hypervisor=VMware filter=id,hypervisor,hypervisorversion,
{
"count": 19,
"hypervisorCapabilities": [
{
"hypervisor": "VMware",
"hypervisorversion": "default",
"id": "8"
},
{
"hypervisor": "VMware",
"hypervisorversion": "4.0",
"id": "9"
},
{
"hypervisor": "VMware",
"hypervisorversion": "4.1",
"id": "10"
},
{
"hypervisor": "VMware",
"hypervisorversion": "5.0",
"id": "11"
},
{
"hypervisor": "VMware",
"hypervisorversion": "5.1",
"id": "12"
},
{
"hypervisor": "VMware",
"hypervisorversion": "5.5",
"id": "c57558bf-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "6.0",
"id": "cbaae7e7-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "6.5",
"id": "cd741f46-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "6.7",
"id": "cf92dd65-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "6.7.1",
"id": "cf92e9d9-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "6.7.2",
"id": "cf92f45c-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "6.7.3",
"id": "cf92fed5-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "7.0",
"id": "d14750d0-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "7.0.1.0",
"id": "d1487eae-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "7.0.2.0",
"id": "d2c839eb-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "7.0.3.0",
"id": "d2c96de9-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "8.0",
"id": "d414b048-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "8.0.0.1",
"id": "d414bc3b-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "8.0.1",
"id": "d67c19b1-abc1-11ee-8957-1e00da000152"
}
]
}

Import in UI,

import-vmw-8002.mp4
In Logs,

2024-01-08 09:23:51,845 DEBUG [c.c.a.t.Request] (API-Job-Executor-31:ctx-dfff55c7 job-38 ctx-4a1de5f8) (logid:7f598e47) Seq 1-5056135006653522013: Received: { Ans: , MgmtId: 167780543, via: 1(10.0.35.115), Ver: v1, Flags: 10, { GetUnmanagedInstancesAnswer } }
2024-01-08 09:23:51,845 DEBUG [c.c.a.m.AgentManagerImpl] (API-Job-Executor-31:ctx-dfff55c7 job-38 ctx-4a1de5f8) (logid:7f598e47) Details from executing class com.cloud.agent.api.GetUnmanagedInstancesCommand: 2024-01-08 09:23:51,854 DEBUG [c.c.s.d.GuestOSHypervisorDaoImpl] (API-Job-Executor-31:ctx-dfff55c7 job-38 ctx-4a1de5f8) (logid:7f598e47) Mapping for guest OS ID: rockylinux_64Guest for hypervisor: VMware with version: 8.0.0.2 can not be found. Trying to find one for the parent version: 8.0
2024-01-08 09:23:51,862 DEBUG [c.c.u.AccountManagerImpl] (API-Job-Executor-31:ctx-dfff55c7 job-38 ctx-4a1de5f8) (logid:7f598e47) Access granted to Account [{"accountName":"admin","id":2,"uuid":"e06f184a-abc1-11ee-8957-1e00da000152"}] to Service offering {"id":1,"name":"Small Instance","uuid":"5aebc1b7-5e3a-405f-98cf-dec841af8453"}. by AffinityGroupAccessChecker

thanks @shwstppr

it seems it worked, even without the hypervisor capabilities for 8.0.0.2

I checked the latest code of main branch, it does have the following code

cloudstack/engine/schema/src/main/java/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java

Lines 77 to 83 in 3f9dd4d

HypervisorCapabilitiesVOresult = findOneBy(sc); 
if (result != null || !HypervisorType.VMware.equals(hypervisorType) || 
CloudStackVersion.getVMwareParentVersion(hypervisorVersion) == null) { 
returnresult; 
 } 
sc.setParameters("hypervisorVersion", CloudStackVersion.getVMwareParentVersion(hypervisorVersion)); 
returnfindOneBy(sc); 

Now I am wondering if #8444 is required.

weizhouapache · 2024-01-08T09:51:54Z

also , it looks the following code snippet is not required if this PR is merged

cloudstack/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VmwareVmImplementer.java

Lines 415 to 418 in 3f9dd4d

if (parentVersion != null) { 
guestOsMapping = guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(), Hypervisor.HypervisorType.VMware.toString(), parentVersion); 
LOGGER.debug(String.format("Found guest os mappings for guest os \"%s\" on VMware %s: %s", guestOS.getDisplayName(), parentVersion, guestOsMapping)); 
 } 

shwstppr · 2024-01-08T11:16:38Z

Tested Rocky Linux 9 VM import with VMware 8.0.0.2 hypervisor.

(localcloud) 🐱 > list hypervisorcapabilities hypervisor=VMware filter=id,hypervisor,hypervisorversion,
{
"count": 19,
"hypervisorCapabilities": [
{
"hypervisor": "VMware",
"hypervisorversion": "default",
"id": "8"
},
{
"hypervisor": "VMware",
"hypervisorversion": "4.0",
"id": "9"
},
{
"hypervisor": "VMware",
"hypervisorversion": "4.1",
"id": "10"
},
{
"hypervisor": "VMware",
"hypervisorversion": "5.0",
"id": "11"
},
{
"hypervisor": "VMware",
"hypervisorversion": "5.1",
"id": "12"
},
{
"hypervisor": "VMware",
"hypervisorversion": "5.5",
"id": "c57558bf-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "6.0",
"id": "cbaae7e7-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "6.5",
"id": "cd741f46-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "6.7",
"id": "cf92dd65-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "6.7.1",
"id": "cf92e9d9-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "6.7.2",
"id": "cf92f45c-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "6.7.3",
"id": "cf92fed5-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "7.0",
"id": "d14750d0-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "7.0.1.0",
"id": "d1487eae-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "7.0.2.0",
"id": "d2c839eb-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "7.0.3.0",
"id": "d2c96de9-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "8.0",
"id": "d414b048-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "8.0.0.1",
"id": "d414bc3b-abc1-11ee-8957-1e00da000152"
},
{
"hypervisor": "VMware",
"hypervisorversion": "8.0.1",
"id": "d67c19b1-abc1-11ee-8957-1e00da000152"
}
]
}

Import in UI,
import-vmw-8002.mp4
In Logs,

2024-01-08 09:23:51,845 DEBUG [c.c.a.t.Request] (API-Job-Executor-31:ctx-dfff55c7 job-38 ctx-4a1de5f8) (logid:7f598e47) Seq 1-5056135006653522013: Received: { Ans: , MgmtId: 167780543, via: 1(10.0.35.115), Ver: v1, Flags: 10, { GetUnmanagedInstancesAnswer } }
2024-01-08 09:23:51,845 DEBUG [c.c.a.m.AgentManagerImpl] (API-Job-Executor-31:ctx-dfff55c7 job-38 ctx-4a1de5f8) (logid:7f598e47) Details from executing class com.cloud.agent.api.GetUnmanagedInstancesCommand: 2024-01-08 09:23:51,854 DEBUG [c.c.s.d.GuestOSHypervisorDaoImpl] (API-Job-Executor-31:ctx-dfff55c7 job-38 ctx-4a1de5f8) (logid:7f598e47) Mapping for guest OS ID: rockylinux_64Guest for hypervisor: VMware with version: 8.0.0.2 can not be found. Trying to find one for the parent version: 8.0
2024-01-08 09:23:51,862 DEBUG [c.c.u.AccountManagerImpl] (API-Job-Executor-31:ctx-dfff55c7 job-38 ctx-4a1de5f8) (logid:7f598e47) Access granted to Account [{"accountName":"admin","id":2,"uuid":"e06f184a-abc1-11ee-8957-1e00da000152"}] to Service offering {"id":1,"name":"Small Instance","uuid":"5aebc1b7-5e3a-405f-98cf-dec841af8453"}. by AffinityGroupAccessChecker

thanks @shwstppr

it seems it worked, even without the hypervisor capabilities for 8.0.0.2

I checked the latest code of main branch, it does have the following code

cloudstack/engine/schema/src/main/java/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java

Lines 77 to 83 in 3f9dd4d

HypervisorCapabilitiesVOresult = findOneBy(sc); 
if (result != null || !HypervisorType.VMware.equals(hypervisorType) || 
CloudStackVersion.getVMwareParentVersion(hypervisorVersion) == null) { 
returnresult; 
 } 
sc.setParameters("hypervisorVersion", CloudStackVersion.getVMwareParentVersion(hypervisorVersion)); 
returnfindOneBy(sc); 

Now I am wondering if #8444 is required.

@weizhouapache we can discuss #8444 separately.
In the original issue, @andrijapanicsb objected to retrieving hypervisor capabilities from the parent version. Also, currently, there is no way to update the minor/patch version capabilities without updating them for the parent version. Therefore, it was discussed to add the contentious versions explicitly for now.
Maybe we can introduce something like https://github.com/apache/cloudstack/compare/main...shapeblue:cloudstack:add-updhycapapi-param?expand=1
I'm happy to close #8444 (or keep just the logs part) if we have a consensus we don't need that

Regarding VMwareVmImplementer change, can we have it in a separate PR? I don't think even with having that we have issues right now

weizhouapache · 2024-01-08T11:28:37Z

@weizhouapache we can discuss #8444 separately. In the original issue, @andrijapanicsb objected to retrieving hypervisor capabilities from the parent version. Also, currently, there is no way to update the minor/patch version capabilities without updating them for the parent version. Therefore, it was discussed to add the contentious versions explicitly for now. Maybe we can introduce something like https://github.com/apache/cloudstack/compare/main...shapeblue:cloudstack:add-updhycapapi-param?expand=1 I'm happy to close #8444 (or keep just the logs part) if we have a consensus we don't need that
Regarding VMwareVmImplementer change, can we have it in a separate PR? I don't think even with having that we have issues right now

@shwstppr
agree
I am good with merging this now.

andrijapanicsb

LGTM

…e#8426) GuestOS mappings are retrieved from the parent hypervisor version when a minor, patch hypervisor version doesn't exist. Fixesapache#8412 Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

boring-cyborgBot added the component:storage label Jan 2, 2024

shwstppr requested a review from weizhouapache January 2, 2024 11:53

harikrishna-patnala reviewed Jan 2, 2024
View reviewed changes

Comment threadengine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java Outdated
Comment threadengine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java Outdated

DaanHoogland approved these changes Jan 3, 2024
View reviewed changes

shwstppr added this to the 4.19.0.0 milestone Jan 3, 2024

harikrishna-patnala approved these changes Jan 4, 2024
View reviewed changes

shwstppr mentioned this pull request Jan 4, 2024
VMware: VM ingestion broken in case of dynamically handled hypervisor/guest OS versions. #8412
Closed

weizhouapache approved these changes Jan 4, 2024
View reviewed changes

shwstppr mentioned this pull request Jan 5, 2024
Fix VMware VM ingestion template selection and default template failure #8429
Merged
13 tasks

engine-schema: fix finding guestos mapping with parent version
a707e27
Fixesapache#8412 Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

shwstppr force-pushed the fix-findguestos-parentversion branch from a24f2da to a707e27Compare January 5, 2024 09:50

shwstppr changed the base branch from main to 4.18January 5, 2024 09:50

shwstppr requested a review from andrijapanicsb January 8, 2024 09:30

shwstppr marked this pull request as ready for review January 8, 2024 11:16

andrijapanicsb approved these changes Jan 8, 2024
View reviewed changes

shwstppr merged commit f023fc5 into apache:4.18Jan 8, 2024

DaanHoogland deleted the fix-findguestos-parentversion branch January 8, 2024 15:06

Uh oh!

Conversation

shwstppr commented Jan 2, 2024

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!

codecovBot commented Jan 2, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

shwstppr commented Jan 2, 2024

Uh oh!

blueorangutan commented Jan 2, 2024

Uh oh!

blueorangutan commented Jan 2, 2024

Uh oh!

Uh oh!

Uh oh!

shwstppr commented Jan 3, 2024

Uh oh!

blueorangutan commented Jan 3, 2024

Uh oh!

blueorangutan commented Jan 3, 2024

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Jan 3, 2024

Uh oh!

blueorangutan commented Jan 3, 2024

Uh oh!

blueorangutan commented Jan 3, 2024

Uh oh!

blueorangutan commented Jan 3, 2024

Uh oh!

blueorangutan commented Jan 3, 2024

Uh oh!

shwstppr commented Jan 4, 2024

Uh oh!

blueorangutan commented Jan 4, 2024

Uh oh!

shwstppr commented Jan 4, 2024

Uh oh!

blueorangutan commented Jan 4, 2024

Uh oh!

harikrishna-patnala 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!

blueorangutan commented Jan 4, 2024

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache commented Jan 4, 2024

Uh oh!

blueorangutan commented Jan 4, 2024

Uh oh!

shwstppr commented Jan 5, 2024

Uh oh!

shwstppr commented Jan 5, 2024

Uh oh!

blueorangutan commented Jan 5, 2024

Uh oh!

blueorangutan commented Jan 5, 2024

Uh oh!

shwstppr commented Jan 5, 2024

Uh oh!

blueorangutan commented Jan 5, 2024

Uh oh!

blueorangutan commented Jan 5, 2024

Uh oh!

shwstppr commented Jan 5, 2024

Uh oh!

codecovBot commented Jan 2, 2024•
edited
Loading

harikrishna-patnala left a comment •
edited
Loading

weizhouapache commented Jan 8, 2024•
edited
Loading