AutoScaling: support Managed User Data by weizhouapache · Pull Request #7769 · apache/cloudstack

weizhouapache · 2023-07-25T08:10:36Z

Description

This PR fixes the issue that template userdata and userdata policy are not considered in the AutoScale VM group.

Related doc PR: apache/cloudstack-documentation#335

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?

weizhouapache · 2023-07-25T08:11:07Z

@blueorangutan package

blueorangutan · 2023-07-25T08:12:03Z

@weizhouapache 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.

weizhouapache · 2023-07-25T08:37:56Z

@blueorangutan package

blueorangutan · 2023-07-25T08:40:03Z

@weizhouapache 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.

weizhouapache · 2023-07-25T09:19:03Z

@blueorangutan package

blueorangutan · 2023-07-25T09:20:03Z

@weizhouapache 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.

DaanHoogland

clgtm, ...

api/src/main/java/org/apache/cloudstack/api/BaseCmd.java

codecov · 2023-07-25T10:15:36Z

Codecov Report

Merging #7769 (5ba953d) into 4.18 (ddc2a36) will increase coverage by 0.02%.
Report is 1 commits behind head on 4.18.
The diff coverage is 65.45%.

@@             Coverage Diff              @@
##               4.18    #7769      +/-   ##
============================================
+ Coverage     13.04%   13.06%   +0.02%     
- Complexity     9067     9083      +16     
============================================
  Files          2720     2720              
  Lines        257236   257284      +48     
  Branches      40103    40114      +11     
============================================
+ Hits          33552    33610      +58     
+ Misses       219474   219453      -21     
- Partials       4210     4221      +11

Files Changed	Coverage Δ
...ava/com/cloud/upgrade/dao/Upgrade41800to41810.java	`2.30% <0.00%> (-0.06%)`	⬇️
...main/java/com/cloud/api/ApiAsyncJobDispatcher.java	`0.00% <0.00%> (ø)`
server/src/main/java/com/cloud/api/ApiServer.java	`1.82% <0.00%> (-0.01%)`	⬇️
...rver/src/main/java/com/cloud/vm/UserVmManager.java	`100.00% <ø> (ø)`
.../src/main/java/com/cloud/vm/UserVmManagerImpl.java	`7.33% <ø> (ø)`
...ava/com/cloud/network/as/AutoScaleManagerImpl.java	`56.83% <67.74%> (+0.34%)`	⬆️
...src/main/java/com/cloud/api/ApiResponseHelper.java	`4.53% <87.50%> (+0.70%)`	⬆️
...ava/com/cloud/network/as/AutoScaleVmProfileVO.java	`80.20% <100.00%> (+11.66%)`	⬆️
...c/main/java/com/cloud/user/AccountManagerImpl.java	`20.47% <100.00%> (+0.02%)`	⬆️

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

blueorangutan · 2023-07-25T10:31:01Z

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

weizhouapache · 2023-07-25T13:08:23Z

@blueorangutan test

blueorangutan · 2023-07-25T13:10:03Z

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

blueorangutan · 2023-07-26T04:05:55Z

