Fix secondary storage selectors feature

[winterhazel]

Description

The secondary storage selectors feature is not working in the 4.20 and main branches.

PR #9873 changed the return of org.apache.cloudstack.storage.heuristics.presetvariables.GenericHeuristicPresetVariable#toString; however, as this method is used to build the secondary storage selection script, the changes made it stop working.

Here's how the script looked like before #9873:

secondaryStorages = [{"id":"f7e21c42-f621-4412-8994-36e077f0faec","protocol":"nfs","totalDiskSize":104028176384,"usedDiskSize":47059042304,"name":"sec"}, {"id":"0d88afc2-93eb-4070-8fbf-d8909f62364d","protocol":"nfs","totalDiskSize":104028176384,"usedDiskSize":47059042304,"name":"sec-2"}]; snapshot = {"hypervisorType":"KVM","size":52428800,"name":"e"}; account = {"domain":{"id":"40815ad7-28b2-11ef-a04e-6ac09c2b3d6b","name":"ROOT"},"id":"60b92e66-28b2-11ef-a04e-6ac09c2b3d6b","name":"admin"}; '0d88afc2-93eb-4070-8fbf-d8909f62364d';

And how it looks like now:

secondaryStorages = [GenericHeuristicPresetVariable {"id":"865197af-0bcc-4041-b031-8e6590cf41c4","protocol":"nfs","totalDiskSize":51460964352,"usedDiskSize":37255905280,"name":"sec-a-zn-1"}, GenericHeuristicPresetVariable {"id":"16babc8c-a6e8-4bb3-b581-c37afad4b442","protocol":"nfs","totalDiskSize":51460964352,"usedDiskSize":37255905280,"name":"sec-b-zn-1"}]; snapshot = GenericHeuristicPresetVariable {"hypervisorType":"KVM","size":52428800,"name":"a"}; account = GenericHeuristicPresetVariable {"domain":"GenericHeuristicPresetVariable {\"id\":\"40815ad7-28b2-11ef-a04e-6ac09c2b3d6b\",\"name\":\"ROOT\"}","id":"60b92e66-28b2-11ef-a04e-6ac09c2b3d6b","name":"admin"}; '16babc8c-a6e8-4bb3-b581-c37afad4b442';

This PR reverts the method to its previous state.

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
• test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Bug Severity

• BLOCKER
• Critical
• Major
• Minor
• Trivial

How Has This Been Tested?

1. I created a heuristic rule to direct snapshots to a specific secondary storage

(admin) 🐢 > create secondarystorageselector description=a name=a zoneid=065b0fd8-f562-480a-b278-ea3d9306a326  heuristicrule="'0d88afc2-93eb-4070-8fbf-d8909f62364d';" type=SNAPSHOT

2. I tried to take a snapshot

Before the changes, the snapshot process would fail due to an exception thrown by the JS interpreter. Applying the patch made it work again and correctly directed the snapshot to the secondary storage that I specified.

[winterhazel]

@blueorangutan package

[blueorangutan]

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

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 16.01%. Comparing base (b8359e8) to head (f5859f0).
Report is 13 commits behind head on 4.20.

Additional details and impacted files

@@            Coverage Diff            @@
##               4.20   #10546   +/-   ##
=========================================
  Coverage     16.00%   16.01%           
- Complexity    13104    13115   +11     
=========================================
  Files          5651     5651           
  Lines        495841   495841           
  Branches      60044    60045    +1     
=========================================
+ Hits          79365    79411   +46     
+ Misses       407613   407566   -47     
- Partials       8863     8864    +1     

Flag	Coverage Δ
uitests	4.00% <ø> (ø)
unittests	16.85% <100.00%> (+<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.

🚀 New features to boost your workflow:

• ❄ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

[blueorangutan]

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

[DaanHoogland]

lgtm, @vishesh92 , can you check if there was a pressing reason the string GenericHeuristicPresetVariable was included in toString()?

[vishesh92]

lgtm, @vishesh92 , can you check if there was a pressing reason the string GenericHeuristicPresetVariable was included in toString()?

It was just to improve logging.

[winterhazel]

@blueorangutan package

[blueorangutan]

@winterhazel 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]

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

[Pearl1594]

@blueorangutan test

[blueorangutan]

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

[blueorangutan]

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

Test	Result	Time (s)	Test File