Detect password file option while kvm initialisation

harikrishna-patnala · harikrishna-patnala · commit 7fb0b854059d · 2026-04-07T19:09:15.000+05:30
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -892,6 +892,7 @@ protected enum HealthCheckResult {
     protected String cachePath;
     private String vddkTransports = null;
     private String vddkThumbprint = null;
+    private String detectedPasswordFileOption = null;
     protected String javaTempDir = System.getProperty("java.io.tmpdir");
 
     private String getEndIpFromStartIp(final String startIp, final int numIps) {
@@ -1185,6 +1186,13 @@ public boolean configure(final String name, final Map<String, Object> params) th
         vddkThumbprint = StringUtils.trimToNull(
                 AgentPropertiesFileHandler.getPropertyValue(AgentProperties.VDDK_THUMBPRINT));
 
+        detectedPasswordFileOption = detectPasswordFileOption();
+        if (StringUtils.isNotBlank(detectedPasswordFileOption)) {
+            LOGGER.info("Detected virt-v2v password option: {}", detectedPasswordFileOption);
+        } else {
+            LOGGER.warn("Could not detect virt-v2v password option, VDDK conversions may fail");
+        }
+
         pool = (String)params.get("pool");
         if (pool == null) {
             pool = "/root";
@@ -5980,6 +5988,40 @@ public boolean hostSupportsOvfExport() {
         return exitValue == 0;
     }
 
+    /**
+     * Detect which password option virt-v2v supports by examining its --help output
+     * @return "-ip" if supported (virt-v2v >= 2.8.1), "--password-file" if older version, or null if detection fails
+     */
+    protected String detectPasswordFileOption() {
+        try {
+            ProcessBuilder pb = new ProcessBuilder("virt-v2v", "--help");
+            Process process = pb.start();
+
+            String output = new String(process.getInputStream().readAllBytes());
+            process.waitFor();
+
+            if (output.contains("-ip <filename>")) {
+                return "-ip";
+            } else if (output.contains("--password-file")) {
+                return "--password-file";
+            } else {
+                LOGGER.error("virt-v2v does not support -ip or --password-file");
+                return null;
+            }
+        } catch (Exception e) {
+            LOGGER.error("Failed to detect virt-v2v password option: {}", e.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * Get the detected password file option for virt-v2v
+     * @return the password option ("-ip" or "--password-file") or null if not detected
+     */
+    public String getDetectedPasswordFileOption() {
+        return detectedPasswordFileOption;
+    }
+
     public String getHostVirtV2vVersion() {
         if (!hostSupportsInstanceConversion()) {
             return "";
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
@@ -57,9 +57,6 @@ public class LibvirtConvertInstanceCommandWrapper extends CommandWrapper<Convert
     private static final List<Hypervisor.HypervisorType> supportedInstanceConvertSourceHypervisors =
             List.of(Hypervisor.HypervisorType.VMware);
     private static final Pattern SHA1_FINGERPRINT_PATTERN = Pattern.compile("(?i)(?:SHA1\\s+)?Fingerprint\\s*=\\s*([0-9A-F:]+)");
-    private static final Pattern VERSION_PREFIX_PATTERN = Pattern.compile("^(\\d+)(?:\\.(\\d+))?(?:\\.(\\d+))?.*");
-    private static final String LEGACY_PASSWORD_FILE_OPTION = "--password-file";
-    private static final String PASSWORD_INTERACTIVE_FILE_OPTION = "-ip";
 
     @Override
     public Answer execute(ConvertInstanceCommand cmd, LibvirtComputingResource serverResource) {
@@ -115,10 +112,10 @@ public Answer execute(ConvertInstanceCommand cmd, LibvirtComputingResource serve
                 String libguestfsBackend = StringUtils.defaultIfBlank(resolveVddkSetting(cmd.getLibguestfsBackend(), serverResource.getLibguestfsBackend()), "direct");
                 String vddkTransports = resolveVddkSetting(cmd.getVddkTransports(), serverResource.getVddkTransports());
                 String configuredVddkThumbprint = resolveVddkSetting(cmd.getVddkThumbprint(), serverResource.getVddkThumbprint());
-                String virtV2vVersion = serverResource.getHostVirtV2vVersion();
+                String passwordOption = serverResource.getDetectedPasswordFileOption();
                 result = performInstanceConversionVddk(sourceInstance, originalVMName, temporaryConvertPath,
                         vddkLibDir, libguestfsBackend, vddkTransports, configuredVddkThumbprint,
-                        timeout, verboseModeEnabled, extraParams, virtV2vVersion);
+                        timeout, verboseModeEnabled, extraParams, temporaryConvertUuid, passwordOption);
             } else {
                 logger.info("({}) Using OVF-based conversion (export + local convert)", originalVMName);
                 String sourceOVFDirPath;
@@ -312,7 +309,7 @@ protected boolean performInstanceConversionVddk(RemoteInstanceTO vmwareInstance,
                                                     String libguestfsBackend, String vddkTransports,
                                                     String configuredVddkThumbprint,
                                                     long timeout, boolean verboseModeEnabled, String extraParams,
-                                                    String virtV2vVersion) {
+                                                    String temporaryConvertUuid, String passwordOption) {
 
         String vcenterPassword = vmwareInstance.getVcenterPassword();
         if (StringUtils.isBlank(vcenterPassword)) {
@@ -340,7 +337,12 @@ protected boolean performInstanceConversionVddk(RemoteInstanceTO vmwareInstance,
         cmd.append("virt-v2v ");
         cmd.append("--root first ");
         cmd.append("-ic '").append(vpxUrl).append("' ");
-        cmd.append(getPasswordInputOptionForVersion(virtV2vVersion)).append(" ").append(passwordFilePath).append(" ");
+        if (StringUtils.isBlank(passwordOption)) {
+            logger.error("({}) Could not determine supported password file option for virt-v2v", originalVMName);
+            return false;
+        }
+
+        cmd.append(passwordOption).append(" ").append(passwordFilePath).append(" ");
         cmd.append("-it vddk ");
         cmd.append("-io vddk-libdir=").append(vddkLibDir).append(" ");
         String vddkThumbprint = StringUtils.trimToNull(configuredVddkThumbprint);
@@ -359,6 +361,7 @@ protected boolean performInstanceConversionVddk(RemoteInstanceTO vmwareInstance,
         cmd.append("-o local ");
         cmd.append("-os ").append(temporaryConvertFolder).append(" ");
         cmd.append("-of qcow2 ");
+        cmd.append("-on ").append(temporaryConvertUuid).append(" ");
 
         if (verboseModeEnabled) {
             cmd.append("-v ");
@@ -393,43 +396,6 @@ protected boolean performInstanceConversionVddk(RemoteInstanceTO vmwareInstance,
         return exitValue == 0;
     }
 
-    protected String getPasswordInputOptionForVersion(String virtV2vVersion) {
-        // virt-v2v 2.8.1 replaced --password-file with -ip.
-        if (isVersionAtLeast(virtV2vVersion, 2, 8, 1)) {
-            return PASSWORD_INTERACTIVE_FILE_OPTION;
-        }
-        return LEGACY_PASSWORD_FILE_OPTION;
-    }
-
-    private boolean isVersionAtLeast(String version, int major, int minor, int patch) {
-        int[] parsedVersion = parseVersionPrefix(version);
-        if (parsedVersion == null) {
-            return false;
-        }
-        if (parsedVersion[0] != major) {
-            return parsedVersion[0] > major;
-        }
-        if (parsedVersion[1] != minor) {
-            return parsedVersion[1] > minor;
-        }
-        return parsedVersion[2] >= patch;
-    }
-
-    private int[] parseVersionPrefix(String version) {
-        String normalized = StringUtils.trimToNull(version);
-        if (normalized == null) {
-            return null;
-        }
-        Matcher matcher = VERSION_PREFIX_PATTERN.matcher(normalized);
-        if (!matcher.matches()) {
-            return null;
-        }
-        return new int[] {
-                Integer.parseInt(matcher.group(1)),
-                StringUtils.isNotBlank(matcher.group(2)) ? Integer.parseInt(matcher.group(2)) : 0,
-                StringUtils.isNotBlank(matcher.group(3)) ? Integer.parseInt(matcher.group(3)) : 0
-        };
-    }
 
     protected String getVcenterThumbprint(String vcenterHost, long timeout, String originalVMName) {
         if (StringUtils.isBlank(vcenterHost)) {
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapperTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapperTest.java
@@ -214,13 +214,14 @@ public void testPerformInstanceConversionVddkUsesConfiguredLibguestfsBackend() {
             filesMock.when(() -> Files.deleteIfExists(passwordFilePath)).thenReturn(true);
 
             boolean result = convertInstanceCommandWrapper.performInstanceConversionVddk(
-                    remoteInstanceTO, vmName, "/tmp/convert", "/opt/vddk", "libvirt", null, null, 1000L, false, null, "1.42.0");
+                    remoteInstanceTO, vmName, "/tmp/convert", "/opt/vddk", "libvirt", null, null, 1000L, false, null, "tmp-uuid", "-ip");
 
             Assert.assertTrue(result);
             Script scriptMock = ignored.constructed().get(0);
             Mockito.verify(scriptMock).add("-c");
             Mockito.verify(scriptMock).add(Mockito.contains("export LIBGUESTFS_BACKEND=libvirt &&"));
-            Mockito.verify(scriptMock).add(Mockito.contains("--password-file /root/v2v.pass.cloud.vcenter.local "));
+            Mockito.verify(scriptMock).add(Mockito.contains("-ip /root/v2v.pass.cloud.vcenter.local "));
+            Mockito.verify(scriptMock).add(Mockito.contains(" -on tmp-uuid "));
             Mockito.verify(scriptMock).add(Mockito.contains("-io vddk-thumbprint=28:19:A6:1C:90:ED:46:D7:1C:86:BC:F6:13:52:F0:B9:19:81:0D:81 "));
         }
     }
@@ -247,7 +248,7 @@ public void testPerformInstanceConversionVddkUsesConfiguredTransportsOrder() {
             filesMock.when(() -> Files.deleteIfExists(passwordFilePath)).thenReturn(true);
 
             boolean result = convertInstanceCommandWrapper.performInstanceConversionVddk(
-                    remoteInstanceTO, vmName, "/tmp/convert", "/opt/vddk", "direct", "nbd:nbdssl", null, 1000L, false, null, "1.42.0");
+                    remoteInstanceTO, vmName, "/tmp/convert", "/opt/vddk", "direct", "nbd:nbdssl", null, 1000L, false, null, "tmp-uuid", "-ip");
 
             Assert.assertTrue(result);
             Script scriptMock = ignored.constructed().get(0);
@@ -273,7 +274,7 @@ public void testPerformInstanceConversionVddkFailsWhenThumbprintUnavailable() {
             filesMock.when(() -> Files.deleteIfExists(passwordFilePath)).thenReturn(true);
 
             boolean result = convertInstanceCommandWrapper.performInstanceConversionVddk(
-                    remoteInstanceTO, vmName, "/tmp/convert", "/opt/vddk", "direct", null, null, 1000L, false, null, "1.42.0");
+                    remoteInstanceTO, vmName, "/tmp/convert", "/opt/vddk", "direct", null, null, 1000L, false, null, "tmp-uuid", "-ip");
 
             Assert.assertFalse(result);
         }
@@ -300,7 +301,7 @@ public void testPerformInstanceConversionVddkUsesConfiguredThumbprintFromAgentPr
 
             boolean result = convertInstanceCommandWrapper.performInstanceConversionVddk(
                     remoteInstanceTO, vmName, "/tmp/convert", "/opt/vddk", "direct", null,
-                    "AA:BB:CC:DD:EE", 1000L, false, null, "1.42.0");
+                    "AA:BB:CC:DD:EE", 1000L, false, null, "tmp-uuid", "-ip");
 
             Assert.assertTrue(result);
             Script scriptMock = ignored.constructed().get(0);
@@ -309,18 +310,4 @@ public void testPerformInstanceConversionVddkUsesConfiguredThumbprintFromAgentPr
                     .getVcenterThumbprint(Mockito.anyString(), Mockito.anyLong(), Mockito.anyString());
         }
     }
-
-    @Test
-    public void testGetPasswordInputOptionForVersionUsesLegacyOptionForOlderVersions() {
-        Assert.assertEquals("--password-file", convertInstanceCommandWrapper.getPasswordInputOptionForVersion("1.42.0rhel=8"));
-        Assert.assertEquals("--password-file", convertInstanceCommandWrapper.getPasswordInputOptionForVersion("2.8.0"));
-        Assert.assertEquals("--password-file", convertInstanceCommandWrapper.getPasswordInputOptionForVersion(""));
-    }
-
-    @Test
-    public void testGetPasswordInputOptionForVersionUsesIpOptionForNewerVersions() {
-        Assert.assertEquals("-ip", convertInstanceCommandWrapper.getPasswordInputOptionForVersion("2.8.1"));
-        Assert.assertEquals("-ip", convertInstanceCommandWrapper.getPasswordInputOptionForVersion("2.9.0"));
-        Assert.assertEquals("-ip", convertInstanceCommandWrapper.getPasswordInputOptionForVersion("3.0"));
-    }
 }