[SF] Trillian test result (tid-7164)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 52255 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7769-t7164-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`	301.08	test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster	`Failure`	3668.77	test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster	`Failure`	0.08	test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown	`Error`	316.87	test_kubernetes_clusters.py
test_01_migrate_VM_and_root_volume	`Error`	77.66	test_vm_life_cycle.py
test_02_migrate_VM_with_two_data_disks	`Error`	56.40	test_vm_life_cycle.py
test_10_attachAndDetach_iso	`Error`	12.39	test_vm_life_cycle.py

weizhouapache · 2023-08-16T11:48:29Z

@blueorangutan package

…data-support

weizhouapache · 2023-08-16T16:32:49Z

@blueorangutan package

blueorangutan · 2023-08-16T16:34:04Z

@weizhouapache 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-08-16T17:30:21Z

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

…data-support

weizhouapache · 2023-08-17T11:14:43Z

@blueorangutan package

blueorangutan · 2023-08-17T11:16:03Z

@weizhouapache 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.

weizhouapache · 2023-08-21T15:39:43Z

@blueorangutan package

blueorangutan · 2023-08-21T15:40:03Z

@weizhouapache 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-08-21T16:43:29Z

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

weizhouapache · 2023-08-21T16:49:49Z

@blueorangutan test matrix

blueorangutan · 2023-08-21T16:50:03Z

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

blueorangutan · 2023-08-22T04:35:48Z

[SF] Trillian test result (tid-7494)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 40908 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7769-t7494-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-08-22T05:28:27Z

[SF] Trillian test result (tid-7496)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 43946 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7769-t7496-kvm-centos7.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_02_upgrade_kubernetes_cluster	`Failure`	562.56	test_kubernetes_clusters.py

rajujith

LGTM. I Verified that managed user data works fine with Autoscale VM groups.

weizhouapache · 2023-08-22T09:06:27Z

thanks @harikrishna-patnala @DaanHoogland for code review
thanks @borisstoyanov @rajujith for testing

merging

blueorangutan · 2023-08-22T22:05:50Z

[SF] Trillian test result (tid-7503)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server r8
Total time taken: 47269 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7769-t7503-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_02_upgrade_kubernetes_cluster	`Failure`	592.43	test_kubernetes_clusters.py

weizhouapache added 6 commits July 25, 2023 06:22

CreateAutoScaleVmGroup.vue: fix spelling (6609)

8dce419

CreateAutoScaleVmGroup.vue: Remove unsupported params listall (6686)

8c5b19b

CreateAutoScaleVmGroup.vue: support userdata ids (6202)

030024f

CreateAutoScaleVmGroup.vue: fix same issue as DeployVM.vue (7758)

5ab2faf

AutoScaling: support userdata id and userdata details

87d81eb

AutoScaling: use DbUpgradeUtils.addForeignKey instead of SQL procedure

7d14881

boring-cyborg bot added component:api component:networking component:UI labels Jul 25, 2023

weizhouapache added this to the 4.18.1.0 milestone Jul 25, 2023

apache deleted a comment from blueorangutan Jul 25, 2023

weizhouapache force-pushed the 4.18-asgroup-add-userdata-support branch 2 times, most recently from 2c9e2c1 to 1a56da7 Compare July 25, 2023 08:54

PR7769: add method convertDetailsToMap to BaseCmd

7d379fd

weizhouapache force-pushed the 4.18-asgroup-add-userdata-support branch from 1a56da7 to 7d379fd Compare July 25, 2023 09:17

DaanHoogland approved these changes Jul 25, 2023

View reviewed changes

api/src/main/java/org/apache/cloudstack/api/BaseCmd.java Show resolved Hide resolved

harikrishna-patnala added the status:needs-testing label Jul 25, 2023

PR7769: use convertDetailsToMap in two other APIs

6d0088b

weizhouapache force-pushed the 4.18-asgroup-add-userdata-support branch from ff47f11 to 6d0088b Compare July 26, 2023 06:34

PR7769: add more unit tests in AutoScaleManagerImplTest

6e12939

weizhouapache added 2 commits August 16, 2023 13:49

Merge remote-tracking branch 'apache/4.18' into 4.18-asgroup-add-user…

bb79878

…data-support

PR7769: add more unit tests in ApiResponseHelperTest

63e9aff

weizhouapache added 2 commits August 17, 2023 10:52

Merge remote-tracking branch 'apache/4.18' into 4.18-asgroup-add-user…

6a1df6e

…data-support

Merge branch '4.18' into 4.18-asgroup-add-userdata-support

8d4aa1a

weizhouapache changed the title ~~AutoScaling: support userdata id and userdata details~~ AutoScaling: support managed userdata Aug 21, 2023

Merge branch '4.18' into 4.18-asgroup-add-userdata-support

5ba953d

weizhouapache changed the title ~~AutoScaling: support managed userdata~~ AutoScaling: support Managed User Data Aug 21, 2023

weizhouapache marked this pull request as ready for review August 21, 2023 15:40

rajujith self-requested a review August 22, 2023 08:57

rajujith approved these changes Aug 22, 2023

View reviewed changes

weizhouapache merged commit 78bdde9 into apache:4.18 Aug 22, 2023

DaanHoogland deleted the 4.18-asgroup-add-userdata-support branch August 22, 2023 09:26

DaanHoogland mentioned this pull request Jul 14, 2025

api: fix scale or upgrade systemvm #11062

Merged

14 tasks

DaanHoogland removed the status:needs-testing label Jan 28, 2026

Conversation

weizhouapache commented Jul 25, 2023 • 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!

weizhouapache commented Jul 25, 2023

Uh oh!

blueorangutan commented Jul 25, 2023

Uh oh!

weizhouapache commented Jul 25, 2023

Uh oh!

blueorangutan commented Jul 25, 2023

Uh oh!

weizhouapache commented Jul 25, 2023

Uh oh!

blueorangutan commented Jul 25, 2023

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

codecov bot commented Jul 25, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

blueorangutan commented Jul 25, 2023

Uh oh!

weizhouapache commented Jul 25, 2023

Uh oh!

blueorangutan commented Jul 25, 2023

Uh oh!

blueorangutan commented Jul 26, 2023

Uh oh!

weizhouapache commented Aug 16, 2023

Uh oh!

weizhouapache commented Aug 16, 2023

Uh oh!

blueorangutan commented Aug 16, 2023

Uh oh!

blueorangutan commented Aug 16, 2023

Uh oh!

weizhouapache commented Aug 17, 2023

Uh oh!

blueorangutan commented Aug 17, 2023

Uh oh!

weizhouapache commented Aug 21, 2023

Uh oh!

blueorangutan commented Aug 21, 2023

Uh oh!

blueorangutan commented Aug 21, 2023

Uh oh!

weizhouapache commented Aug 21, 2023

Uh oh!

blueorangutan commented Aug 21, 2023

Uh oh!

blueorangutan commented Aug 22, 2023

Uh oh!

blueorangutan commented Aug 22, 2023

Uh oh!

rajujith left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache commented Aug 22, 2023

Uh oh!

blueorangutan commented Aug 22, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

weizhouapache commented Jul 25, 2023 •

edited by harikrishna-patnala

Loading

codecov bot commented Jul 25, 2023 •

edited

Loading