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 7ff911393f1..478d1df3b2e 100644 --- a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -1459,7 +1459,7 @@ Configurable, StateListener services, boolean reconfigure, boolean deleteFromProcessedCache) { final SetMonitorServiceCommand command = new SetMonitorServiceCommand(services); - command.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIP(router)); + command.setAccessDetail(NetworkElementCommand.ROUTER_IP, _routerControlHelper.getRouterControlIp(router.getId())); command.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName()); command.setAccessDetail(SetMonitorServiceCommand.ROUTER_HEALTH_CHECKS_ENABLED, RouterHealthChecksEnabled.value().toString()); command.setAccessDetail(SetMonitorServiceCommand.ROUTER_HEALTH_CHECKS_BASIC_INTERVAL, RouterHealthChecksBasicInterval.value().toString()); @@ -1633,7 +1633,7 @@ Configurable, StateListener nics = _nicDao.listByVmId(router.getId()); - for (final NicVO nic : nics) { - final NetworkVO nc = _networkDao.findById(nic.getNetworkId()); - if (nc.getTrafficType() == TrafficType.Guest && nic.getIPv4Address() != null) { - controlIP = nic.getIPv4Address(); - break; - } - } - s_logger.debug("Vmware with Basic network selected Guest NIC ip as control IP " + controlIP ); - }else{ - controlIP = _routerControlHelper.getRouterControlIp(router.getId()); - } - - s_logger.debug("IP of control NIC " + controlIP ); - return controlIP; - } - @Override public boolean finalizeVirtualMachineProfile(final VirtualMachineProfile profile, final DeployDestination dest, final ReservationContext context) {