removed unused agent property

Author: harikrishna-patnala

agent/conf/agent.properties

@@ -461,9 +461,6 @@ iscsi.session.cleanup.enabled=false
 # Time, in seconds, to wait before retrying to rebase during the incremental snapshot process.
 # incremental.snapshot.retry.rebase.wait=60
 
-# 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=

agent/src/main/java/com/cloud/agent/properties/AgentProperties.java

@@ -816,13 +816,6 @@ public Property<Integer> getWorkers() {
      */
     public static final Property<String> VDDK_LIB_DIR = new Property<>("vddk.lib.dir", null, String.class);
 
-    /**
-     * Value for the LIBGUESTFS_BACKEND env var used during VMware to KVM conversion via VDDK.
-     * Data type: String.<br>
-     * Default value: <code>direct</code>
-     */
-    public static final Property<String> LIBGUESTFS_BACKEND = new Property<>("libguestfs.backend", "direct", String.class);
-
     /**
      * Ordered list of VDDK transports for virt-v2v, passed as <code>-io vddk-transports=&lt;value&gt;</code>.
      * Example: <code>nbd:nbdssl</code>.

core/src/main/java/com/cloud/agent/api/ConvertInstanceCommand.java

@@ -32,7 +32,6 @@ public class ConvertInstanceCommand extends Command {
     private int threadsCountToExportOvf = 0;
     private String extraParams;
     private boolean useVddk;
-    private String libguestfsBackend;
     private String vddkLibDir;
     private String vddkTransports;
     private String vddkThumbprint;
@@ -103,14 +102,6 @@ public void setUseVddk(boolean useVddk) {
         this.useVddk = useVddk;
     }
 
-    public String getLibguestfsBackend() {
-        return libguestfsBackend;
-    }
-
-    public void setLibguestfsBackend(String libguestfsBackend) {
-        this.libguestfsBackend = libguestfsBackend;
-    }
-
     public String getVddkLibDir() {
         return vddkLibDir;
     }

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

@@ -888,7 +888,7 @@ protected enum HealthCheckResult {
     private boolean convertInstanceVerboseMode = false;
     private Map<String, String> convertInstanceEnv = null;
     private String vddkLibDir = null;
-    private String libguestfsBackend = "direct";
+    private static final String libguestfsBackend = "direct";
     protected boolean dpdkSupport = false;
     protected String dpdkOvsPath;
     protected String directDownloadTemporaryDownloadPath;
@@ -1200,8 +1200,6 @@ public boolean configure(final String name, final Map<String, Object> params) th
             LOGGER.info("Detected nbdkit VDDK plugin version: {}", vddkVersion);
         }
 
-        libguestfsBackend = StringUtils.defaultIfBlank(
-                AgentPropertiesFileHandler.getPropertyValue(AgentProperties.LIBGUESTFS_BACKEND), "direct");
         vddkTransports = StringUtils.trimToNull(
                 AgentPropertiesFileHandler.getPropertyValue(AgentProperties.VDDK_TRANSPORTS));
         vddkThumbprint = StringUtils.trimToNull(

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

@@ -109,12 +109,11 @@ public Answer execute(ConvertInstanceCommand cmd, LibvirtComputingResource serve
                     logger.error("({}) {}", originalVMName, err);
                     return new Answer(cmd, false, err);
                 }
-                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 passwordOption = serverResource.getDetectedPasswordFileOption();
                 result = performInstanceConversionUsingVddk(sourceInstance, originalVMName, temporaryConvertPath,
-                        vddkLibDir, libguestfsBackend, vddkTransports, configuredVddkThumbprint,
+                        vddkLibDir, serverResource.getLibguestfsBackend(), vddkTransports, configuredVddkThumbprint,
                         timeout, verboseModeEnabled, extraParams, temporaryConvertUuid, passwordOption);
             } else {
                 logger.info("({}) Using OVF-based conversion (export + local convert)", originalVMName);
@@ -331,8 +330,7 @@ protected boolean performInstanceConversionUsingVddk(RemoteInstanceTO vmwareInst
 
             StringBuilder cmd = new StringBuilder();
 
-            String effectiveLibguestfsBackend = StringUtils.defaultIfBlank(libguestfsBackend, "direct");
-            cmd.append("export LIBGUESTFS_BACKEND=").append(effectiveLibguestfsBackend).append(" && ");
+            cmd.append("export LIBGUESTFS_BACKEND=").append(libguestfsBackend).append(" && ");
 
             cmd.append("virt-v2v ");
             cmd.append("--root first ");

server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java

@@ -208,7 +208,6 @@ public class UnmanagedVMsManagerImpl implements UnmanagedVMsManager {
     private static final List<Storage.StoragePoolType> forceConvertToPoolAllowedTypes =
             Arrays.asList(Storage.StoragePoolType.NetworkFilesystem, Storage.StoragePoolType.Filesystem,
                     Storage.StoragePoolType.SharedMountPoint);
-    private static final String DETAIL_LIBGUESTFS_BACKEND = "libguestfs.backend";
     private static final String DETAIL_VDDK_TRANSPORTS = "vddk.transports";
     private static final String DETAIL_VDDK_THUMBPRINT = "vddk.thumbprint";
 
@@ -2173,7 +2172,6 @@ private void applyVddkOverridesFromDetails(ConvertInstanceCommand cmd, Map<Strin
             return;
         }
 
-        cmd.setLibguestfsBackend(StringUtils.trimToNull(details.get(DETAIL_LIBGUESTFS_BACKEND)));
         cmd.setVddkLibDir(StringUtils.trimToNull(details.get(Host.HOST_VDDK_LIB_DIR)));
         cmd.setVddkTransports(StringUtils.trimToNull(details.get(DETAIL_VDDK_TRANSPORTS)));
         cmd.setVddkThumbprint(StringUtils.trimToNull(details.get(DETAIL_VDDK_THUMBPRINT)));

server/src/test/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImplTest.java

@@ -912,7 +912,6 @@ private void baseTestImportVmFromVmwareToKvm(VcenterParameter vcenterParameter,
                     }
                     ConvertInstanceCommand convertCmd = (ConvertInstanceCommand) command;
                     return convertCmd.isUseVddk()
-                            && "libvirt".equals(convertCmd.getLibguestfsBackend())
                             && "/opt/vmware-vddk/override".equals(convertCmd.getVddkLibDir())
                             && "nbd:nbdssl".equals(convertCmd.getVddkTransports())
                             && "AA:BB:CC:DD:EE".equals(convertCmd.getVddkThumbprint());