This is an automated email from the ASF dual-hosted git repository. weizhou pushed a commit to branch 4.19-fix-kvm-LibvirtReplugNicCommandWrapperTest in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 631615314a22f7f0e982c215697acadc43ddf9b1 Author: Wei Zhou <[email protected]> AuthorDate: Thu Aug 24 15:00:58 2023 +0200 kvm: add debug msg --- .../wrapper/LibvirtReplugNicCommandWrapper.java | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapper.java index 558c7f0441c..6309c61d4e4 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapper.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapper.java @@ -54,33 +54,46 @@ public final class LibvirtReplugNicCommandWrapper extends CommandWrapper<ReplugN @Override public Answer execute(final ReplugNicCommand command, final LibvirtComputingResource libvirtComputingResource) { + System.out.println("Wei -1"); final NicTO nic = command.getNic(); + System.out.println("Wei -2"); final String vmName = command.getVmName(); + System.out.println("Wei -3"); Domain vm = null; try { + System.out.println("Wei -4"); final LibvirtUtilitiesHelper libvirtUtilitiesHelper = libvirtComputingResource.getLibvirtUtilitiesHelper(); + System.out.println("Wei -5"); final Connect conn = libvirtUtilitiesHelper.getConnectionByVmName(vmName); + System.out.println("Wei -6"); vm = libvirtComputingResource.getDomain(conn, vmName); + System.out.println("Wei 1"); InterfaceDef oldPluggedNic = findPluggedNic(libvirtComputingResource, nic, vmName, conn); - + System.out.println("Wei 2"); final VifDriver newVifDriver = libvirtComputingResource.getVifDriver(nic.getType(), nic.getName()); + System.out.println("Wei 3"); final InterfaceDef interfaceDef = newVifDriver.plug(nic, "Other PV", oldPluggedNic.getModel().toString(), null); + System.out.println("Wei 4"); if (command.getDetails() != null) { libvirtComputingResource.setInterfaceDefQueueSettings(command.getDetails(), null, interfaceDef); } + System.out.println("Wei 4.2"); interfaceDef.setSlot(oldPluggedNic.getSlot()); interfaceDef.setDevName(oldPluggedNic.getDevName()); interfaceDef.setLinkStateUp(false); - + System.out.println("Wei 5"); oldPluggedNic.setSlot(null); int i = 0; do { i++; + System.out.println("Wei 6"); + System.out.println("ReplugNic: Detaching interface" + oldPluggedNic + " (Attempt: " + i + ")"); s_logger.debug("ReplugNic: Detaching interface" + oldPluggedNic + " (Attempt: " + i + ")"); vm.detachDevice(oldPluggedNic.toString()); - } while (findPluggedNic(libvirtComputingResource, nic, vmName, conn) != null && i <= 10); + System.out.println("Wei 7 " + oldPluggedNic.toString()); + } while (findPluggedNic(libvirtComputingResource, nic, vmName, conn) != null && i <= 3); s_logger.debug("ReplugNic: Attaching interface" + interfaceDef); vm.attachDevice(interfaceDef.toString()); @@ -115,8 +128,11 @@ public final class LibvirtReplugNicCommandWrapper extends CommandWrapper<ReplugN InterfaceDef oldPluggedNic = null; final List<InterfaceDef> pluggedNics = libvirtComputingResource.getInterfaces(conn, vmName); + System.out.println("pluggedNics = " + pluggedNics); for (final InterfaceDef pluggedNic : pluggedNics) { + System.out.println("pluggedNic = " + pluggedNic); + System.out.println("nic = " + nic); if (pluggedNic.getMacAddress().equalsIgnoreCase(nic.getMac())) { oldPluggedNic = pluggedNic; }
