[WIP] Update ovftool, virt-v2v version check cmds to run with quotes #11566

sureshanaparti · 2025-09-03T12:14:51Z

Description

This PR updates ovftool, virt-v2v version check cmds to run with quotes.

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

Screenshots (if appropriate):

How Has This Been Tested?

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

sureshanaparti · 2025-09-03T12:15:57Z

@blueorangutan package

blueorangutan · 2025-09-03T12:18:06Z

@sureshanaparti 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 · 2025-09-03T12:22:16Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 16.17%. Comparing base (f24b175) to head (c7561ec).
⚠️ Report is 1 commits behind head on 4.20.

Additional details and impacted files

@@            Coverage Diff            @@
##               4.20   #11566   +/-   ##
=========================================
  Coverage     16.17%   16.17%           
- Complexity    13284    13286    +2     
=========================================
  Files          5656     5656           
  Lines        498015   498015           
  Branches      60406    60406           
=========================================
+ Hits          80538    80541    +3     
+ Misses       408514   408513    -1     
+ Partials       8963     8961    -2

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

Copilot

Pull Request Overview

This PR adds double quotes around shell command strings used for version checking of ovftool and virt-v2v tools. This enhancement ensures proper command execution when these commands contain special characters or spaces that could be misinterpreted by the shell.

Wraps existing version check commands in double quotes for safe shell execution
Updates commands for ovftool, virt-v2v, and package checking utilities
Maintains backward compatibility while improving command reliability

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

Copilot · 2025-09-03T13:06:46Z

...ypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

+    public static final String INSTANCE_CONVERSION_SUPPORTED_CHECK_CMD = "\"virt-v2v --version\"";
    // virt-v2v --version => sample output: virt-v2v 1.42.0rhel=8,release=22.module+el8.10.0+1590+a67ab969
-    public static final String OVF_EXPORT_SUPPORTED_CHECK_CMD = "ovftool --version";
+    public static final String OVF_EXPORT_SUPPORTED_CHECK_CMD = "\"ovftool --version\"";
    // ovftool --version => sample output: VMware ovftool 4.6.0 (build-21452615)
-    public static final String OVF_EXPORT_TOOl_GET_VERSION_CMD = "ovftool --version | awk '{print $3}'";
+    public static final String OVF_EXPORT_TOOl_GET_VERSION_CMD = "\"ovftool --version | awk '{print $3}'\"";

-    public static final String WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "rpm -qa | grep -i virtio-win";
-    public static final String UBUNTU_WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "dpkg -l virtio-win";
-    public static final String UBUNTU_NBDKIT_PKG_CHECK_CMD = "dpkg -l nbdkit";
+    public static final String WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "\"rpm -qa | grep -i virtio-win\"";
+    public static final String UBUNTU_WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "\"dpkg -l virtio-win\"";
+    public static final String UBUNTU_NBDKIT_PKG_CHECK_CMD = "\"dpkg -l nbdkit\"";


Adding quotes around entire commands may cause issues depending on how these constants are used. If these strings are passed to ProcessBuilder or similar APIs that handle arguments separately, the quotes will be interpreted literally rather than as shell quoting. Consider reviewing how these constants are consumed to ensure the quoting approach is appropriate for the execution method.

Copilot · 2025-09-03T13:06:46Z

...ypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

+    public static final String INSTANCE_CONVERSION_SUPPORTED_CHECK_CMD = "\"virt-v2v --version\"";
    // virt-v2v --version => sample output: virt-v2v 1.42.0rhel=8,release=22.module+el8.10.0+1590+a67ab969
-    public static final String OVF_EXPORT_SUPPORTED_CHECK_CMD = "ovftool --version";
+    public static final String OVF_EXPORT_SUPPORTED_CHECK_CMD = "\"ovftool --version\"";
    // ovftool --version => sample output: VMware ovftool 4.6.0 (build-21452615)
-    public static final String OVF_EXPORT_TOOl_GET_VERSION_CMD = "ovftool --version | awk '{print $3}'";
+    public static final String OVF_EXPORT_TOOl_GET_VERSION_CMD = "\"ovftool --version | awk '{print $3}'\"";

-    public static final String WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "rpm -qa | grep -i virtio-win";
-    public static final String UBUNTU_WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "dpkg -l virtio-win";
-    public static final String UBUNTU_NBDKIT_PKG_CHECK_CMD = "dpkg -l nbdkit";
+    public static final String WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "\"rpm -qa | grep -i virtio-win\"";
+    public static final String UBUNTU_WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "\"dpkg -l virtio-win\"";
+    public static final String UBUNTU_NBDKIT_PKG_CHECK_CMD = "\"dpkg -l nbdkit\"";


