Handle running instances

Author: harikrishna-patnala

agent/conf/agent.properties

@@ -458,9 +458,6 @@ iscsi.session.cleanup.enabled=false
 # Instance conversion VIRT_V2V_TMPDIR env var
 #convert.instance.env.virtv2v.tmpdir=
 
-# LIBGUESTFS backend to use for VMware to KVM conversion via VDDK (default: direct)
-#libguestfs.backend=direct
-
 # Path to the VDDK library directory for VMware to KVM conversion via VDDK,
 # passed to virt-v2v as -io vddk-libdir=<path>
 #vddk.lib.dir=

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java

@@ -22,10 +22,12 @@
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermission;
 import java.util.Locale;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -320,14 +322,15 @@ protected boolean performInstanceConversionUsingVddk(RemoteInstanceTO vmwareInst
                 UUID.randomUUID());
         try {
             Files.writeString(Path.of(passwordFilePath), vcenterPassword);
+            Files.setPosixFilePermissions(Path.of(passwordFilePath), Set.of(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_WRITE));
             logger.debug("({}) Written vCenter password to {}", originalVMName, passwordFilePath);
         } catch (Exception e) {
             logger.error("({}) Failed to write vCenter password file {}: {}", originalVMName, passwordFilePath, e.getMessage());
             return false;
         }
 
         try {
-            String vpxUrl = buildVpxUrl(vmwareInstance, originalVMName);
+            String vpxUrl = buildVpxUrl(vmwareInstance);
 
             StringBuilder cmd = new StringBuilder();
 
@@ -357,7 +360,7 @@ protected boolean performInstanceConversionUsingVddk(RemoteInstanceTO vmwareInst
             if (StringUtils.isNotBlank(vddkTransports)) {
                 cmd.append("-io vddk-transports=").append(vddkTransports).append(" ");
             }
-            cmd.append(originalVMName).append(" ");
+            cmd.append(vmwareInstance.getInstanceName()).append(" ");
             cmd.append("-o local ");
             cmd.append("-os ").append(temporaryConvertFolder).append(" ");
             cmd.append("-of qcow2 ");
@@ -459,8 +462,9 @@ private String extractSha1Fingerprint(String output) {
      * Format:
      * vpx://user@vcenter/DC/cluster/host?no_verify=1
      */
-    private String buildVpxUrl(RemoteInstanceTO vmwareInstance, String originalVMName) {
+    private String buildVpxUrl(RemoteInstanceTO vmwareInstance) {
 
+        String vmName = vmwareInstance.getInstanceName();
         String vcenter = vmwareInstance.getVcenterHost();
         String username = vmwareInstance.getVcenterUsername();
         String datacenter = vmwareInstance.getDatacenterName();
@@ -487,7 +491,7 @@ private String buildVpxUrl(RemoteInstanceTO vmwareInstance, String originalVMNam
 
         url.append("?no_verify=1");
 
-        logger.info("({}) Using VPX URL: {}", originalVMName, url);
+        logger.info("({}) Using VPX URL: {}", vmName, url);
         return url.toString();
     }
 }