Change UI flow and some review comments addressed

Author: harikrishna-patnala

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

@@ -105,7 +105,7 @@ public Answer execute(ConvertInstanceCommand cmd, LibvirtComputingResource serve
                 String vddkLibDir = resolveVddkSetting(cmd.getVddkLibDir(), serverResource.getVddkLibDir());
                 if (StringUtils.isBlank(vddkLibDir)) {
                     String err = String.format("VDDK lib dir is not configured on the host. " +
-                            "Set '%s' in agent.properties to use VDDK-based conversion.", "vddk.lib.dir");
+                            "Set '%s' in agent.properties or in details parameter of the import api calll to use VDDK-based conversion.", "vddk.lib.dir");
                     logger.error("({}) {}", originalVMName, err);
                     return new Answer(cmd, false, err);
                 }
@@ -315,7 +315,7 @@ protected boolean performInstanceConversionUsingVddk(RemoteInstanceTO vmwareInst
             return false;
         }
 
-        String passwordFilePath = String.format("/root/v2v.pass.cloud.%s.%s",
+        String passwordFilePath = String.format("/tmp/v2v.pass.cloud.%s.%s",
                 StringUtils.defaultIfBlank(vmwareInstance.getVcenterHost(), "unknown"),
                 UUID.randomUUID());
         try {

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

@@ -1743,7 +1743,8 @@ protected UserVm importUnmanagedInstanceFromVmwareToKvm(DataCenter zone, Cluster
                         serviceOffering, dataDiskOfferingMap, temporaryConvertLocation,
                         ovfTemplateOnConvertLocation, forceConvertToPool, extraParams);
             } else {
-                // Uses KVM Host for direct conversion using VDDK, or for OVF export to temporary conversion location through ovftool                 importVmTasksManager.updateImportVMTaskStep(importVMTask, zone, owner, convertHost, importHost, null, ConvertingInstance);
+                // Uses KVM Host for direct conversion using VDDK, or for OVF export to temporary conversion location through ovftool
+                importVmTasksManager.updateImportVMTaskStep(importVMTask, zone, owner, convertHost, importHost, null, ConvertingInstance);
                 convertedInstance = convertVmwareInstanceToKVMUsingVDDKOrAfterExportingOVFToConvertLocation(
                         sourceVMName, sourceVMwareInstance, convertHost, importHost,
                         convertStoragePools, serviceOffering, dataDiskOfferingMap,

ui/src/views/tools/ImportUnmanagedInstance.vue

@@ -158,7 +158,7 @@
                 </template>
                 <a-switch v-model:checked="form.usevddk" @change="onUseVddkChange" />
               </a-form-item>
-              <a-form-item name="forceconverttopool" ref="forceconverttopool" v-if="selectedVmwareVcenter && !form.usevddk">
+              <a-form-item name="forceconverttopool" ref="forceconverttopool" v-if="selectedVmwareVcenter">
                 <template #label>
                   <tooltip-label :title="$t('label.force.convert.to.pool')" :tooltip="apiParams.forceconverttopool.description"/>
                 </template>
@@ -196,7 +196,7 @@
                   :resourceKey="cluster.id"
                   :selectOptions="storageOptionsForConversion"
                   :checkBoxLabel="switches.forceConvertToPool ? $t('message.select.destination.storage.instance.conversion') : $t('message.select.temporary.storage.instance.conversion')"
-                  :defaultCheckBoxValue="form.usevddk"
+                  :defaultCheckBoxValue="switches.forceConvertToPool"
                   :reversed="false"
                   @handle-checkselectpair-change="updateSelectedStorageOptionForConversion"
                 />
@@ -233,7 +233,8 @@
                   :placeholder="$t('label.extra')"
                 />
               </a-form-item>
-              <a-form-item name="forcemstoimportvmfiles" ref="forcemstoimportvmfiles" v-if="selectedVmwareVcenter && !form.usevddk">                <template #label>
+              <a-form-item name="forcemstoimportvmfiles" ref="forcemstoimportvmfiles" v-if="selectedVmwareVcenter && !form.usevddk">
+                <template #label>
                   <tooltip-label :title="$t('label.force.ms.to.import.vm.files')" :tooltip="apiParams.forcemstoimportvmfiles.description"/>
                 </template>
                 <a-switch v-model:checked="form.forcemstoimportvmfiles" @change="val => { switches.forceMsToImportVmFiles = val }" />
@@ -1147,6 +1148,10 @@ export default {
     },
     onForceConvertToPoolChange (val) {
       this.switches.forceConvertToPool = val
+      this.form.forceconverttopool = val
+      this.selectedStorageOptionForConversion = null
+      this.selectedStoragePoolForConversion = null
+      this.showStoragePoolsForConversion = false
       this.resetStorageOptionsForConversion()
     },
     onUseVddkChange (val, isUserChange = true) {
@@ -1293,13 +1298,12 @@ export default {
           }
           if (values.usevddk) {
             params.usevddk = true
-            params.forceconverttopool = true
             params.forcemstoimportvmfiles = false
           } else {
             params.usevddk = false
             params.forcemstoimportvmfiles = values.forcemstoimportvmfiles
           }
-          if (!values.usevddk && values.forceconverttopool) {
+          if (values.forceconverttopool !== undefined) {
             params.forceconverttopool = values.forceconverttopool
           }
         }