Skip to content

Commit 2a8e844

Browse files
weizhouapacheLocharla, Sandeep
authored andcommitted
server: do not run dhcp and dns check if VR is not provider (apache#12272)
1 parent 0f844ec commit 2a8e844

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,8 +1747,9 @@ protected Map<String, String> getRouterHealthChecksConfig(final DomainRouterVO r
17471747
scvm.setParameters("networkId", routerJoinVO.getNetworkId());
17481748
scvm.setParameters("state", VirtualMachine.State.Running);
17491749
List<UserVmJoinVO> vms = userVmJoinDao.search(scvm, null);
1750-
boolean isDhcpSupported = _ntwkSrvcDao.areServicesSupportedInNetwork(routerJoinVO.getNetworkId(), Service.Dhcp);
1751-
boolean isDnsSupported = _ntwkSrvcDao.areServicesSupportedInNetwork(routerJoinVO.getNetworkId(), Service.Dns);
1750+
Provider provider = routerJoinVO.getVpcId() != 0 ? Provider.VPCVirtualRouter : Provider.VirtualRouter;
1751+
boolean isDhcpSupported = _ntwkSrvcDao.canProviderSupportServiceInNetwork(routerJoinVO.getNetworkId(), Service.Dhcp, provider);
1752+
boolean isDnsSupported = _ntwkSrvcDao.canProviderSupportServiceInNetwork(routerJoinVO.getNetworkId(), Service.Dns, provider);
17521753
for (UserVmJoinVO vm : vms) {
17531754
vmsData.append("vmName=").append(vm.getName())
17541755
.append(",macAddress=").append(vm.getMacAddress())

0 commit comments

Comments
 (0)