(cloudstack) branch 4.20 updated: server: do not run dhcp and dns check if VR is not provider (#12272)

[bstoyanov]

This is an automated email from the ASF dual-hosted git repository.

bstoyanov pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.20 by this push:
     new b6134418eaf server: do not run dhcp and dns check if VR is not 
provider (#12272)
b6134418eaf is described below

commit b6134418eafcf458f794905f7eb672da3fc3818a
Author: Wei Zhou <weiz...@apache.org>
AuthorDate: Tue Jan 27 11:42:24 2026 +0100

    server: do not run dhcp and dns check if VR is not provider (#12272)
---
 .../com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 
b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 7d0a4f20838..bd73e67f10b 100644
--- 
a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ 
b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1777,8 +1777,9 @@ Configurable, StateListener<VirtualMachine.State, 
VirtualMachine.Event, VirtualM
             scvm.setParameters("networkId", routerJoinVO.getNetworkId());
             scvm.setParameters("state", VirtualMachine.State.Running);
             List<UserVmJoinVO> vms = userVmJoinDao.search(scvm, null);
-            boolean isDhcpSupported = 
_ntwkSrvcDao.areServicesSupportedInNetwork(routerJoinVO.getNetworkId(), 
Service.Dhcp);
-            boolean isDnsSupported = 
_ntwkSrvcDao.areServicesSupportedInNetwork(routerJoinVO.getNetworkId(), 
Service.Dns);
+            Provider provider = routerJoinVO.getVpcId() != 0 ? 
Provider.VPCVirtualRouter : Provider.VirtualRouter;
+            boolean isDhcpSupported = 
_ntwkSrvcDao.canProviderSupportServiceInNetwork(routerJoinVO.getNetworkId(), 
Service.Dhcp, provider);
+            boolean isDnsSupported = 
_ntwkSrvcDao.canProviderSupportServiceInNetwork(routerJoinVO.getNetworkId(), 
Service.Dns, provider);
             for (UserVmJoinVO vm : vms) {
                 vmsData.append("vmName=").append(vm.getName())
                         .append(",macAddress=").append(vm.getMacAddress())