diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index dda2df8fa87..6c0f7a1d4bc 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -1320,7 +1320,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V } } } - + protected class CheckRouterTask implements Runnable { public CheckRouterTask() { @@ -1589,12 +1589,6 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V InsufficientAddressCapacityException, InsufficientServerCapacityException, InsufficientCapacityException, StorageUnavailableException, ResourceUnavailableException { - if(s_logger.isTraceEnabled()) { - s_logger.trace("deployRouter(" + owner.getAccountName() + ", " + dest.getHost() + ", " + plan.toString() + ", " + params.toString() - + ", " + isRedundant + ", " + vrProvider.getUuid() + ", " + svcOffId + ", " + vpcId - + ", list_of_" + networks.size() + "networks, " + startRouter + ", " + supportedHypervisors + ")"); - } - ServiceOfferingVO routerOffering = _serviceOfferingDao.findById(svcOffId); // Router is the network element, we don't know the hypervisor type yet. @@ -1872,11 +1866,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V private DomainRouterVO startVirtualRouter(DomainRouterVO router, User user, Account caller, Map params) throws StorageUnavailableException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException { - - if(s_logger.isTraceEnabled()) { - s_logger.trace("startVirtualRouter(" + router.getHostName() + ", " + user.getUsername() + ", " + caller.getAccountName() + ", " + params.toString() + ")"); - } - + if (router.getRole() != Role.VIRTUAL_ROUTER || !router.getIsRedundantRouter()) { return this.start(router, user, caller, params, null); } @@ -2510,7 +2500,6 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V createIpAlias(router, activeIpAliasTOs, guestNetworkId, cmds); configDnsMasq(router, _networkDao.findById(guestNetworkId), cmds); } - } } } @@ -2912,9 +2901,6 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V public boolean applyDhcpEntry(Network network, final NicProfile nic, VirtualMachineProfile profile, DeployDestination dest, List routers) throws ResourceUnavailableException { - if(s_logger.isTraceEnabled()) { - s_logger.trace("applyDhcpEntry(" + network.getCidr() + ", " + nic.getMacAddress() + ", " + profile.getUuid() + ", " + dest.getHost() + ", " + routers + ")"); - } _userVmDao.loadDetails((UserVmVO) profile.getVirtualMachine()); final VirtualMachineProfile updatedProfile = profile; @@ -3448,9 +3434,6 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V } private void configDnsMasq(VirtualRouter router, Network network, Commands cmds) { - if (s_logger.isTraceEnabled()) { - s_logger.trace("configDnsMasq(" + router.getHostName() + ", " + network.getNetworkDomain() + ", " + cmds + ")"); - } DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId()); List ipAliasVOList = _nicIpAliasDao.listByNetworkIdAndState(network.getId(), NicIpAlias.state.active); List ipList = new ArrayList(); @@ -3482,7 +3465,6 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V dnsMasqConfigCmd.setDomainSuffix(domain_suffix); dnsMasqConfigCmd.setIfDnsProvided(dnsProvided); cmds.addCommand("dnsMasqConfig" ,dnsMasqConfigCmd); - //To change body of created methods use File | Settings | File Templates. } diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java index 3ca4331eedf..5dbecb77577 100644 --- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java @@ -167,9 +167,6 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian public List deployVirtualRouterInVpc(Vpc vpc, DeployDestination dest, Account owner, Map params) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException { - if(s_logger.isTraceEnabled()) { - s_logger.trace("deployVirtualRouterInVpc(" + vpc.getName() +", "+dest.getHost()+", "+owner.getAccountName()+", "+params.toString()+")"); - } List routers = findOrDeployVirtualRouterInVpc(vpc, dest, owner, params); @@ -247,9 +244,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian @Override public boolean addVpcRouterToGuestNetwork(VirtualRouter router, Network network, boolean isRedundant) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { - if (s_logger.isTraceEnabled()) { - s_logger.trace("addVpcRouterToGuestNetwork(" + router.getUuid() + ", " + network.getCidr() + ", " + isRedundant + ")"); - } + if (network.getTrafficType() != TrafficType.Guest) { s_logger.warn("Network " + network + " is not of type " + TrafficType.Guest); return false; @@ -321,10 +316,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian Long vpcId, PublicIp sourceNatIp) throws ConcurrentOperationException, InsufficientAddressCapacityException, InsufficientServerCapacityException, InsufficientCapacityException, StorageUnavailableException, ResourceUnavailableException { - if(s_logger.isTraceEnabled()) { - s_logger.trace("deployVpcRouter(" + owner.getAccountName() + ", " + dest.getHost() + ", " + plan.toString() + ", " + params.toString() - + ", " + isRedundant + ", " + vrProvider.getUuid() + ", " + svcOffId + ", " + vpcId + ", " + sourceNatIp + ")"); - } + List> networks = createVpcRouterNetworks(owner, isRedundant, plan, new Pair(true, sourceNatIp), vpcId); DomainRouterVO router = @@ -705,15 +697,12 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian @Override public boolean finalizeCommandsOnStart(Commands cmds, VirtualMachineProfile profile) { DomainRouterVO router = profile.getVirtualMachine(); - if(s_logger.isTraceEnabled()) { - s_logger.trace("finalizeCommandsOnStart(" + cmds + ", " + profile.getHostName() + ")"); - } boolean isVpc = (router.getVpcId() != null); if (!isVpc) { return super.finalizeCommandsOnStart(cmds, profile); } - + //1) FORM SSH CHECK COMMAND NicProfile controlNic = getControlNic(profile); if (controlNic == null) { @@ -722,7 +711,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian } finalizeSshAndVersionAndNetworkUsageOnStart(cmds, profile, router, controlNic); - + //2) FORM PLUG NIC COMMANDS List> guestNics = new ArrayList>(); List> publicNics = new ArrayList>(); @@ -875,49 +864,15 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian //Add network usage commands cmds.addCommands(usageCmds); - configDnsMasq(router, cmds); - + return true; } - protected void configDnsMasq(VirtualRouter router, Commands cmds) { - if (s_logger.isTraceEnabled()) { - s_logger.trace("configDnsMasq(" + router.getHostName() + ", " + cmds + ")"); - } - VpcVO vpc = _vpcDao.findById(router.getVpcId()); - DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId()); - List ipList = new ArrayList(); - - String cidr = vpc.getCidr(); - String[] cidrPair = cidr.split("\\/"); - String cidrAddress = cidrPair[0]; - long cidrSize = Long.parseLong(cidrPair[1]); - String startIpOfSubnet = NetUtils.getIpRangeStartIpFromCidr(cidrAddress, cidrSize); - DhcpTO DhcpTO = new DhcpTO(router.getPrivateIpAddress(), router.getPublicIpAddress(), NetUtils.getCidrNetmask(cidrSize), startIpOfSubnet); - ipList.add(DhcpTO); - - NicVO nic = _nicDao.findByIp4AddressAndVmId(_routerDao.findById(router.getId()).getPrivateIpAddress(), router.getId()); - DataCenterVO dcvo = _dcDao.findById(router.getDataCenterId()); - boolean dnsProvided = _networkModel.isProviderSupportServiceInNetwork(nic.getNetworkId(), Service.Dns, Provider.VirtualRouter); - String domain_suffix = dcvo.getDetail(ZoneConfig.DnsSearchOrder.getName()); - DnsMasqConfigCommand dnsMasqConfigCmd = new DnsMasqConfigCommand(vpc.getNetworkDomain(),ipList, dcVo.getDns1(), dcVo.getDns2(), dcVo.getInternalDns1(), dcVo.getInternalDns2()); - dnsMasqConfigCmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId())); - dnsMasqConfigCmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName()); - dnsMasqConfigCmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, router.getPublicIpAddress()); - dnsMasqConfigCmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString()); - dnsMasqConfigCmd.setDomainSuffix(domain_suffix); - dnsMasqConfigCmd.setIfDnsProvided(dnsProvided); - - cmds.addCommand("dnsMasqConfig" ,dnsMasqConfigCmd); - } - - @Override protected void finalizeNetworkRulesForNetwork(Commands cmds, DomainRouterVO router, Provider provider, Long guestNetworkId) { - if(s_logger.isTraceEnabled()) { - s_logger.trace("finalizing network config for "+ router.getHostName()); - } + super.finalizeNetworkRulesForNetwork(cmds, router, provider, guestNetworkId); + if (router.getVpcId() != null) { if (_networkModel.isProviderSupportServiceInNetwork(guestNetworkId, Service.NetworkACL, Provider.VPCVirtualRouter)) { List networkACLs = _networkACLMgr.listNetworkACLItems(guestNetworkId); @@ -927,10 +882,6 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian createNetworkACLsCommands(networkACLs, router, cmds, guestNetworkId, false); } } - - if(s_logger.isDebugEnabled()) { - s_logger.debug("setup the vpc domain on router " + router.getHostName()); - } } } @@ -975,10 +926,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian */ protected boolean setupVpcPrivateNetwork(VirtualRouter router, boolean add, NicProfile privateNic) throws ResourceUnavailableException { - if(s_logger.isTraceEnabled()) { - s_logger.trace("deployVpcRouter(" + router.getHostName() + ", " + add + ", " + privateNic.getMacAddress() + ")"); - } - + if (router.getState() == State.Running) { PrivateIpVO ipVO = _privateIpDao.findByIpAndSourceNetworkId(privateNic.getNetworkId(), privateNic.getIp4Address()); Network network = _networkDao.findById(privateNic.getNetworkId()); @@ -990,7 +938,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian privateIps.add(ip); Commands cmds = new Commands(OnError.Stop); createVpcAssociatePrivateIPCommands(router, privateIps, cmds, add); - + if (sendCommandsToRouter(router, cmds)) { s_logger.debug("Successfully applied ip association for ip " + ip + " in vpc network " + network); return true; diff --git a/server/test/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImplTest.java b/server/test/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImplTest.java deleted file mode 100644 index 071f658f056..00000000000 --- a/server/test/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImplTest.java +++ /dev/null @@ -1,121 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package com.cloud.network.router; - - -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.mockingDetails; -import static org.mockito.Mockito.when; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - -import com.cloud.configuration.ZoneConfig; -import com.cloud.network.Network; -import com.cloud.network.NetworkModel; -import com.cloud.vm.VirtualMachine; -import org.apache.log4j.Logger; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.cloud.agent.AgentManager.OnError; -import com.cloud.agent.api.routing.DnsMasqConfigCommand; -import com.cloud.agent.manager.Commands; -import com.cloud.dc.DataCenter.NetworkType; -import com.cloud.dc.DataCenterVO; -import com.cloud.dc.dao.DataCenterDao; -import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.network.NetworkManager; -import com.cloud.network.router.VirtualRouter.RedundantState; -import com.cloud.network.vpc.VpcVO; -import com.cloud.network.vpc.dao.VpcDao; -import com.cloud.vm.DomainRouterVO; -import com.cloud.vm.NicVO; -import com.cloud.vm.dao.DomainRouterDao; -import com.cloud.vm.dao.NicDao; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations="classpath:/VpcVirtNetAppContext.xml") -public class VpcVirtualNetworkApplianceManagerImplTest { - private static final Logger s_logger = Logger.getLogger(VpcVirtualNetworkApplianceManagerImplTest.class); - - @Mock DataCenterDao _dcDao; - @Mock VpcDao _vpcDao; - @Mock VirtualRouter router; - @Mock NicDao _nicDao; - @Mock DomainRouterDao _routerDao; - @Mock NetworkModel _networkmodel; - @Mock NicVO nicVO; - @Mock DataCenterVO dcVO; - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - - } - - @Test - public void testConfigDnsMasq() { - VpcVirtualNetworkApplianceManagerImpl vpcVirtNetAppMgr = new VpcVirtualNetworkApplianceManagerImpl(); - vpcVirtNetAppMgr._vpcDao = _vpcDao; - vpcVirtNetAppMgr._dcDao = _dcDao; - vpcVirtNetAppMgr._nicDao = _nicDao; - vpcVirtNetAppMgr._routerDao = _routerDao; - when(router.getId()).thenReturn(1L); - when(router.getVpcId()).thenReturn(1L); - when(router.getDataCenterId()).thenReturn(1L); - VpcVO vpc = new VpcVO(1L,"bla","bla",1L,1L,1L,"10.0.0.0/8","blieb.net"); - when( _vpcDao.findById(1L)).thenReturn(vpc); - DataCenterVO dcVo = new DataCenterVO(1L,"dc","dc","8.8.8.8",null,null,null,"10.0.0.0/8","bla.net",new Long(1L),NetworkType.Advanced,null,".net"); - Map map = new HashMap(); - dcVo.setDetails(map); - dcVo.setDetail(ZoneConfig.DnsSearchOrder.getName(), "dummy"); - when(_dcDao.findById(1L)).thenReturn(dcVo); - DomainRouterVO routerVo = new DomainRouterVO(1L,1L,1L,"brr",1L,HypervisorType.Any,1L,1L,1L,false,0,false,RedundantState.MASTER,false,false,1L); - when( _routerDao.findById(1L)).thenReturn(routerVo); -// when( vpcVirtNetAppMgr.getRouterControlIp(1L)).thenReturn("10.0.0.1"); - when( router.getInstanceName()).thenReturn("r-vm-1"); - when( router.getPublicIpAddress()).thenReturn("11.11.11.11"); - NicVO nicvo = new NicVO("server", 1l, 1l, VirtualMachine.Type.DomainRouter); - nicvo.setNetworkId(1l); - when(_nicDao.findByIp4AddressAndVmId(anyString(), anyLong())).thenReturn(nicvo); - NetworkManager netMgr = mock(NetworkManager.class); - vpcVirtNetAppMgr._networkMgr = netMgr; - vpcVirtNetAppMgr._networkModel = _networkmodel; - when(nicVO.getNetworkId()).thenReturn(1l); - when(_networkmodel.isProviderSupportServiceInNetwork(1l, Network.Service.Dhcp, Network.Provider.VirtualRouter)).thenReturn(true); - when(dcVO.getDetail(anyString())).thenReturn(null); - Commands cmds = new Commands(OnError.Stop); - - vpcVirtNetAppMgr.configDnsMasq(router, cmds); - Assert.assertEquals("expected one command",1, cmds.size()); - - DnsMasqConfigCommand cmd = cmds.getCommand(DnsMasqConfigCommand.class); - } - -} diff --git a/server/test/resources/VpcVirtNetAppContext.xml b/server/test/resources/VpcVirtNetAppContext.xml deleted file mode 100644 index f8a8aa4ea4d..00000000000 --- a/server/test/resources/VpcVirtNetAppContext.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - -