Soheil/Daan, The commit in the subject breaks network System vms destroy (VR, SSVM, CPVM), resulting in the network removal failures. Following line replacement causes the failure:
- if (vm.getType() == Type.User && isDhcpAccrossMultipleSubnetsSupported(network) && isLastNicInSubnet(nic) && network.getTrafficType() == TrafficType.Guest With + DhcpServiceProvider dhcpServiceProvider = getDhcpServiceProvider(network); When you try to call getDhcpServiceProvider(network), it throws an exception because DHCP service is not enabled in Public/Control networks of system vms nics. So system vm always fails to expunge. Could you please fix it by checking if DHCP service is enabled on the network, before getting the DHCP service provider? Thanks, Alena.
