Fix DB upgrade script for 4.22

[abh1sar]

Description

In PR #11531, merged to 4.22, some upgrade queries were erroneously added to 42100to42200.sql.
Moving those queries to 42200to42210.sql file.

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

Feature/Enhancement Scale

• Major
• Minor

Bug Severity

• BLOCKER
• Critical
• Major
• Minor
• Trivial

Screenshots (if appropriate):

How Has This Been Tested?

Tested upgrade from 4.21 to the PR package. Verified that the DB entries are applied during the upgrade path.

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

[abh1sar]

@blueorangutan package

[codecov]

Codecov Report

❌ Patch coverage is 62.50000% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.56%. Comparing base (21d844b) to head (235f300).
⚠️ Report is 3 commits behind head on 4.22.

Files with missing lines	Patch %	Lines
...ava/com/cloud/upgrade/dao/Upgrade42200to42210.java	57.14%	3 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##               4.22   #12111   +/-   ##
=========================================
  Coverage     17.56%   17.56%           
- Complexity    15539    15540    +1     
=========================================
  Files          5909     5910    +1     
  Lines        529097   529105    +8     
  Branches      64624    64624           
=========================================
+ Hits          92913    92918    +5     
- Misses       425729   425733    +4     
+ Partials      10455    10454    -1     

Flag	Coverage Δ
uitests	3.58% <ø> (ø)
unittests	18.62% <62.50%> (+<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.

[abh1sar]

@blueorangutan package

[blueorangutan]

@abh1sar 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 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 15801

[DaanHoogland]

@blueorangutan test

[blueorangutan]

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

[blueorangutan]

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

Test	Result	Time (s)	Test File

[abh1sar]

@blueorangutan package

[blueorangutan]

@abh1sar 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 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 15826

[weizhouapache]

code lgtm

[abh1sar]

@blueorangutan test

[blueorangutan]

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

[sureshanaparti]

clgtm

[blueorangutan]

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

Test	Result	Time (s)	Test File