server: fix nfs version option during mounts

[shwstppr]

Description

Fixes #9469

Types of changes

• [ ] Breaking change (fix or feature that would cause existing functionality to change)
• [ ] New feature (non-breaking change which adds functionality)
• [x] 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?

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

[codecov[bot]]

Codecov Report

Attention: Patch coverage is 0% with 30 lines in your changes missing coverage. Please review.

Project coverage is 15.08%. Comparing base (b4325ec) to head (3445407). Report is 35 commits behind head on 4.19.

Files with missing lines	Patch %	Lines
...om/cloud/upgrade/SystemVmTemplateRegistration.java	0.00%	24 Missing :warning:
...ain/java/com/cloud/storage/StorageManagerImpl.java	0.00%	4 Missing :warning:
...cloudstack/diagnostics/DiagnosticsServiceImpl.java	0.00%	2 Missing :warning:

Additional details and impacted files

@@             Coverage Diff              @@
##               4.19    #9559      +/-   ##
============================================
- Coverage     15.08%   15.08%   -0.01%     
- Complexity    11185    11187       +2     
============================================
  Files          5406     5406              
  Lines        473123   473143      +20     
  Branches      61313    60436     -877     
============================================
- Hits          71378    71374       -4     
- Misses       393805   393828      +23     
- Partials       7940     7941       +1     

Flag	Coverage Δ
uitests	4.30% <ø> (ø)
unittests	15.80% <0.00%> (-0.01%)	:arrow_down:

Flags with carried forward coverage won't be shown. Click here to find out more.

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

[weizhouapache]

@blueorangutan package

[blueorangutan]

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

[shwstppr]

@blueorangutan package

[blueorangutan]

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

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

[shwstppr]

@blueorangutan package

[blueorangutan]

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

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

[shwstppr]

@blueorangutan test

[blueorangutan]

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

[blueorangutan]

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

Test	Result	Time (s)	Test File
test_01_secure_vm_migration	Error	134.49	test_vm_life_cycle.py
test_01_secure_vm_migration	Error	134.49	test_vm_life_cycle.py

[DaanHoogland]

@blueorangutan package

[blueorangutan]

@DaanHoogland 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 11029

[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-11401) Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8 Total time taken: 47750 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9559-t11401-kvm-ol8.zip Smoke tests completed. 132 look OK, 1 have errors, 0 did not run Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_03_secured_to_nonsecured_vm_migration	Error	393.96	test_vm_life_cycle.py

[DaanHoogland]

@JoaoJandre this looks like a good to have for 4.20 (and 4.19) can you concur?

[JoaoJandre]

@JoaoJandre this looks like a good to have for 4.20 (and 4.19) can you concur?

@DaanHoogland yes but it seems that no one tested the PR (yet). If we can get some manual tests on it before the freeze I think it should be in 4.20

[DaanHoogland]

@JoaoJandre this looks like a good to have for 4.20 (and 4.19) can you concur?

@DaanHoogland yes but it seems that no one tested the PR (yet). If we can get some manual tests on it before the freeze I think it should be in 4.20

trying to fit it in @JoaoJandre ;)

[DaanHoogland]

@JoaoJandre this looks like a good to have for 4.20 (and 4.19) can you concur?

@DaanHoogland yes but it seems that no one tested the PR (yet). If we can get some manual tests on it before the freeze I think it should be in 4.20

trying to fit it in @JoaoJandre ;)

This got a bit behind in priority, need to create an env that doesn't support nfsv3 to do a functional test.

[DaanHoogland]

Tested according to the initial issue:

• registering a template as system vm works and
• retrieving diagnostics data as well!