Clear multiNetwork flag when a nic's last trunk association is removed

- disassociateNetworkFromNic now clears nics.multi_network once nic_network_map has no remaining rows for that nic - Without this, listNics/listVirtualMachines kept reporting trunked=true and the deployment planner kept restricting the VM to VLAN-filtering- capable hosts even after all associations were removed
Pearl1594 · Sep 14, 2026 · Sep 14, 2026 · Sep 14, 2026 · Sep 16, 2026 · Sep 28, 2026
commit 721bae1929d98ea3321b93dcc1f2776fae11856f
diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
@@ -1051,6 +1051,11 @@ public Nic disassociateNetworkFromNic(DisassociateNetworkFromNicCmd cmd) throws
         // so removing this row is itself the release
         _nicNetworkMapDao.remove(association.getId());
 
+        if (nic.getMultiNetwork() && _nicNetworkMapDao.listByNicId(nic.getId()).isEmpty()) {
+            nic.setMultiNetwork(false);
+            _nicDao.update(nic.getId(), nic);
+        }
+
         if (vmRunning) {
             updateLiveVlanTrunkMembership(vm, nic);
             refreshNicVlanMappingMetadata(nic);

diff --git a/server/src/test/java/com/cloud/network/NetworkServiceImplTest.java b/server/src/test/java/com/cloud/network/NetworkServiceImplTest.java
@@ -2005,12 +2005,34 @@ public void disassociateNetworkFromNicRemovesAssociationOnAStoppedVm() throws Ex
         Mockito.when(userVmDao.findById(5L)).thenReturn(vm);
         NicNetworkMapVO association = new NicNetworkMapVO(11L, 206L, "10.1.1.50", null);
         Mockito.when(nicNetworkMapDao.findByNicIdAndNetworkId(11L, 206L)).thenReturn(association);
+        Mockito.when(nicNetworkMapDao.listByNicId(11L)).thenReturn(Collections.emptyList());
 
         Nic result = service.disassociateNetworkFromNic(mockDisassociateCmd(11L, 206L));
 
         Assert.assertNotNull(result);
         Mockito.verify(nicNetworkMapDao).remove(association.getId());
         Mockito.verify(agentMgr, Mockito.never()).easySend(Mockito.anyLong(), Mockito.any());
+        Mockito.verify(nic).setMultiNetwork(false);
+        Mockito.verify(nicDao).update(11L, nic);
+    }
+
+    @Test
+    public void disassociateNetworkFromNicKeepsMultiNetworkFlagWhenOtherAssociationsRemain() throws Exception {
+        NicVO nic = mockNic(11L, 5L, 205L, true);
+        Mockito.when(nicDao.findById(11L)).thenReturn(nic);
+        UserVmVO vm = mockVm(VirtualMachine.State.Stopped, null);
+        Mockito.when(userVmDao.findById(5L)).thenReturn(vm);
+        NicNetworkMapVO association = new NicNetworkMapVO(11L, 206L, "10.1.1.50", null);
+        Mockito.when(nicNetworkMapDao.findByNicIdAndNetworkId(11L, 206L)).thenReturn(association);
+        NicNetworkMapVO remainingAssociation = new NicNetworkMapVO(11L, 207L, "10.1.1.60", null);
+        Mockito.when(nicNetworkMapDao.listByNicId(11L)).thenReturn(Arrays.asList(remainingAssociation));
+
+        Nic result = service.disassociateNetworkFromNic(mockDisassociateCmd(11L, 206L));
+
+        Assert.assertNotNull(result);
+        Mockito.verify(nicNetworkMapDao).remove(association.getId());
+        Mockito.verify(nic, Mockito.never()).setMultiNetwork(Mockito.anyBoolean());
+        Mockito.verify(nicDao, Mockito.never()).update(Mockito.eq(11L), Mockito.any());
     }
 
     @Test