minor refactoring

apache · Oct 15, 2024 · fb113ec · fb113ec
1 parent 1bdc357
commit fb113ec
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 60 deletions.
diff --git a/core/src/main/java/com/cloud/agent/api/ConvertInstanceAnswer.java b/core/src/main/java/com/cloud/agent/api/ConvertInstanceAnswer.java
@@ -16,8 +16,6 @@
 // under the License.
 package com.cloud.agent.api;
 
-import org.apache.cloudstack.vm.UnmanagedInstanceTO;
-
 public class ConvertInstanceAnswer extends Answer {
 
  private String temporaryConvertUuid;

diff --git a/.../java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java b/.../java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
@@ -20,15 +20,11 @@
 
 import java.net.URLEncoder;
 import java.nio.charset.Charset;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 import com.cloud.agent.api.ConvertInstanceAnswer;
 import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
-import org.apache.cloudstack.vm.UnmanagedInstanceTO;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 
@@ -39,17 +35,12 @@
 import com.cloud.agent.api.to.RemoteInstanceTO;
 import com.cloud.hypervisor.Hypervisor;
 import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
-import com.cloud.hypervisor.kvm.resource.LibvirtDomainXMLParser;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef;
-import com.cloud.hypervisor.kvm.storage.KVMPhysicalDisk;
 import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
 import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
 import com.cloud.resource.CommandWrapper;
 import com.cloud.resource.ResourceWrapper;
-import com.cloud.storage.Storage;
 import com.cloud.utils.FileUtil;
-import com.cloud.utils.Pair;
-import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.script.OutputInterpreter;
 import com.cloud.utils.script.Script;
 

diff --git a/...a/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapperTest.java b/...a/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapperTest.java
@@ -18,7 +18,6 @@
 //
 package com.cloud.hypervisor.kvm.resource.wrapper;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 

diff --git a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
@@ -1600,7 +1600,7 @@ protected UserVm importUnmanagedInstanceFromVmwareToKvm(DataCenter zone, Cluster
  String ovfTemplateOnConvertLocation = null;
  try {
  HostVO convertHost = selectInstanceConversionKVMHostInCluster(destinationCluster, convertInstanceHostId);
- HostVO destinationHost = convertInstanceHostId == null ? convertHost : selectInstanceConversionKVMHostInCluster(destinationCluster, null);
+ HostVO importHost = convertInstanceHostId == null ? convertHost : selectInstanceConversionKVMHostInCluster(destinationCluster, null);
  CheckConvertInstanceAnswer conversionSupportAnswer = checkConversionSupportOnHost(convertHost, sourceVMName, false);
  LOGGER.debug(String.format("The host %s (%s) is selected to execute the conversion of the instance %s" +
  " from VMware to KVM ", convertHost.getId(), convertHost.getName(), sourceVMName));
@@ -1625,12 +1625,12 @@ protected UserVm importUnmanagedInstanceFromVmwareToKvm(DataCenter zone, Cluster
  ovfTemplateOnConvertLocation = createOvfTemplateOfSourceVmwareUnmanagedInstance(vcenter, datacenterName, username, password,
  clusterName, sourceHostName, sourceVMwareInstance.getName(), temporaryConvertLocation, noOfThreads);
  convertedInstance = convertVmwareInstanceToKVMWithOVFOnConvertLocation(sourceVMName,
- sourceVMwareInstance, convertHost, destinationHost, convertStoragePools,
+ sourceVMwareInstance, convertHost, importHost, convertStoragePools,
  temporaryConvertLocation, ovfTemplateOnConvertLocation);
  } else {
  // Uses KVM Host for OVF export to temporary conversion location, through ovftool
  convertedInstance = convertVmwareInstanceToKVMAfterExportingOVFToConvertLocation(
- sourceVMName, sourceVMwareInstance, convertHost, destinationHost, convertStoragePools,
+ sourceVMName, sourceVMwareInstance, convertHost, importHost, convertStoragePools,
  temporaryConvertLocation, vcenter, username, password, datacenterName);
  }
 
@@ -1849,7 +1849,7 @@ private CheckConvertInstanceAnswer checkConversionSupportOnHost(HostVO convertHo
 
  private UnmanagedInstanceTO convertVmwareInstanceToKVMWithOVFOnConvertLocation(
  String sourceVM, UnmanagedInstanceTO sourceVMwareInstance,
- HostVO convertHost, HostVO destinationHost,
+ HostVO convertHost, HostVO importHost,
  List<StoragePoolVO> convertStoragePools, DataStoreTO temporaryConvertLocation,
  String ovfTemplateDirConvertLocation
  ) {
@@ -1863,50 +1863,13 @@ private UnmanagedInstanceTO convertVmwareInstanceToKVMWithOVFOnConvertLocation(
  int timeoutSeconds = UnmanagedVMsManager.ConvertVmwareInstanceToKvmTimeout.value() * 60 * 60;
  cmd.setWait(timeoutSeconds);
 
- Answer convertAnswer;
- try {
- convertAnswer = agentManager.send(convertHost.getId(), cmd);
- } catch (AgentUnavailableException | OperationTimedoutException e) {
- String err = String.format("Could not send the convert instance command to host %s (%s) due to: %s",
- convertHost.getId(), convertHost.getName(), e.getMessage());
- LOGGER.error(err, e);
- throw new CloudRuntimeException(err);
- }
-
- if (!convertAnswer.getResult()) {
- String err = String.format("The convert process failed for instance %s from VMware to KVM on host %s: %s",
- sourceVM, convertHost.getName(), convertAnswer.getDetails());
- LOGGER.error(err);
- throw new CloudRuntimeException(err);
- }
- Answer importAnswer;
- try {
- ImportConvertedInstanceCommand importCmd = new ImportConvertedInstanceCommand(
- remoteInstanceTO, destinationStoragePools, temporaryConvertLocation,
- ((ConvertInstanceAnswer)convertAnswer).getTemporaryConvertUuid());
- importAnswer = agentManager.send(destinationHost.getId(), importCmd);
- } catch (AgentUnavailableException | OperationTimedoutException e) {
- String err = String.format(
- "Could not send the import converted instance command to host %d (%s) due to: %s",
- destinationHost.getId(), destinationHost.getName(), e.getMessage());
- LOGGER.error(err, e);
- throw new CloudRuntimeException(err);
- }
-
- if (!importAnswer.getResult()) {
- String err = String.format(
- "The import process failed for instance %s from VMware to KVM on host %s: %s",
- sourceVM, destinationHost.getName(), importAnswer.getDetails());
- LOGGER.error(err);
- throw new CloudRuntimeException(err);
- }
-
- return ((ImportConvertedInstanceAnswer) importAnswer).getConvertedInstance();
+ return convertAndImportToKVM(cmd, convertHost, importHost, sourceVM,
+ remoteInstanceTO, destinationStoragePools, temporaryConvertLocation);
  }
 
  private UnmanagedInstanceTO convertVmwareInstanceToKVMAfterExportingOVFToConvertLocation(
  String sourceVM, UnmanagedInstanceTO sourceVMwareInstance,
- HostVO convertHost, HostVO destinationHost, List<StoragePoolVO> convertStoragePools,
+ HostVO convertHost, HostVO importHost, List<StoragePoolVO> convertStoragePools,
  DataStoreTO temporaryConvertLocation, String vcenterHost,
  String vcenterUsername, String vcenterPassword, String datacenterName
  ) {
@@ -1926,9 +1889,18 @@ private UnmanagedInstanceTO convertVmwareInstanceToKVMAfterExportingOVFToConvert
  }
  cmd.setThreadsCountToExportOvf(noOfThreads);
 
+ return convertAndImportToKVM(cmd, convertHost, importHost, sourceVM,
+ remoteInstanceTO, destinationStoragePools, temporaryConvertLocation);
+ }
+
+ private UnmanagedInstanceTO convertAndImportToKVM(ConvertInstanceCommand convertInstanceCommand, HostVO convertHost, HostVO importHost,
+ String sourceVM,
+ RemoteInstanceTO remoteInstanceTO,
+ List<String> destinationStoragePools,
+ DataStoreTO temporaryConvertLocation) {
  Answer convertAnswer;
  try {
- convertAnswer = agentManager.send(convertHost.getId(), cmd);
+ convertAnswer = agentManager.send(convertHost.getId(), convertInstanceCommand);
  } catch (AgentUnavailableException | OperationTimedoutException e) {
  String err = String.format("Could not send the convert instance command to host %s (%s) due to: %s",
  convertHost.getId(), convertHost.getName(), e.getMessage());
@@ -1948,19 +1920,19 @@ private UnmanagedInstanceTO convertVmwareInstanceToKVMAfterExportingOVFToConvert
  ImportConvertedInstanceCommand importCmd = new ImportConvertedInstanceCommand(
  remoteInstanceTO, destinationStoragePools, temporaryConvertLocation,
  ((ConvertInstanceAnswer)convertAnswer).getTemporaryConvertUuid());
- importAnswer = agentManager.send(destinationHost.getId(), importCmd);
+ importAnswer = agentManager.send(importHost.getId(), importCmd);
  } catch (AgentUnavailableException | OperationTimedoutException e) {
  String err = String.format(
  "Could not send the import converted instance command to host %d (%s) due to: %s",
- destinationHost.getId(), destinationHost.getName(), e.getMessage());
+ importHost.getId(), importHost.getName(), e.getMessage());
  LOGGER.error(err, e);
  throw new CloudRuntimeException(err);
  }
 
  if (!importAnswer.getResult()) {
  String err = String.format(
  "The import process failed for instance %s from VMware to KVM on host %s: %s",
- sourceVM, destinationHost.getName(), importAnswer.getDetails());
+ sourceVM, importHost.getName(), importAnswer.getDetails());
  LOGGER.error(err);
  throw new CloudRuntimeException(err);
  }