Nas BnR: Fix for restore not working correctly

[abh1sar]

Description

This PR fixes an issue in Nas bnr plugin due to which restore was not working.
Even if no mount options are provided while adding the backup repository, the -o flag is added to the mount command (during restore) resulting in an error.

Restore is broken since #9666, so this needs to go into 4.20.

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?

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

[codecov]

Codecov Report

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

Project coverage is 16.13%. Comparing base (80b5d5c) to head (c73c1c9).
Report is 101 commits behind head on 4.20.

Files with missing lines	Patch %	Lines
...ce/wrapper/LibvirtRestoreBackupCommandWrapper.java	0.00%	7 Missing ⚠️

Additional details and impacted files

@@ Coverage Diff @@## 4.20 #10785 +/- ##
============================================
+ Coverage 16.00% 16.13% +0.12% - Complexity 13104 13214 +110 
============================================
Files 5651 5649 -2 Lines 495862 496691 +829 Branches 60043 60175 +132 ============================================
+ Hits 79367 80136 +769 + Misses 407635 407633 -2 - Partials 8860 8922 +62 

Flag	Coverage Δ
uitests	4.01% <ø> (+<0.01%)	⬆️
unittests	16.98% <0.00%> (+0.13%)	⬆️

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.

[Pearl1594]

code lgtm

[Pearl1594]

@blueorangutan package

[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 ✔️ debian ✔️ suse15. SL-JID 13215

[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 ✔️ debian ✔️ suse15. SL-JID 13216

[abh1sar]

@weizhouapache@DaanHoogland I have addressed your comments, please check.

[abh1sar]

@blueorangutan test

[blueorangutan]

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

[blueorangutan]

[SF] Trillian test result (tid-13188)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 52199 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10785-t13188-kvm-ol8.zip
Smoke tests completed. 140 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_restore_vm_strict_tags_failure	Failure	54.21	test_vm_strict_host_tags.py
test_02_scale_vm_strict_tags_failure	Failure	57.45	test_vm_strict_host_tags.py
test_06_deploy_vm_on_any_host_with_strict_tags_failure	Failure	3.60	test_vm_strict_host_tags.py

[yadvr]

LGTM needs testing

[DaanHoogland]

clgtm

[rajujith]

LGTM.

Tested the restore with NFS Primary storage. It works fine.