From b25dfa4dfbab01046de9a7058070c37f257937ce Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Tue, 25 Jan 2022 14:59:41 +0100 Subject: [PATCH 1/2] only check user VMs --- .../main/java/com/cloud/vm/VirtualMachineManagerImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java index 706b665c2863..6bd1f16fadf3 100755 --- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java @@ -4043,7 +4043,10 @@ public NicProfile addVmToNetwork(final VirtualMachine vm, final Network network, /** * duplicated in {@see UserVmManagerImpl} for a {@see UserVmVO} */ - private void checkIfNetworkExistsForVM(VirtualMachine virtualMachine, Network network) { + private void checkIfNetworkExistsForUserVM(VirtualMachine virtualMachine, Network network) { + if (virtualMachine.getType() != VirtualMachine.Type.User) { + return; // others may have multiple nics in teh same network + } List allNics = _nicsDao.listByVmId(virtualMachine.getId()); for (NicVO nic : allNics) { if (nic.getNetworkId() == network.getId()) { @@ -4056,7 +4059,7 @@ private NicProfile orchestrateAddVmToNetwork(final VirtualMachine vm, final Netw InsufficientCapacityException { final CallContext cctx = CallContext.current(); - checkIfNetworkExistsForVM(vm, network); + checkIfNetworkExistsForUserVM(vm, network); s_logger.debug("Adding vm " + vm + " to network " + network + "; requested nic profile " + requested); final VMInstanceVO vmVO = _vmDao.findById(vm.getId()); final ReservationContext context = new ReservationContextImpl(null, null, cctx.getCallingUser(), cctx.getCallingAccount()); From 4426fcd4f909411efd6d892b181b2c58f94b4e00 Mon Sep 17 00:00:00 2001 From: dahn Date: Tue, 25 Jan 2022 17:46:40 +0100 Subject: [PATCH 2/2] Update engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java Co-authored-by: Wei Zhou --- .../src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java index 6bd1f16fadf3..340a3e2e99db 100755 --- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java @@ -4045,7 +4045,7 @@ public NicProfile addVmToNetwork(final VirtualMachine vm, final Network network, */ private void checkIfNetworkExistsForUserVM(VirtualMachine virtualMachine, Network network) { if (virtualMachine.getType() != VirtualMachine.Type.User) { - return; // others may have multiple nics in teh same network + return; // others may have multiple nics in the same network } List allNics = _nicsDao.listByVmId(virtualMachine.getId()); for (NicVO nic : allNics) {