orchestration,hypervisor: allow custom manufacturer, product for vm metadata #9163

shwstppr · 2024-06-03T08:45:40Z

Description

Fixes #9142

Doc PR: apache/cloudstack-documentation#402

New global settings added to specify VM metadata wrt manufacturer and product:

vm.metadata.manufacturer
vm.metadata.product

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?

weizhouapache

code lgtm

codecov · 2024-06-03T08:54:29Z

Codecov Report

Attention: Patch coverage is 78.04878% with 9 lines in your changes missing coverage. Please review.

Project coverage is 15.55%. Comparing base (b215abc) to head (032d8f4).
Report is 1 commits behind head on main.

Files	Patch %	Lines
.../java/com/cloud/agent/api/to/VirtualMachineTO.java	50.00%	6 Missing ⚠️
...n/java/com/cloud/vm/VirtualMachineManagerImpl.java	72.72%	2 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##               main    #9163     +/-   ##
===========================================
  Coverage     15.55%   15.55%             
- Complexity    12010    12012      +2     
===========================================
  Files          5500     5500             
  Lines        481850   481889     +39     
  Branches      61843    59361   -2482     
===========================================
+ Hits          74935    74967     +32     
- Misses       398628   398636      +8     
+ Partials       8287     8286      -1

Flag	Coverage Δ
uitests	`4.17% <ø> (ø)`
unittests	`16.33% <78.04%> (+<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.

Related to apache/cloudstack#9163 Signed-off-by: Abhishek Kumar <[email protected]>

DaanHoogland

clgtm, one minor design option/issue. I would prefer the check to be MS side

engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

shwstppr · 2024-06-05T12:23:43Z

@blueorangutan package

blueorangutan · 2024-06-05T12: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 · 2024-06-05T13:38:08Z

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

rohityadavcloud

LGTM but we should add caveat that it could break cloud-init

rohityadavcloud

LGTM didn't test it

rohityadavcloud · 2024-06-10T06:16:53Z

@shwstppr is this ready for review or still need some work (as the PR is in draft)

@blueorangutan package

blueorangutan · 2024-06-10T06:18:04Z

@rohityadavcloud 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-06-10T07:36:28Z

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

shwstppr · 2024-06-10T07:42:17Z

@rohityadavcloud marked it ready

A note about cloud-init behaviour is added in the global config descriptions and in the doc PR

weizhouapache · 2024-06-10T07:48:38Z

@rohityadavcloud marked it ready

A note about cloud-init behaviour is added in the global config descriptions and in the doc PR

thanks @shwstppr

overall looks good to me

is it implemented for kvm ?
can you add a unit test for it ?

shwstppr · 2024-06-10T08:50:19Z

@weizhouapache added tests
Currently only used in KVM VM definitions. I couldn't find any reference in other hypervisor plugins

shwstppr · 2024-06-10T08:59:24Z

@blueorangutan package

blueorangutan · 2024-06-10T09:00: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.

weizhouapache · 2024-06-10T09:03:09Z

@weizhouapache added tests Currently only used in KVM VM definitions. I couldn't find any reference in other hypervisor plugins

thanks
code lgtm

blueorangutan · 2024-06-10T10:06:51Z

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

shwstppr · 2024-06-12T18:11:25Z

@blueorangutan test

blueorangutan · 2024-06-12T18:12:03Z

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

blueorangutan · 2024-06-13T13:06:55Z

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

Test	Result	Time (s)	Test File
test_list_system_vms_metrics_history	`Failure`	0.24	test_metrics_api.py
test_02_trigger_shutdown	`Failure`	346.76	test_safe_shutdown.py
test_01_sys_vm_start	`Failure`	240.43	test_secondary_storage.py
test_11_destroy_ssvm	`Failure`	917.02	test_ssvm.py
test_12_destroy_cpvm	`Failure`	913.26	test_ssvm.py
test_04_deploy_vnf_appliance	`Error`	112.90	test_vnf_templates.py
test_04_deploy_vnf_appliance	`Error`	112.90	test_vnf_templates.py
test_05_delete_vnf_template	`Error`	1.08	test_vnf_templates.py
ContextSuite context=TestVnfTemplates>:teardown	`Error`	2.20	test_vnf_templates.py
test_hostha_enable_ha_when_host_disabled	`Error`	5.96	test_hostha_kvm.py
test_hostha_enable_ha_when_host_in_maintenance	`Error`	306.10	test_hostha_kvm.py

weizhouapache · 2024-06-13T14:18:37Z

@blueorangutan test rocky8 kvm-rocky8

blueorangutan · 2024-06-13T14:20:04Z

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

blueorangutan · 2024-06-13T14:51:25Z

[SF] Trillian Build Failed (tid-10435)

shwstppr · 2024-07-22T06:48:30Z

@blueorangutan package

blueorangutan · 2024-07-22T06:50: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-07-22T08:08:54Z

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

DaanHoogland · 2024-07-22T09:06:41Z

@blueorangutan LLtest alma8 kvm-alma8

blueorangutan · 2024-07-22T09:08:02Z

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

blueorangutan · 2024-07-22T22:49:08Z

[LL]Trillian test result (tid-6962)
Environment: kvm-alma8 (x2), Advanced Networking with Mgmt server a8
Total time taken: 46628 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9163-t6962-kvm-alma8.zip
Smoke tests completed. 135 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_invalid_upgrade_kubernetes_cluster	`Failure`	0.01	test_kubernetes_clusters.py
test_02_upgrade_kubernetes_cluster	`Failure`	0.00	test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster	`Failure`	0.00	test_kubernetes_clusters.py
test_04_autoscale_kubernetes_cluster	`Failure`	0.00	test_kubernetes_clusters.py
test_05_basic_lifecycle_kubernetes_cluster	`Failure`	0.00	test_kubernetes_clusters.py
test_06_delete_kubernetes_cluster	`Failure`	0.00	test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster	`Failure`	0.00	test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster	`Failure`	0.00	test_kubernetes_clusters.py
test_11_test_unmanaged_cluster_lifecycle	`Error`	0.00	test_kubernetes_clusters.py
test_06_purge_expunged_vm_background_task	`Failure`	322.81	test_purge_expunged_vms.py

metadata Fixes apache#9142 Signed-off-by: Abhishek Kumar <[email protected]>

shwstppr · 2024-08-22T09:39:24Z

@blueorangutan package

blueorangutan · 2024-08-22T09:40: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-08-22T10:49:51Z

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

shwstppr · 2024-08-22T11:33:34Z

@blueorangutan test

blueorangutan · 2024-08-22T11:34:05Z

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

vladimirpetrov

LGTM based on manual testing. Tested with Oracle Linux 8 KVM and CentOS 7 guest OS.

blueorangutan · 2024-08-23T03:11:31Z

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

Test	Result	Time (s)	Test File

…pache#9163) Signed-off-by: Abhishek Kumar <[email protected]>

boring-cyborg bot added component:api component:compute component:kvm component:orchestration labels Jun 3, 2024

weizhouapache approved these changes Jun 3, 2024

View reviewed changes

shwstppr added a commit to shapeblue/cloudstack-documentation that referenced this pull request Jun 3, 2024

instance: note on metadata

19a2415

Related to apache/cloudstack#9163 Signed-off-by: Abhishek Kumar <[email protected]>

shwstppr mentioned this pull request Jun 3, 2024

instance: note on metadata apache/cloudstack-documentation#402

Merged

DaanHoogland approved these changes Jun 3, 2024

View reviewed changes

engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java Show resolved Hide resolved

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java Outdated Show resolved Hide resolved

shwstppr changed the title ~~orchestration,hypervisor: allow custom manufacture, product for vm metadata~~ orchestration,hypervisor: allow custom manufacturer, product for vm metadata Jun 5, 2024

rohityadavcloud added this to the 4.20.0.0 milestone Jun 10, 2024

rohityadavcloud approved these changes Jun 10, 2024

View reviewed changes

rohityadavcloud closed this Jun 10, 2024

rohityadavcloud reopened this Jun 10, 2024

shwstppr marked this pull request as ready for review June 10, 2024 07:41

rohityadavcloud approved these changes Jun 12, 2024

View reviewed changes

DaanHoogland added the status:needs-testing label Jun 12, 2024

vladimirpetrov self-assigned this Aug 20, 2024

orchestration,hypervisor: allow custom manufacture, product for vm

032d8f4

metadata Fixes apache#9142 Signed-off-by: Abhishek Kumar <[email protected]>

shwstppr force-pushed the add-custommetamanufactureproduct branch from 7f3c76a to 032d8f4 Compare August 22, 2024 09:36

vladimirpetrov approved these changes Aug 22, 2024

View reviewed changes

vladimirpetrov removed the status:needs-testing label Aug 22, 2024

DaanHoogland merged commit 1e12a80 into apache:main Aug 22, 2024

DaanHoogland deleted the add-custommetamanufactureproduct branch August 22, 2024 15:19

dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Aug 30, 2024

orchestration,hypervisor: allow custom manufacture, product for vm (a…

46185d2

…pache#9163) Signed-off-by: Abhishek Kumar <[email protected]>

orchestration,hypervisor: allow custom manufacturer, product for vm metadata #9163

orchestration,hypervisor: allow custom manufacturer, product for vm metadata #9163

Uh oh!

Conversation

shwstppr commented Jun 3, 2024 • edited 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?

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

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Jun 3, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

shwstppr commented Jun 5, 2024

Uh oh!

blueorangutan commented Jun 5, 2024

Uh oh!

blueorangutan commented Jun 5, 2024

Uh oh!

rohityadavcloud left a comment

Choose a reason for hiding this comment

Uh oh!

rohityadavcloud left a comment

Choose a reason for hiding this comment

Uh oh!

rohityadavcloud commented Jun 10, 2024

Uh oh!

blueorangutan commented Jun 10, 2024

Uh oh!

blueorangutan commented Jun 10, 2024

Uh oh!

shwstppr commented Jun 10, 2024

Uh oh!

weizhouapache commented Jun 10, 2024

Uh oh!

shwstppr commented Jun 10, 2024

Uh oh!

shwstppr commented Jun 10, 2024

Uh oh!

blueorangutan commented Jun 10, 2024

Uh oh!

weizhouapache commented Jun 10, 2024

Uh oh!

blueorangutan commented Jun 10, 2024

Uh oh!

shwstppr commented Jun 12, 2024

Uh oh!

blueorangutan commented Jun 12, 2024

Uh oh!

blueorangutan commented Jun 13, 2024

Uh oh!

weizhouapache commented Jun 13, 2024

Uh oh!

blueorangutan commented Jun 13, 2024

Uh oh!

blueorangutan commented Jun 13, 2024

Uh oh!

shwstppr commented Jul 22, 2024

Uh oh!

blueorangutan commented Jul 22, 2024

Uh oh!

blueorangutan commented Jul 22, 2024

Uh oh!

DaanHoogland commented Jul 22, 2024

Uh oh!

blueorangutan commented Jul 22, 2024

shwstppr commented Jun 3, 2024 •

edited

Loading

codecov bot commented Jun 3, 2024 •

edited

Loading