Fix: clean up CloudStack metadata (zone, pod, cluster, host details) in libvirt XML for KVM VMs after unmanaged VM operation

Author: pavanaravapalli

api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java

@@ -90,6 +90,7 @@ public class VirtualMachineTO {
     private String metadataManufacturer;
     private String metadataProductName;
     private VirtualMachineMetadataTO metadata;
+    private boolean isUnmanagedVmTask;
 
     public VirtualMachineTO(long id, String instanceName, VirtualMachine.Type type, int cpus, Integer speed, long minRam, long maxRam, BootloaderType bootloader,
             String os, boolean enableHA, boolean limitCpuUse, String vncPassword) {
@@ -503,6 +504,10 @@ public void setMetadata(VirtualMachineMetadataTO metadata) {
         this.metadata = metadata;
     }
 
+    public boolean isUnmanagedVmTask() { return isUnmanagedVmTask; }
+
+    public void setUnmanagedVmTask(boolean flag) { isUnmanagedVmTask = flag; }
+
     @Override
     public String toString() {
         return String.format("VM {id: \"%s\", name: \"%s\", uuid: \"%s\", type: \"%s\"}", id, name, uuid, type);

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

@@ -3014,8 +3014,11 @@ private void configureVM(VirtualMachineTO vmTO, LibvirtVMDef vm, Map<String, Str
         vm.addComp(createDevicesDef(vmTO, guest, vcpus, isUefiEnabled));
 
         MetadataDef metaDef;
-        if ((metaDef = createMetadataDef(vmTO)) != null) {
-            vm.addComp(metaDef);
+        boolean isUnmanagedVmTask = vmTO.isUnmanagedVmTask();
+        if (!isUnmanagedVmTask) {
+            if ((metaDef = createMetadataDef(vmTO)) != null) {
+                vm.addComp(metaDef);
+            }
         }
 
         addExtraConfigsToVM(vmTO, vm, extraConfig);

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

@@ -67,6 +67,7 @@ public final class LibvirtUnmanageInstanceCommandWrapper extends CommandWrapper<
     public Answer execute(final UnmanageInstanceCommand command, final LibvirtComputingResource libvirtComputingResource) {
         String instanceName = command.getInstanceName();
         VirtualMachineTO vmSpec = command.getVm();
+        vmSpec.setUnmanagedVmTask(true);
         final LibvirtUtilitiesHelper libvirtUtilitiesHelper = libvirtComputingResource.getLibvirtUtilitiesHelper();
         logger.debug("Attempting to unmanage KVM instance: {}", instanceName);
         Domain dom = null;