Address review comments

nvazquez · nvazquez · commit d3d271647f23 · 2025-06-16T09:38:08.000-03:00
diff --git a/api/src/main/java/com/cloud/host/Host.java b/api/src/main/java/com/cloud/host/Host.java
@@ -53,13 +53,12 @@ public static String[] toStrings(Host.Type... types) {
             return strs;
         }
     }
-    public static final String HOST_UEFI_ENABLE = "host.uefi.enable";
-    public static final String HOST_VOLUME_ENCRYPTION = "host.volume.encryption";
-    public static final String HOST_INSTANCE_CONVERSION = "host.instance.conversion";
 
-    // Vmware to KVM Migration
-    String KVM_HOST_OVFTOOL_VERSION = "kvm.host.ovftool.version";
-    String KVM_HOST_VIRTV2V_VERSION = "kvm.host.virtv2v.version";
+    String HOST_UEFI_ENABLE = "host.uefi.enable";
+    String HOST_VOLUME_ENCRYPTION = "host.volume.encryption";
+    String HOST_INSTANCE_CONVERSION = "host.instance.conversion";
+    String HOST_OVFTOOL_VERSION = "host.ovftool.version";
+    String HOST_VIRTV2V_VERSION = "host.virtv2v.version";
 
     /**
      * @return name of the machine.
diff --git a/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java
@@ -704,8 +704,8 @@ protected AgentAttache notifyMonitorsOfConnection(final AgentAttache attache, fi
             Map<String, String> detailsMap = readyAnswer.getDetailsMap();
             if (detailsMap != null) {
                 String uefiEnabled = detailsMap.get(Host.HOST_UEFI_ENABLE);
-                String virtv2vVersion = detailsMap.get(Host.KVM_HOST_VIRTV2V_VERSION);
-                String ovftoolVersion = detailsMap.get(Host.KVM_HOST_OVFTOOL_VERSION);
+                String virtv2vVersion = detailsMap.get(Host.HOST_VIRTV2V_VERSION);
+                String ovftoolVersion = detailsMap.get(Host.HOST_OVFTOOL_VERSION);
                 logger.debug("Got HOST_UEFI_ENABLE [{}] for host [{}]:", uefiEnabled, host);
                 if (ObjectUtils.anyNotNull(uefiEnabled, virtv2vVersion, ovftoolVersion)) {
                     _hostDao.loadDetails(host);
@@ -714,12 +714,12 @@ protected AgentAttache notifyMonitorsOfConnection(final AgentAttache attache, fi
                         host.getDetails().put(Host.HOST_UEFI_ENABLE, uefiEnabled);
                         updateNeeded = true;
                     }
-                    if (StringUtils.isNotBlank(virtv2vVersion) && !virtv2vVersion.equals(host.getDetails().get(Host.KVM_HOST_VIRTV2V_VERSION))) {
-                        host.getDetails().put(Host.KVM_HOST_VIRTV2V_VERSION, virtv2vVersion);
+                    if (StringUtils.isNotBlank(virtv2vVersion) && !virtv2vVersion.equals(host.getDetails().get(Host.HOST_VIRTV2V_VERSION))) {
+                        host.getDetails().put(Host.HOST_VIRTV2V_VERSION, virtv2vVersion);
                         updateNeeded = true;
                     }
-                    if (StringUtils.isNotBlank(ovftoolVersion) && !ovftoolVersion.equals(host.getDetails().get(Host.KVM_HOST_OVFTOOL_VERSION))) {
-                        host.getDetails().put(Host.KVM_HOST_OVFTOOL_VERSION, ovftoolVersion);
+                    if (StringUtils.isNotBlank(ovftoolVersion) && !ovftoolVersion.equals(host.getDetails().get(Host.HOST_OVFTOOL_VERSION))) {
+                        host.getDetails().put(Host.HOST_OVFTOOL_VERSION, ovftoolVersion);
                         updateNeeded = true;
                     }
                     if (updateNeeded) {
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
@@ -17,6 +17,8 @@
 package com.cloud.hypervisor.kvm.resource;
 
 import static com.cloud.host.Host.HOST_INSTANCE_CONVERSION;
+import static com.cloud.host.Host.HOST_OVFTOOL_VERSION;
+import static com.cloud.host.Host.HOST_VIRTV2V_VERSION;
 import static com.cloud.host.Host.HOST_VOLUME_ENCRYPTION;
 
 import java.io.BufferedReader;
@@ -3766,7 +3768,12 @@ public StartupCommand[] initialize() {
         cmd.setIqn(getIqn());
         cmd.getHostDetails().put(HOST_VOLUME_ENCRYPTION, String.valueOf(hostSupportsVolumeEncryption()));
         cmd.setHostTags(getHostTags());
-        cmd.getHostDetails().put(HOST_INSTANCE_CONVERSION, String.valueOf(hostSupportsInstanceConversion()));
+        boolean instanceConversionSupported = hostSupportsInstanceConversion();
+        cmd.getHostDetails().put(HOST_INSTANCE_CONVERSION, String.valueOf(instanceConversionSupported));
+        if (instanceConversionSupported) {
+            cmd.getHostDetails().put(HOST_VIRTV2V_VERSION, getHostVirtV2vVersion());
+            cmd.getHostDetails().put(HOST_OVFTOOL_VERSION, getHostOvfToolVersion());
+        }
         HealthCheckResult healthCheckResult = getHostHealthCheckResult();
         if (healthCheckResult != HealthCheckResult.IGNORE) {
             cmd.setHostHealthCheckResult(healthCheckResult == HealthCheckResult.SUCCESS);
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReadyCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReadyCommandWrapper.java
@@ -48,11 +48,11 @@ public Answer execute(final ReadyCommand command, final LibvirtComputingResource
         }
 
         if (libvirtComputingResource.hostSupportsInstanceConversion()) {
-            hostDetails.put(Host.KVM_HOST_VIRTV2V_VERSION, libvirtComputingResource.getHostVirtV2vVersion());
+            hostDetails.put(Host.HOST_VIRTV2V_VERSION, libvirtComputingResource.getHostVirtV2vVersion());
         }
 
         if (libvirtComputingResource.hostSupportsOvfExport()) {
-            hostDetails.put(Host.KVM_HOST_OVFTOOL_VERSION, libvirtComputingResource.getHostOvfToolVersion());
+            hostDetails.put(Host.HOST_OVFTOOL_VERSION, libvirtComputingResource.getHostOvfToolVersion());
         }
 
         return new ReadyAnswer(command, hostDetails);
diff --git a/ui/src/views/tools/ImportUnmanagedInstance.vue b/ui/src/views/tools/ImportUnmanagedInstance.vue
@@ -944,11 +944,11 @@ export default {
           } else {
             host.name = host.name + ' (' + this.$t('label.not.supported') + ')'
           }
-          if (host.details['kvm.host.virtv2v.version']) {
-            host.name = host.name + ' (virt-v2v=' + host.details['kvm.host.virtv2v.version'] + ')'
+          if (host.details['host.virtv2v.version']) {
+            host.name = host.name + ' (virt-v2v=' + host.details['host.virtv2v.version'] + ')'
           }
-          if (host.details['kvm.host.ovftool.version']) {
-            host.name = host.name + ' (ovftool=' + host.details['kvm.host.ovftool.version'] + ')'
+          if (host.details['host.ovftool.version']) {
+            host.name = host.name + ' (ovftool=' + host.details['host.ovftool.version'] + ')'
           }
         })
       })

Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,11 @@ public Answer execute(final ReadyCommand command, final LibvirtComputingResource`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`if (libvirtComputingResource.hostSupportsInstanceConversion()) {`
`51`		`- hostDetails.put(Host.KVM_HOST_VIRTV2V_VERSION, libvirtComputingResource.getHostVirtV2vVersion());`
	`51`	`+ hostDetails.put(Host.HOST_VIRTV2V_VERSION, libvirtComputingResource.getHostVirtV2vVersion());`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`if (libvirtComputingResource.hostSupportsOvfExport()) {`
`55`		`- hostDetails.put(Host.KVM_HOST_OVFTOOL_VERSION, libvirtComputingResource.getHostOvfToolVersion());`
	`55`	`+ hostDetails.put(Host.HOST_OVFTOOL_VERSION, libvirtComputingResource.getHostOvfToolVersion());`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`return new ReadyAnswer(command, hostDetails);`
Original file line number	Diff line number	Diff line change
`@@ -944,11 +944,11 @@ export default {`
`944`	`944`	`} else {`
`945`	`945`	`host.name = host.name + ' (' + this.$t('label.not.supported') + ')'`
`946`	`946`	`}`
`947`		`- if (host.details['kvm.host.virtv2v.version']) {`
`948`		`- host.name = host.name + ' (virt-v2v=' + host.details['kvm.host.virtv2v.version'] + ')'`
	`947`	`+ if (host.details['host.virtv2v.version']) {`
	`948`	`+ host.name = host.name + ' (virt-v2v=' + host.details['host.virtv2v.version'] + ')'`
`949`	`949`	`}`
`950`		`- if (host.details['kvm.host.ovftool.version']) {`
`951`		`- host.name = host.name + ' (ovftool=' + host.details['kvm.host.ovftool.version'] + ')'`
	`950`	`+ if (host.details['host.ovftool.version']) {`
	`951`	`+ host.name = host.name + ' (ovftool=' + host.details['host.ovftool.version'] + ')'`
`952`	`952`	`}`
`953`	`953`	`})`
`954`	`954`	`})`