Adding quotes around entire commands may cause issues depending on how these constants are used. If these strings are passed to ProcessBuilder or similar APIs that handle arguments separately, the quotes will be interpreted literally rather than as shell quoting. Consider reviewing how these constants are consumed to ensure the quoting approach is appropriate for the execution method.

Copilot · 2025-09-03T13:06:47Z

...ypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

+    public static final String INSTANCE_CONVERSION_SUPPORTED_CHECK_CMD = "\"virt-v2v --version\"";
    // virt-v2v --version => sample output: virt-v2v 1.42.0rhel=8,release=22.module+el8.10.0+1590+a67ab969
-    public static final String OVF_EXPORT_SUPPORTED_CHECK_CMD = "ovftool --version";
+    public static final String OVF_EXPORT_SUPPORTED_CHECK_CMD = "\"ovftool --version\"";
    // ovftool --version => sample output: VMware ovftool 4.6.0 (build-21452615)
-    public static final String OVF_EXPORT_TOOl_GET_VERSION_CMD = "ovftool --version | awk '{print $3}'";
+    public static final String OVF_EXPORT_TOOl_GET_VERSION_CMD = "\"ovftool --version | awk '{print $3}'\"";

-    public static final String WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "rpm -qa | grep -i virtio-win";
-    public static final String UBUNTU_WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "dpkg -l virtio-win";
-    public static final String UBUNTU_NBDKIT_PKG_CHECK_CMD = "dpkg -l nbdkit";
+    public static final String WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "\"rpm -qa | grep -i virtio-win\"";
+    public static final String UBUNTU_WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "\"dpkg -l virtio-win\"";
+    public static final String UBUNTU_NBDKIT_PKG_CHECK_CMD = "\"dpkg -l nbdkit\"";


Adding quotes around entire commands may cause issues depending on how these constants are used. If these strings are passed to ProcessBuilder or similar APIs that handle arguments separately, the quotes will be interpreted literally rather than as shell quoting. Consider reviewing how these constants are consumed to ensure the quoting approach is appropriate for the execution method.

Copilot · 2025-09-03T13:06:47Z

...ypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

+    public static final String WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "\"rpm -qa | grep -i virtio-win\"";
+    public static final String UBUNTU_WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "\"dpkg -l virtio-win\"";
+    public static final String UBUNTU_NBDKIT_PKG_CHECK_CMD = "\"dpkg -l nbdkit\"";


Adding quotes around entire commands may cause issues depending on how these constants are used. If these strings are passed to ProcessBuilder or similar APIs that handle arguments separately, the quotes will be interpreted literally rather than as shell quoting. Consider reviewing how these constants are consumed to ensure the quoting approach is appropriate for the execution method.

Suggested change

public static final String WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "\"rpm -qa | grep -i virtio-win\"";

public static final String UBUNTU_WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "\"dpkg -l virtio-win\"";

public static final String UBUNTU_NBDKIT_PKG_CHECK_CMD = "\"dpkg -l nbdkit\"";

public static final String UBUNTU_NBDKIT_PKG_CHECK_CMD = "dpkg -l nbdkit";

blueorangutan · 2025-09-03T13:44:00Z

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

Update ovftool, virt-v2v version check cmds to run with quotes

c7561ec

boring-cyborg bot added the component:kvm label Sep 3, 2025

sureshanaparti requested a review from Copilot September 3, 2025 13:03

Copilot AI reviewed Sep 3, 2025

View reviewed changes

sureshanaparti changed the title ~~Update ovftool, virt-v2v version check cmds to run with quotes~~ [WIP] Update ovftool, virt-v2v version check cmds to run with quotes Sep 4, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[WIP] Update ovftool, virt-v2v version check cmds to run with quotes #11566

[WIP] Update ovftool, virt-v2v version check cmds to run with quotes #11566

Uh oh!

sureshanaparti commented Sep 3, 2025

Uh oh!

sureshanaparti commented Sep 3, 2025

Uh oh!

blueorangutan commented Sep 3, 2025

Uh oh!

codecov bot commented Sep 3, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Sep 3, 2025

Uh oh!

Copilot AI Sep 3, 2025

Uh oh!

Copilot AI Sep 3, 2025

Uh oh!

Copilot AI Sep 3, 2025

Uh oh!

blueorangutan commented Sep 3, 2025

Uh oh!

Uh oh!

[WIP] Update ovftool, virt-v2v version check cmds to run with quotes #11566

Are you sure you want to change the base?

[WIP] Update ovftool, virt-v2v version check cmds to run with quotes #11566

Uh oh!

Conversation

sureshanaparti commented Sep 3, 2025

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

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

Uh oh!

sureshanaparti commented Sep 3, 2025

Uh oh!

blueorangutan commented Sep 3, 2025

Uh oh!

codecov bot commented Sep 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Copilot AI Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Sep 3, 2025

Uh oh!

Uh oh!

codecov bot commented Sep 3, 2025 •

edited

Loading