fetch domainxml from vm

Author: sudo87

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

@@ -24,9 +24,4 @@ public class UnmanageInstanceAnswer extends Answer {
     public UnmanageInstanceAnswer(UnmanageInstanceCommand cmd, boolean success, String details) {
         super(cmd, success, details);
     }
-
-    public UnmanageInstanceAnswer(UnmanageInstanceCommand cmd, Exception e) {
-        super(cmd, e);
-    }
-
 }

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

@@ -19,32 +19,27 @@
 
 package com.cloud.agent.api;
 
-import com.cloud.agent.api.to.VirtualMachineTO;
-
 /**
  */
 public class UnmanageInstanceCommand extends Command {
-    VirtualMachineTO vm;
+    String instanceName;
     boolean executeInSequence = false;
 
-    public VirtualMachineTO getVirtualMachine() {
-        return vm;
-    }
-
     @Override
     public boolean executeInSequence() {
         //VR start doesn't go through queue
-        if (vm.getName() != null && vm.getName().startsWith("r-")) {
+        if (instanceName != null && instanceName.startsWith("r-")) {
             return false;
         }
         return executeInSequence;
     }
 
-    protected UnmanageInstanceCommand() {
+    public UnmanageInstanceCommand(String instanceName,  boolean executeInSequence) {
+        this.instanceName = instanceName;
+        this.executeInSequence = executeInSequence;
     }
 
-    public UnmanageInstanceCommand(VirtualMachineTO vm,  boolean executeInSequence) {
-        this.vm = vm;
-        this.executeInSequence = executeInSequence;
+    public String getInstanceName() {
+        return instanceName;
     }
 }

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -1171,6 +1171,8 @@ protected void checkAndAttemptMigrateVmAcrossCluster(final VMInstanceVO vm, fina
         markVolumesInPool(vm, answer);
     }
 
+
+
     protected void updateVmMetadataManufacturerAndProduct(VirtualMachineTO vmTO, VMInstanceVO vm) {
         String metadataManufacturer = VmMetadataManufacturer.valueIn(vm.getDataCenterId());
         if (StringUtils.isBlank(metadataManufacturer)) {
@@ -2015,19 +2017,19 @@ public boolean unmanage(String vmUuid) {
             throw new ConcurrentOperationException(msg);
         }
 
-        boolean isCmdAnswerSuccess = true;
-        // define domain for kvm host
+        boolean isDomainXMLPreserved = true;
+        // persist domain for kvm host
         if (HypervisorType.KVM.equals(vm.getHypervisorType())) {
-            final UnmanageInstanceCommand unmanageInstanceCommand = new UnmanageInstanceCommand(getVmTO(vm.getId()), false);
+            final UnmanageInstanceCommand unmanageInstanceCommand = new UnmanageInstanceCommand(vm.getName(), false);
             try {
                 Answer answer = _agentMgr.send(vm.getHostId(), unmanageInstanceCommand);
-                isCmdAnswerSuccess = (answer instanceof UnmanageInstanceAnswer && answer.getResult());
+                isDomainXMLPreserved = (answer instanceof UnmanageInstanceAnswer && answer.getResult());
             } catch (Exception ex) {
-                isCmdAnswerSuccess = false;
+                isDomainXMLPreserved = false;
             }
         }
 
-        if (isCmdAnswerSuccess) {
+        if (isDomainXMLPreserved) {
             logger.debug("Unmanaging VM {}", vm);
             Boolean result = Transaction.execute(new TransactionCallback<Boolean>() {
                 @Override
@@ -2050,6 +2052,8 @@ public Boolean doInTransaction(TransactionStatus status) {
                 }
             });
             return BooleanUtils.isTrue(result);
+        } else {
+            logger.error("Error encountered persisting domainXML for vm: {}", vm.getName());
         }
         return false;
     }
@@ -4017,6 +4021,17 @@ private void checkAndSetEnterSetupMode(VirtualMachineTO vmTo, Map<VirtualMachine
         vmTo.setEnterHardwareSetup(enterSetup == null ? false : enterSetup);
     }
 
+    protected VirtualMachineTO prepareVMTo(Long vmId) {
+        VMInstanceVO vm = _vmDao.findById(vmId);
+        VirtualMachineProfile vmProfile = new VirtualMachineProfileImpl(vm);
+        HypervisorGuru vmGuru = _hvGuruMgr.getGuru(vm.getHypervisorType());
+        VirtualMachineTO vmTO = vmGuru.implement(vmProfile);
+        updateVmMetadataManufacturerAndProduct(vmTO, vm);
+        setVmNetworkDetails(vm, vmTO);
+        return vmTO;
+    }
+
+
     protected VirtualMachineTO getVmTO(Long vmId) {
         final VMInstanceVO vm = _vmDao.findById(vmId);
         final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);

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

@@ -20,68 +20,35 @@
 package com.cloud.hypervisor.kvm.resource.wrapper;
 
 import org.libvirt.Connect;
+import org.libvirt.Domain;
 import org.libvirt.LibvirtException;
 
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.UnmanageInstanceAnswer;
 import com.cloud.agent.api.UnmanageInstanceCommand;
-import com.cloud.agent.api.to.NicTO;
-import com.cloud.agent.api.to.VirtualMachineTO;
 import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
-import com.cloud.hypervisor.kvm.resource.LibvirtKvmAgentHook;
-import com.cloud.hypervisor.kvm.resource.LibvirtVMDef;
 import com.cloud.resource.CommandWrapper;
 import com.cloud.resource.ResourceWrapper;
-import com.cloud.vm.VirtualMachine;
 
 @ResourceWrapper(handles =  UnmanageInstanceCommand.class)
 public final class LibvirtUnmanageInstanceCommandWrapper extends CommandWrapper<UnmanageInstanceCommand, Answer, LibvirtComputingResource> {
 
 
     @Override
     public Answer execute(final UnmanageInstanceCommand command, final LibvirtComputingResource libvirtComputingResource) {
-        final VirtualMachineTO vmSpec = command.getVirtualMachine();
-        LibvirtVMDef vm = null;
+        String instanceName = command.getInstanceName();
         final LibvirtUtilitiesHelper libvirtUtilitiesHelper = libvirtComputingResource.getLibvirtUtilitiesHelper();
-        Connect conn = null;
+        logger.debug("Unmanaging KVM instance: {}", instanceName);
         try {
-
-            vm = libvirtComputingResource.createVMFromSpec(vmSpec);
-            conn = libvirtUtilitiesHelper.getConnectionByType(vm.getHvsType());
-
-            final NicTO[] nics = vmSpec.getNics();
-
-            for (final NicTO nic : nics) {
-                if (vmSpec.getType() != VirtualMachine.Type.User) {
-                    nic.setPxeDisable(true);
-                }
-            }
-
-            String vmInitialSpecification = vm.toString();
-            String vmFinalSpecification = performXmlTransformHook(vmInitialSpecification, libvirtComputingResource);
-            libvirtComputingResource.defineVMDomain(conn, vmFinalSpecification);
-
+            Connect conn = libvirtUtilitiesHelper.getConnectionByVmName(instanceName);
+            Domain dom = conn.domainLookupByName(instanceName);
+            String domainXML = dom.getXMLDesc(1);
+            conn.domainDefineXML(domainXML);
+            logger.debug("Successfully unmanaged KVM instance: {}", instanceName);
             return new UnmanageInstanceAnswer(command, true, "Successfully unmanaged");
         } catch (final LibvirtException ex) {
-            logger.warn("LibvirtException ", ex);
+            logger.warn("LibvirtException occurred during unmanaging instance: {} ", instanceName, ex);
             return new UnmanageInstanceAnswer(command, false, ex.getMessage());
         }
     }
-
-    private String performXmlTransformHook(String vmInitialSpecification, final LibvirtComputingResource libvirtComputingResource) {
-        String vmFinalSpecification;
-        try {
-            // if transformer fails, everything must go as it's just skipped.
-            LibvirtKvmAgentHook t = libvirtComputingResource.getTransformer();
-            vmFinalSpecification = (String) t.handle(vmInitialSpecification);
-            if (null == vmFinalSpecification) {
-                logger.warn("Libvirt XML transformer returned NULL, will use XML specification unchanged.");
-                vmFinalSpecification = vmInitialSpecification;
-            }
-        } catch(Exception e) {
-            logger.warn("Exception occurred when handling LibVirt XML transformer hook: {}", e);
-            vmFinalSpecification = vmInitialSpecification;
-        }
-        return vmFinalSpecification;
-    }
 }