diff --git a/server/src/com/cloud/network/NetworkManager.java b/server/src/com/cloud/network/NetworkManager.java index 9908264d259..22940f012c3 100644 --- a/server/src/com/cloud/network/NetworkManager.java +++ b/server/src/com/cloud/network/NetworkManager.java @@ -230,7 +230,7 @@ public interface NetworkManager extends Manager { * @param vmId * @return */ - boolean associateIP(DomainRouterVO router, List ipAddrList, boolean add, long vmId) throws ResourceAllocationException; + boolean associateIP(DomainRouterVO router, List ipAddrList, boolean add, long vmId); /** * Associates a public IP address for a router. diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 6cf1d5a3bc7..e4fa01fd4f5 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -24,9 +24,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; import javax.ejb.Local; import javax.naming.ConfigurationException; @@ -36,27 +34,10 @@ import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.AgentManager.OnError; import com.cloud.agent.api.Answer; -import com.cloud.agent.api.CheckVirtualMachineAnswer; -import com.cloud.agent.api.CheckVirtualMachineCommand; -import com.cloud.agent.api.Command; -import com.cloud.agent.api.CreateZoneVlanAnswer; -import com.cloud.agent.api.CreateZoneVlanCommand; -import com.cloud.agent.api.MigrateCommand; -import com.cloud.agent.api.ModifySshKeysCommand; -import com.cloud.agent.api.NetworkUsageAnswer; -import com.cloud.agent.api.NetworkUsageCommand; -import com.cloud.agent.api.PrepareForMigrationCommand; -import com.cloud.agent.api.RebootAnswer; -import com.cloud.agent.api.RebootRouterCommand; -import com.cloud.agent.api.StartRouterAnswer; -import com.cloud.agent.api.StartRouterCommand; -import com.cloud.agent.api.StopCommand; import com.cloud.agent.api.routing.DhcpEntryCommand; import com.cloud.agent.api.routing.IPAssocCommand; import com.cloud.agent.api.routing.LoadBalancerCfgCommand; -import com.cloud.agent.api.routing.SavePasswordCommand; import com.cloud.agent.api.routing.SetFirewallRuleCommand; -import com.cloud.agent.api.routing.VmDataCommand; import com.cloud.agent.api.to.NicTO; import com.cloud.agent.manager.Commands; import com.cloud.alert.AlertManager; @@ -77,19 +58,14 @@ import com.cloud.api.commands.StartRouterCmd; import com.cloud.api.commands.StopRouterCmd; import com.cloud.api.commands.UpdateLoadBalancerRuleCmd; import com.cloud.api.commands.UpgradeRouterCmd; -import com.cloud.async.AsyncJobExecutor; import com.cloud.async.AsyncJobManager; -import com.cloud.async.AsyncJobVO; -import com.cloud.async.BaseAsyncJobExecutor; import com.cloud.capacity.dao.CapacityDao; -import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.ResourceCount.ResourceType; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.configuration.dao.ResourceLimitDao; import com.cloud.dc.DataCenterVO; import com.cloud.dc.HostPodVO; -import com.cloud.dc.Vlan; import com.cloud.dc.Vlan.VlanType; import com.cloud.dc.VlanVO; import com.cloud.dc.dao.AccountVlanMapDao; @@ -98,9 +74,7 @@ import com.cloud.dc.dao.HostPodDao; import com.cloud.dc.dao.VlanDao; import com.cloud.deploy.DeployDestination; import com.cloud.deploy.DeploymentPlan; -import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao; -import com.cloud.event.EventState; import com.cloud.event.EventTypes; import com.cloud.event.EventUtils; import com.cloud.event.EventVO; @@ -116,9 +90,6 @@ import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.OperationTimedoutException; import com.cloud.exception.PermissionDeniedException; import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.StorageUnavailableException; -import com.cloud.ha.HighAvailabilityManager; -import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; @@ -133,6 +104,7 @@ import com.cloud.network.dao.NetworkRuleConfigDao; import com.cloud.network.dao.SecurityGroupDao; import com.cloud.network.dao.SecurityGroupVMMapDao; import com.cloud.network.element.NetworkElement; +import com.cloud.network.router.DomainRouterManager; import com.cloud.offering.NetworkOffering; import com.cloud.offering.NetworkOffering.GuestIpType; import com.cloud.offerings.NetworkOfferingVO; @@ -141,11 +113,7 @@ import com.cloud.resource.Resource; import com.cloud.resource.Resource.ReservationStrategy; import com.cloud.service.ServiceOfferingVO; import com.cloud.service.dao.ServiceOfferingDao; -import com.cloud.storage.GuestOSVO; import com.cloud.storage.StorageManager; -import com.cloud.storage.StoragePoolVO; -import com.cloud.storage.VMTemplateVO; -import com.cloud.storage.VolumeVO; import com.cloud.storage.dao.DiskTemplateDao; import com.cloud.storage.dao.GuestOSDao; import com.cloud.storage.dao.StoragePoolDao; @@ -162,35 +130,25 @@ import com.cloud.user.dao.AccountDao; import com.cloud.user.dao.UserDao; import com.cloud.user.dao.UserStatisticsDao; import com.cloud.uservm.UserVm; -import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; import com.cloud.utils.StringUtils; import com.cloud.utils.component.Adapters; -import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.component.Inject; -import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.DB; import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.exception.ExecutionException; import com.cloud.utils.net.NetUtils; import com.cloud.vm.DomainRouter; -import com.cloud.vm.DomainRouter.Role; import com.cloud.vm.DomainRouterVO; import com.cloud.vm.NicProfile; import com.cloud.vm.NicVO; import com.cloud.vm.State; import com.cloud.vm.UserVmVO; import com.cloud.vm.VMInstanceVO; -import com.cloud.vm.VirtualMachine; -import com.cloud.vm.VirtualMachine.Event; -import com.cloud.vm.VirtualMachineManager; -import com.cloud.vm.VirtualMachineName; import com.cloud.vm.VirtualMachineProfile; -import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.UserVmDao; @@ -198,7 +156,7 @@ import com.cloud.vm.dao.UserVmDao; * NetworkManagerImpl implements NetworkManager. */ @Local(value={NetworkManager.class}) -public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager { +public class NetworkManagerImpl implements NetworkManager { private static final Logger s_logger = Logger.getLogger(NetworkManagerImpl.class); String _name; @@ -211,7 +169,6 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager @Inject IPAddressDao _ipAddressDao = null; @Inject VMTemplateDao _templateDao = null; @Inject DiskTemplateDao _diskDao = null; - @Inject DomainRouterDao _routerDao = null; @Inject UserDao _userDao = null; @Inject AccountDao _accountDao = null; @Inject DomainDao _domainDao = null; @@ -227,7 +184,6 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager @Inject CapacityDao _capacityDao = null; @Inject AgentManager _agentMgr; @Inject StorageManager _storageMgr; - @Inject HighAvailabilityManager _haMgr; @Inject AlertManager _alertMgr; @Inject AccountManager _accountMgr; @Inject ConfigurationManager _configMgr; @@ -244,44 +200,20 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager @Inject NetworkConfigurationDao _networkProfileDao = null; @Inject NicDao _nicDao; @Inject GuestOSDao _guestOSDao = null; -// @Inject DomainRouterManager _routerMgr; + @Inject DomainRouterManager _routerMgr; @Inject(adapter=NetworkGuru.class) Adapters _networkGurus; @Inject(adapter=NetworkElement.class) Adapters _networkElements; - long _routerTemplateId = -1; - int _routerRamSize; - // String _privateNetmask; - int _retry = 2; - String _domain; - String _instance; - int _routerCleanupInterval = 3600; - int _routerStatsInterval = 300; - private ServiceOfferingVO _offering; - private int _networkRate; - private int _multicastRate; private HashMap _systemNetworks = new HashMap(5); - private VMTemplateVO _template; - ScheduledExecutorService _executor; - @Override - public boolean destroy(DomainRouterVO router) { - return destroyRouter(router.getId()); - } - @Override public boolean sendSshKeysToHost(Long hostId, String pubKey, String prvKey) { - ModifySshKeysCommand cmd = new ModifySshKeysCommand(pubKey, prvKey); - final Answer answer = _agentMgr.easySend(hostId, cmd); - - if (answer != null) - return true; - else - return false; + return _routerMgr.sendSshKeysToHost(hostId, pubKey, prvKey); } @Override @DB @@ -424,144 +356,9 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager @Override @DB public DomainRouterVO createDhcpServerForDirectlyAttachedGuests(long userId, long accountId, DataCenterVO dc, HostPodVO pod, Long candidateHost, VlanVO guestVlan) throws ConcurrentOperationException{ - - final AccountVO account = _accountDao.findById(accountId); - boolean podVlan = guestVlan.getVlanType().equals(VlanType.DirectAttached) && guestVlan.getVlanId().equals(Vlan.UNTAGGED); - long accountIdForDHCPServer = podVlan ? Account.ACCOUNT_ID_SYSTEM : accountId; - long domainIdForDHCPServer = podVlan ? DomainVO.ROOT_DOMAIN : account.getDomainId(); - String domainNameForDHCPServer = podVlan ? "root" : _domainDao.findById(account.getDomainId()).getName(); - - final VMTemplateVO rtrTemplate = _templateDao.findRoutingTemplate(); - - final Transaction txn = Transaction.currentTxn(); - DomainRouterVO router = null; - Long podId = pod.getId(); - pod = _podDao.acquire(podId, 20*60); - if (pod == null) { - throw new ConcurrentOperationException("Unable to acquire lock on pod " + podId ); - } - if(s_logger.isDebugEnabled()) - s_logger.debug("Lock on pod " + podId + " is acquired"); - - final long id = _routerDao.getNextInSequence(Long.class, "id"); - final String[] macAddresses = _dcDao.getNextAvailableMacAddressPair(dc.getId()); - final String mgmtMacAddress = macAddresses[0]; - final String guestMacAddress = macAddresses[1]; - final String name = VirtualMachineName.getRouterName(id, _instance).intern(); - - boolean routerLockAcquired = false; - try { - List rtrs = _routerDao.listByVlanDbId(guestVlan.getId()); - assert rtrs.size() < 2 : "How did we get more than one router per vlan?"; - if (rtrs.size() == 1) { - return rtrs.get(0); - } - String mgmtNetmask = NetUtils.getCidrNetmask(pod.getCidrSize()); - final String guestIp = _ipAddressDao.assignIpAddress(accountIdForDHCPServer, domainIdForDHCPServer, guestVlan.getId(), false); - - router = - new DomainRouterVO(id, - _offering.getId(), - name, - mgmtMacAddress, - null, - mgmtNetmask, - _routerTemplateId, - rtrTemplate.getGuestOSId(), - guestMacAddress, - guestIp, - guestVlan.getVlanNetmask(), - accountIdForDHCPServer, - domainIdForDHCPServer, - "FE:FF:FF:FF:FF:FF", - null, - "255.255.255.255", - guestVlan.getId(), - guestVlan.getVlanId(), - pod.getId(), - dc.getId(), - _routerRamSize, - guestVlan.getVlanGateway(), - domainNameForDHCPServer, - dc.getDns1(), - dc.getDns2()); - router.setRole(Role.DHCP_USERDATA); - router.setVnet(guestVlan.getVlanId()); - - router.setLastHostId(candidateHost); - - txn.start(); - router = _routerDao.persist(router); - router = _routerDao.acquire(router.getId()); - if (router == null) { - s_logger.debug("Unable to acquire lock on router " + id); - throw new CloudRuntimeException("Unable to acquire lock on router " + id); - } - - routerLockAcquired = true; - - txn.commit(); - - List vols = _storageMgr.create(account, router, rtrTemplate, dc, pod, _offering, null,0); - if (vols == null){ - _ipAddressDao.unassignIpAddress(guestIp); - _routerDao.expunge(router.getId()); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Unable to create dhcp server in storage host or pool in pod " + pod.getName() + " (id:" + pod.getId() + ")"); - } - } - - final EventVO event = new EventVO(); - event.setUserId(userId); - event.setAccountId(accountIdForDHCPServer); - event.setType(EventTypes.EVENT_ROUTER_CREATE); - - if (vols == null) { - event.setDescription("failed to create DHCP Server : " + router.getName()); - event.setLevel(EventVO.LEVEL_ERROR); - _eventDao.persist(event); - throw new ExecutionException("Unable to create DHCP Server"); - } - _routerDao.updateIf(router, Event.OperationSucceeded, null); - - s_logger.info("DHCP server created: id=" + router.getId() + "; name=" + router.getName() + "; vlan=" + guestVlan.getVlanId() + "; pod=" + pod.getName()); - - event.setDescription("successfully created DHCP Server : " + router.getName() + " with ip : " + router.getGuestIpAddress()); - _eventDao.persist(event); - - return router; - } catch (final Throwable th) { - if (th instanceof ExecutionException) { - s_logger.error("Error while starting router due to " + th.getMessage()); - } else { - s_logger.error("Unable to create router", th); - } - txn.rollback(); - - if (router.getState() == State.Creating) { - _routerDao.expunge(router.getId()); - } - return null; - } finally { - if (routerLockAcquired) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Releasing lock on router " + id); - } - _routerDao.release(id); - } - if (pod != null) { - if(s_logger.isDebugEnabled()) - s_logger.debug("Releasing lock on pod " + podId); - _podDao.release(pod.getId()); - } - } + return _routerMgr.createDhcpServerForDirectlyAttachedGuests(userId, accountId, dc, pod, candidateHost, guestVlan); } - @Override - public DomainRouterVO assignRouter(final long userId, final long accountId, final long dataCenterId, final long podId, final String domain, final String instance) throws InsufficientCapacityException { - return null; - } - @Override public boolean releaseRouter(final long routerId) { return destroyRouter(routerId); @@ -571,954 +368,59 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager public DomainRouterVO createRouter(final long accountId, final String publicIpAddress, final long dataCenterId, String domain, final ServiceOfferingVO offering, long startEventId) throws ConcurrentOperationException { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Creating a router for account=" + accountId + "; publicIpAddress=" + publicIpAddress + "; dc=" + dataCenterId + "domain=" + domain); - } - - final AccountVO account = _accountDao.acquire(accountId); - if (account == null) { - throw new ConcurrentOperationException("Unable to acquire account " + accountId); - } - - if(s_logger.isDebugEnabled()) - s_logger.debug("lock on account " + accountId + " for createRouter is acquired"); - - final Transaction txn = Transaction.currentTxn(); - DomainRouterVO router = null; - boolean success = false; - try { - router = _routerDao.findBy(accountId, dataCenterId); - if (router != null && router.getState() != State.Creating) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Router " + router.toString() + " found for account " + accountId + " in data center " + dataCenterId); - } - success = true; - return router; - } - EventVO event = new EventVO(); - event.setUserId(1L); - event.setAccountId(accountId); - event.setType(EventTypes.EVENT_ROUTER_CREATE); - event.setState(EventState.Started); - event.setStartId(startEventId); - event.setDescription("Creating Router for account with Id: "+accountId); - event = _eventDao.persist(event); - - final DataCenterVO dc = _dcDao.findById(dataCenterId); - final VMTemplateVO template = _templateDao.findRoutingTemplate(); - - String[] macAddresses = getMacAddressPair(dataCenterId); - String privateMacAddress = macAddresses[0]; - String publicMacAddress = macAddresses[1]; - - final long id = _routerDao.getNextInSequence(Long.class, "id"); - - if (domain == null) { - domain = "v" + Long.toHexString(accountId) + "." + _domain; - } - - final String name = VirtualMachineName.getRouterName(id, _instance).intern(); - long routerMacAddress = NetUtils.mac2Long(dc.getRouterMacAddress()) | ((dc.getId() & 0xff) << 32); - - //set the guestNetworkCidr from the dc obj - String guestNetworkCidr = dc.getGuestNetworkCidr(); - String[] cidrTuple = guestNetworkCidr.split("\\/"); - String guestIpAddress = NetUtils.getIpRangeStartIpFromCidr(cidrTuple[0], Long.parseLong(cidrTuple[1])); - String guestNetmask = NetUtils.getCidrNetmask(Long.parseLong(cidrTuple[1])); - -// String path = null; -// final int numVolumes = offering.isMirroredVolumes()?2:1; -// long routerId = 0; - - // Find the VLAN ID, VLAN gateway, and VLAN netmask for publicIpAddress - IPAddressVO ipVO = _ipAddressDao.findById(publicIpAddress); - VlanVO vlan = _vlanDao.findById(ipVO.getVlanDbId()); - String vlanId = vlan.getVlanId(); - String vlanGateway = vlan.getVlanGateway(); - String vlanNetmask = vlan.getVlanNetmask(); - - Pair pod = null; - Set avoids = new HashSet(); - boolean found = false; - while ((pod = _agentMgr.findPod(template, offering, dc, accountId, avoids)) != null) { - - if (s_logger.isDebugEnabled()) { - s_logger.debug("Attempting to create in pod " + pod.first().getName()); - } - - router = new DomainRouterVO(id, - _offering.getId(), - name, - privateMacAddress, - null, - null, - _routerTemplateId, - template.getGuestOSId(), - NetUtils.long2Mac(routerMacAddress), - guestIpAddress, - guestNetmask, - accountId, - account.getDomainId(), - publicMacAddress, - publicIpAddress, - vlanNetmask, - vlan.getId(), - vlanId, - pod.first().getId(), - dataCenterId, - _routerRamSize, - vlanGateway, - domain, - dc.getDns1(), - dc.getDns2()); - router.setMirroredVols(offering.isMirrored()); - - router.setLastHostId(pod.second()); - router = _routerDao.persist(router); - - List vols = _storageMgr.create(account, router, template, dc, pod.first(), _offering, null,0); - if(vols != null) { - found = true; - break; - } - - _routerDao.expunge(router.getId()); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Unable to find storage host or pool in pod " + pod.first().getName() + " (id:" + pod.first().getId() + "), checking other pods"); - } - avoids.add(pod.first().getId()); - } - - if (!found) { - event.setDescription("failed to create Domain Router : " + name); - event.setLevel(EventVO.LEVEL_ERROR); - _eventDao.persist(event); - throw new ExecutionException("Unable to create DomainRouter"); - } - _routerDao.updateIf(router, Event.OperationSucceeded, null); - - s_logger.debug("Router created: id=" + router.getId() + "; name=" + router.getName()); - - event = new EventVO(); - event.setUserId(1L); // system user performed the action - event.setAccountId(accountId); - event.setType(EventTypes.EVENT_ROUTER_CREATE); - event.setStartId(startEventId); - event.setDescription("successfully created Domain Router : " + router.getName() + " with ip : " + publicIpAddress); - _eventDao.persist(event); - success = true; - return router; - } catch (final Throwable th) { - if (th instanceof ExecutionException) { - s_logger.error("Error while starting router due to " + th.getMessage()); - } else { - s_logger.error("Unable to create router", th); - } - txn.rollback(); - - if (router != null && router.getState() == State.Creating) { - _routerDao.expunge(router.getId()); - } - return null; - } finally { - if (account != null) { - if(s_logger.isDebugEnabled()) - s_logger.debug("Releasing lock on account " + account.getId() + " for createRouter"); - _accountDao.release(account.getId()); - } - if(!success){ - EventVO event = new EventVO(); - event.setUserId(1L); // system user performed the action - event.setAccountId(accountId); - event.setType(EventTypes.EVENT_ROUTER_CREATE); - event.setStartId(startEventId); - event.setLevel(EventVO.LEVEL_ERROR); - event.setDescription("Failed to create router for account " + accountId + " in data center " + dataCenterId); - _eventDao.persist(event); - } - } + return _routerMgr.createRouter(accountId, publicIpAddress, dataCenterId, domain, offering, startEventId); } @Override public boolean destroyRouter(final long routerId) { - - if (s_logger.isDebugEnabled()) { - s_logger.debug("Attempting to destroy router " + routerId); - } - - DomainRouterVO router = _routerDao.acquire(routerId); - - if (router == null) { - s_logger.debug("Unable to acquire lock on router " + routerId); - return false; - } - - EventVO event = new EventVO(); - event.setUserId(User.UID_SYSTEM); - event.setAccountId(router.getAccountId()); - event.setType(EventTypes.EVENT_ROUTER_DESTROY); - event.setState(EventState.Started); - event.setParameters("id=" + routerId); - event.setDescription("Starting to destroy router : " + router.getName()); - event = _eventDao.persist(event); - - try { - if (router.getState() == State.Destroyed || router.getState() == State.Expunging || router.getRemoved() != null) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Unable to find router or router is destroyed: " + routerId); - } - return true; - } - - if (!stop(router, 0)) { - s_logger.debug("Unable to stop the router: " + routerId); - return false; - } - router = _routerDao.findById(routerId); - if (!_routerDao.updateIf(router, Event.DestroyRequested, router.getHostId())) { - s_logger.debug("VM " + router.toString() + " is not in a state to be destroyed."); - return false; - } - } finally { - if (s_logger.isDebugEnabled()) - s_logger.debug("Release lock on router " + routerId + " for stop"); - _routerDao.release(routerId); - } - - router.setPublicIpAddress(null); - router.setVlanDbId(null); - _routerDao.update(router.getId(), router); - _routerDao.remove(router.getId()); - - List vols = _volsDao.findByInstance(routerId); - _storageMgr.destroy(router, vols); - - if (s_logger.isDebugEnabled()) { - s_logger.debug("Successfully destroyed router: " + routerId); - } - - EventVO completedEvent = new EventVO(); - completedEvent.setUserId(User.UID_SYSTEM); - completedEvent.setAccountId(router.getAccountId()); - completedEvent.setType(EventTypes.EVENT_ROUTER_DESTROY); - completedEvent.setStartId(event.getId()); - completedEvent.setParameters("id=" + routerId); - completedEvent.setDescription("successfully destroyed router : " + router.getName()); - _eventDao.persist(completedEvent); - - return true; + return _routerMgr.destroyRouter(routerId); } @Override - @DB public boolean upgradeRouter(UpgradeRouterCmd cmd) throws InvalidParameterValueException, PermissionDeniedException { - Long routerId = cmd.getId(); - Long serviceOfferingId = cmd.getServiceOfferingId(); - Account account = (Account)UserContext.current().getAccountObject(); - - DomainRouterVO router = _routerDao.findById(routerId); - if (router == null) { - throw new InvalidParameterValueException("Unable to find router with id " + routerId); - } - - if ((account != null) && !_domainDao.isChildDomain(account.getDomainId(), router.getDomainId())) { - throw new PermissionDeniedException("Invalid domain router id (" + routerId + ") given, unable to stop router."); - } - - if (router.getServiceOfferingId() == serviceOfferingId) { - s_logger.debug("Router: " + routerId + "already has service offering: " + serviceOfferingId); - return true; - } - - ServiceOfferingVO newServiceOffering = _serviceOfferingDao.findById(serviceOfferingId); - if (newServiceOffering == null) { - throw new InvalidParameterValueException("Unable to find service offering with id " + serviceOfferingId); - } - - ServiceOfferingVO currentServiceOffering = _serviceOfferingDao.findById(router.getServiceOfferingId()); - - if (!currentServiceOffering.getGuestIpType().equals(newServiceOffering.getGuestIpType())) { - throw new InvalidParameterValueException("Can't upgrade, due to new newtowrk type: " + newServiceOffering.getGuestIpType() + " is different from " + - "curruent network type: " + currentServiceOffering.getGuestIpType()); - } - if (currentServiceOffering.getUseLocalStorage() != newServiceOffering.getUseLocalStorage()) { - throw new InvalidParameterValueException("Can't upgrade, due to new local storage status : " + newServiceOffering.getGuestIpType() + " is different from " + - "curruent local storage status: " + currentServiceOffering.getUseLocalStorage()); - } - - router = _routerDao.acquire(routerId); - - router.setServiceOfferingId(serviceOfferingId); - return _routerDao.update(routerId, router); - } - - private String rot13(final String password) { - final StringBuffer newPassword = new StringBuffer(""); - - for (int i = 0; i < password.length(); i++) { - char c = password.charAt(i); - - if ((c >= 'a' && c <= 'm') || ((c >= 'A' && c <= 'M'))) { - c += 13; - } else if ((c >= 'n' && c <= 'z') || (c >= 'N' && c <= 'Z')) { - c -= 13; - } - - newPassword.append(c); - } - - return newPassword.toString(); + return _routerMgr.upgradeRouter(cmd); } @Override public boolean savePasswordToRouter(final long routerId, final String vmIpAddress, final String password) { - - final DomainRouterVO router = _routerDao.findById(routerId); - final String routerPrivateIpAddress = router.getPrivateIpAddress(); - final String vmName = router.getName(); - final String encodedPassword = rot13(password); - final SavePasswordCommand cmdSavePassword = new SavePasswordCommand(encodedPassword, vmIpAddress, routerPrivateIpAddress, vmName); - - if (router != null && router.getHostId() != null) { - final Answer answer = _agentMgr.easySend(router.getHostId(), cmdSavePassword); - return (answer != null && answer.getResult()); - } else { - // either the router doesn't exist or router isn't running at all - return false; - } + return _routerMgr.savePasswordToRouter(routerId, vmIpAddress, password); } @Override public DomainRouterVO startRouter(final long routerId, long eventId) { - try { - return start(routerId, eventId); - } catch (final StorageUnavailableException e) { - s_logger.debug(e.getMessage()); - return null; - } catch (final ConcurrentOperationException e) { - s_logger.debug(e.getMessage()); - return null; - } + return _routerMgr.startRouter(routerId, eventId); } @Override - public DomainRouterVO startRouter(StartRouterCmd cmd) throws InvalidParameterValueException, PermissionDeniedException{ - Long routerId = cmd.getId(); - Account account = (Account)UserContext.current().getAccountObject(); - - //verify parameters - DomainRouterVO router = _routerDao.findById(routerId); - if (router == null) { - throw new PermissionDeniedException ("Unable to start router with id " + routerId + ". Permisssion denied"); - } - if ((account != null) && !_domainDao.isChildDomain(account.getDomainId(), router.getDomainId())) { - throw new PermissionDeniedException ("Unable to start router with id " + routerId + ". Permission denied."); - } - - long eventId = EventUtils.saveScheduledEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM, EventTypes.EVENT_ROUTER_START, "starting Router with Id: "+routerId); - return startRouter(routerId, eventId); + public DomainRouterVO startRouter(StartRouterCmd cmd) throws InvalidParameterValueException, PermissionDeniedException { + return _routerMgr.startRouter(cmd); } - @Override @DB - public DomainRouterVO start(long routerId, long startEventId) throws StorageUnavailableException, ConcurrentOperationException { - AsyncJobExecutor asyncExecutor = BaseAsyncJobExecutor.getCurrentExecutor(); - if (asyncExecutor != null) { - AsyncJobVO job = asyncExecutor.getJob(); - if (s_logger.isInfoEnabled()) - s_logger.info("Start router " + routerId + ", update async job-" + job.getId()); - _asyncMgr.updateAsyncJobAttachment(job.getId(), "domain_router", routerId); - } - - DomainRouterVO router = _routerDao.acquire(routerId); - if (router == null) { - s_logger.debug("Unable to lock the router " + routerId); - return router; - } - - if(s_logger.isDebugEnabled()) - s_logger.debug("Lock on router " + routerId + " is acquired"); - - boolean started = false; - String vnet = null; - boolean vnetAllocated = false; - try { - final State state = router.getState(); - if (state == State.Running) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Router is already started: " + router.toString()); - } - started = true; - return router; - } - - EventVO event = new EventVO(); - event.setUserId(1L); - event.setAccountId(router.getAccountId()); - event.setType(EventTypes.EVENT_ROUTER_START); - event.setState(EventState.Started); - event.setDescription("Starting Router with Id: "+routerId); - event.setStartId(startEventId); - event = _eventDao.persist(event); - - if(startEventId == 0){ - // When route start is not asynchronous, use id of the Started event instead of Scheduled event - startEventId = event.getId(); - } - - - if (state == State.Destroyed || state == State.Expunging || router.getRemoved() != null) { - s_logger.debug("Starting a router that's can not be started: " + router.toString()); - return null; - } - - if (state.isTransitional()) { - throw new ConcurrentOperationException("Someone else is starting the router: " + router.toString()); - } - - final HostPodVO pod = _podDao.findById(router.getPodId()); - final HashSet avoid = new HashSet(); - final VMTemplateVO template = _templateDao.findById(router.getTemplateId()); - final DataCenterVO dc = _dcDao.findById(router.getDataCenterId()); - ServiceOfferingVO offering = _serviceOfferingDao.findById(router.getServiceOfferingId()); - List sps = _storageMgr.getStoragePoolsForVm(router.getId()); - StoragePoolVO sp = sps.get(0); // FIXME - - HostVO routingHost = (HostVO)_agentMgr.findHost(Host.Type.Routing, dc, pod, sp, offering, template, router, null, avoid); - - if (routingHost == null) { - s_logger.error("Unable to find a host to start " + router.toString()); - return null; - } - - if (!_routerDao.updateIf(router, Event.StartRequested, routingHost.getId())) { - s_logger.debug("Unable to start router " + router.toString() + " because it is not in a startable state"); - throw new ConcurrentOperationException("Someone else is starting the router: " + router.toString()); - } - - final boolean mirroredVols = router.isMirroredVols(); - try { - event = new EventVO(); - event.setUserId(1L); - event.setAccountId(router.getAccountId()); - event.setType(EventTypes.EVENT_ROUTER_START); - event.setStartId(startEventId); - - final List vms = _vmDao.listBy(routerId, State.Starting, State.Running, State.Stopped, State.Stopping); - if (vms.size() != 0) { // Find it in the existing network. - for (final UserVmVO vm : vms) { - if (vm.getVnet() != null) { - vnet = vm.getVnet(); - break; - } - } - } - - if (vnet != null) { - s_logger.debug("Router: " + router.getName() + " discovered vnet: " + vnet + " from existing VMs."); - } else { - s_logger.debug("Router: " + router.getName() + " was unable to discover vnet from existing VMs. Acquiring new vnet."); - } - - String routerMacAddress = null; - if (vnet == null && router.getRole() == Role.DHCP_FIREWALL_LB_PASSWD_USERDATA) { // If not found, then get another one. - if(USE_POD_VLAN){ - vnet = _dcDao.allocatePodVlan(router.getPodId(), router.getAccountId()); - } else { - vnet = _dcDao.allocateVnet(router.getDataCenterId(), router.getAccountId()); - } - vnetAllocated = true; - if(vnet != null){ - routerMacAddress = getRouterMacForVnet(dc, vnet); - } - } else if (router.getRole() == Role.DHCP_USERDATA) { - if (!Vlan.UNTAGGED.equals(router.getVlanId())) { - vnet = router.getVlanId().trim(); - } else { - vnet = Vlan.UNTAGGED; - } - routerMacAddress = router.getGuestMacAddress(); - } else if (vnet != null && router.getRole() == Role.DHCP_FIREWALL_LB_PASSWD_USERDATA) { - routerMacAddress = getRouterMacForVnet(dc, vnet); - } - - if (vnet == null) { - s_logger.error("Unable to get another vnet while starting router " + router.getName()); - return null; - } else { - s_logger.debug("Router: " + router.getName() + " is using vnet: " + vnet); - } - - Answer answer = null; - int retry = _retry; - - do { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Trying to start router on host " + routingHost.getName()); - } - - String privateIpAddress = _dcDao.allocateLinkLocalPrivateIpAddress(router.getDataCenterId(), routingHost.getPodId(), router.getId()); - if (privateIpAddress == null) { - s_logger.error("Unable to allocate a private ip address while creating router for pod " + routingHost.getPodId()); - avoid.add(routingHost); - continue; - } - - if (s_logger.isDebugEnabled()) { - s_logger.debug("Private Ip Address allocated: " + privateIpAddress); - } - - router.setPrivateIpAddress(privateIpAddress); - router.setPrivateNetmask(NetUtils.getLinkLocalNetMask()); - router.setGuestMacAddress(routerMacAddress); - router.setVnet(vnet); - final String name = VirtualMachineName.attachVnet(router.getName(), vnet); - router.setInstanceName(name); - - _routerDao.updateIf(router, Event.OperationRetry, routingHost.getId()); - - List vols = _storageMgr.prepare(router, routingHost); - if (vols == null) { - s_logger.debug("Couldn't get storage working for " + routingHost); - continue; - } - /* - if( !_storageMgr.share(router, vols, routingHost, true) ) { - s_logger.debug("Unable to share volumes to host " + routingHost.getId()); - continue; - } - */ - - try { - String[] storageIps = new String[2]; - - // Determine the VM's OS description - String guestOSDescription; - GuestOSVO guestOS = _guestOSDao.findById(router.getGuestOSId()); - if (guestOS == null) { - String msg = "Could not find guest OS description for OSId " - + router.getGuestOSId() + " for vm: " + router.getName(); - s_logger.debug(msg); - throw new CloudRuntimeException(msg); - } else { - guestOSDescription = guestOS.getDisplayName(); - } - - final StartRouterCommand cmdStartRouter = new StartRouterCommand(router, _networkRate, - _multicastRate, name, storageIps, vols, mirroredVols, guestOSDescription); - answer = _agentMgr.send(routingHost.getId(), cmdStartRouter); - if (answer != null && answer.getResult()) { - if (answer instanceof StartRouterAnswer){ - StartRouterAnswer rAnswer = (StartRouterAnswer)answer; - if (rAnswer.getPrivateIpAddress() != null) { - router.setPrivateIpAddress(rAnswer.getPrivateIpAddress()); - } - if (rAnswer.getPrivateMacAddress() != null) { - router.setPrivateMacAddress(rAnswer.getPrivateMacAddress()); - } - } - if (resendRouterState(router)) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Router " + router.getName() + " started on " + routingHost.getName()); - } - started = true; - break; - } else { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Router " + router.getName() + " started on " + routingHost.getName() + " but failed to program rules"); - } - sendStopCommand(router); - } - } - s_logger.debug("Unable to start " + router.toString() + " on host " + routingHost.toString() + " due to " + answer.getDetails()); - } catch (OperationTimedoutException e) { - if (e.isActive()) { - s_logger.debug("Unable to start vm " + router.getName() + " due to operation timed out and it is active so scheduling a restart."); - _haMgr.scheduleRestart(router, true); - return null; - } - } catch (AgentUnavailableException e) { - s_logger.debug("Agent " + routingHost.toString() + " was unavailable to start VM " + router.getName()); - } - avoid.add(routingHost); - - router.setPrivateIpAddress(null); - _dcDao.releaseLinkLocalPrivateIpAddress(privateIpAddress, router.getDataCenterId(), router.getId()); - - _storageMgr.unshare(router, vols, routingHost); - } while (--retry > 0 && (routingHost = (HostVO)_agentMgr.findHost(Host.Type.Routing, dc, pod, sp, offering, template, router, null, avoid)) != null); - - - if (routingHost == null || retry <= 0) { - throw new ExecutionException("Couldn't find a routingHost"); - } - - _routerDao.updateIf(router, Event.OperationSucceeded, routingHost.getId()); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Router " + router.toString() + " is now started on " + routingHost.toString()); - } - - event.setDescription("successfully started Domain Router: " + router.getName()); - _eventDao.persist(event); - - return _routerDao.findById(routerId); - } catch (final Throwable th) { - - if (th instanceof ExecutionException) { - s_logger.error("Error while starting router due to " + th.getMessage()); - } else if (th instanceof ConcurrentOperationException) { - throw (ConcurrentOperationException)th; - } else if (th instanceof StorageUnavailableException) { - throw (StorageUnavailableException)th; - } else { - s_logger.error("Error while starting router", th); - } - return null; - } - } finally { - - if (!started){ - Transaction txn = Transaction.currentTxn(); - txn.start(); - if (vnetAllocated == true && vnet != null) { - _dcDao.releaseVnet(vnet, router.getDataCenterId(), router.getAccountId()); - } - - router.setVnet(null); - String privateIpAddress = router.getPrivateIpAddress(); - - router.setPrivateIpAddress(null); - - if (privateIpAddress != null) { - _dcDao.releasePrivateIpAddress(privateIpAddress, router.getDataCenterId(), router.getId()); - } - - - if (_routerDao.updateIf(router, Event.OperationFailed, null)) { - txn.commit(); - } - - EventVO event = new EventVO(); - event.setUserId(1L); - event.setAccountId(router.getAccountId()); - event.setType(EventTypes.EVENT_ROUTER_START); - event.setDescription("Failed to start Router with Id: "+routerId); - event.setLevel(EventVO.LEVEL_ERROR); - event.setStartId(startEventId); - _eventDao.persist(event); - } - - if (router != null) { - if(s_logger.isDebugEnabled()) - s_logger.debug("Releasing lock on router " + routerId); - _routerDao.release(routerId); - } - - } - } - - private String getRouterMacForVnet(final DataCenterVO dc, final String vnet) { - final long vnetId = Long.parseLong(vnet); - //ToDo: There could be 2 DomR in 2 diff pods of the zone with same vnet. Add podId to the mix to make them unique - final long routerMac = (NetUtils.mac2Long(dc.getRouterMacAddress()) & (0x00ffff0000ffffl)) | ((vnetId & 0xffff) << 16); - return NetUtils.long2Mac(routerMac); - } - - private String getRouterMacForZoneVlan(final DataCenterVO dc, final String vlan) { - final long vnetId = Long.parseLong(vlan); - final long routerMac = (NetUtils.mac2Long(dc.getRouterMacAddress()) & (0x00ffff0000ffffl)) | ((vnetId & 0xffff) << 16); - return NetUtils.long2Mac(routerMac); - } - - private String[] getMacAddressPair(long dataCenterId) { - return _dcDao.getNextAvailableMacAddressPair(dataCenterId); - } - - private boolean resendRouterState(final DomainRouterVO router) { - if (router.getRole() == Role.DHCP_FIREWALL_LB_PASSWD_USERDATA) { - //source NAT address is stored in /proc/cmdline of the domR and gets - //reassigned upon powerup. Source NAT rule gets configured in StartRouter command - final List ipAddrs = listPublicIpAddressesInVirtualNetwork(router.getAccountId(), router.getDataCenterId(), null); - final List ipAddrList = new ArrayList(); - for (final IPAddressVO ipVO : ipAddrs) { - ipAddrList.add(ipVO.getAddress()); - } - if (!ipAddrList.isEmpty()) { - final boolean success = associateIP(router, ipAddrList, true, 0); - if (!success) { - return false; - } - } - final List fwRules = new ArrayList(); - for (final IPAddressVO ipVO : ipAddrs) { - fwRules.addAll(_rulesDao.listIPForwarding(ipVO.getAddress())); - } - final List result = updateFirewallRules(router - .getPublicIpAddress(), fwRules, router); - if (result.size() != fwRules.size()) { - return false; - } - } - return resendDhcpEntries(router); - - } - - private boolean resendDhcpEntries(final DomainRouterVO router){ - final List vms = _vmDao.listBy(router.getId(), State.Creating, State.Starting, State.Running, State.Stopping, State.Stopped, State.Migrating); - Commands cmds = new Commands(OnError.Continue); - for (UserVmVO vm: vms) { - if (vm.getGuestIpAddress() == null || vm.getGuestMacAddress() == null || vm.getName() == null) - continue; - DhcpEntryCommand decmd = new DhcpEntryCommand(vm.getGuestMacAddress(), vm.getGuestIpAddress(), router.getPrivateIpAddress(), vm.getName()); - cmds.addCommand(decmd); - } - if (cmds.size() > 0) { - try { - _agentMgr.send(router.getHostId(), cmds); - } catch (final AgentUnavailableException e) { - s_logger.warn("agent unavailable", e); - } catch (final OperationTimedoutException e) { - s_logger.warn("Timed Out", e); - } - Answer[] answers = cmds.getAnswers(); - if (answers == null ){ - return false; - } - int i=0; - while (i < cmds.size()) { - Answer ans = answers[i]; - i++; - if ((ans != null) && (ans.getResult())) { - continue; - } else { - return false; - } - } - } - return true; - } - - /* - private boolean resendUserData(final DomainRouterVO router){ - final List vms = _vmDao.listByRouterId(router.getId()); - final List cmdList = new ArrayList(); - for (UserVmVO vm: vms) { - if (vm.getGuestIpAddress() == null || vm.getGuestMacAddress() == null || vm.getName() == null) - continue; - if (vm.getUserData() == null) - continue; - UserDataCommand userDataCmd = new UserDataCommand(vm.getUserData(), vm.getGuestIpAddress(), router.getPrivateIpAddress(), vm.getName()); - cmdList.add(userDataCmd); - } - final Command [] cmds = new Command[cmdList.size()]; - Answer [] answers = null; - try { - answers = _agentMgr.send(router.getHostId(), cmdList.toArray(cmds), false); - } catch (final AgentUnavailableException e) { - s_logger.warn("agent unavailable", e); - } catch (final OperationTimedoutException e) { - s_logger.warn("Timed Out", e); - } - if (answers == null ){ - return false; - } - int i=0; - while (i < cmdList.size()) { - Answer ans = answers[i]; - i++; - if ((ans != null) && (ans.getResult())) { - continue; - } else { - return false; - } - } - return true; - } - */ - @Override public boolean stopRouter(final long routerId, long eventId) { - AsyncJobExecutor asyncExecutor = BaseAsyncJobExecutor.getCurrentExecutor(); - if (asyncExecutor != null) { - AsyncJobVO job = asyncExecutor.getJob(); - - if (s_logger.isInfoEnabled()) - s_logger.info("Stop router " + routerId + ", update async job-" + job.getId()); - _asyncMgr.updateAsyncJobAttachment(job.getId(), "domain_router", routerId); - } - - if (s_logger.isDebugEnabled()) { - s_logger.debug("Stopping router " + routerId); - } - - return stop(_routerDao.findById(routerId), eventId); + return _routerMgr.stopRouter(routerId, eventId); } @Override public DomainRouterVO stopRouter(StopRouterCmd cmd) throws InvalidParameterValueException, PermissionDeniedException{ - Long routerId = cmd.getId(); - Account account = (Account)UserContext.current().getAccountObject(); - - // verify parameters - DomainRouterVO router = _routerDao.findById(routerId); - if (router == null) { - throw new PermissionDeniedException ("Unable to stop router with id " + routerId + ". Permission denied."); - } - - if ((account != null) && !_domainDao.isChildDomain(account.getDomainId(), router.getDomainId())) { - throw new PermissionDeniedException ("Unable to stop router with id " + routerId + ". Permission denied"); - } - - long eventId = EventUtils.saveScheduledEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM, EventTypes.EVENT_ROUTER_STOP, "stopping Router with Id: "+routerId); - - boolean success = stopRouter(routerId, eventId); - - if (success) { - return _routerDao.findById(routerId); - } - return null; + return _routerMgr.stopRouter(cmd); } - @DB - public void processStopOrRebootAnswer(final DomainRouterVO router, Answer answer) { - final Transaction txn = Transaction.currentTxn(); - try { - txn.start(); - final UserStatisticsVO userStats = _userStatsDao.lock(router.getAccountId(), router.getDataCenterId()); - if (userStats != null) { - final RebootAnswer sa = (RebootAnswer)answer; - final Long received = sa.getBytesReceived(); - long netBytes = 0; - if (received != null) { - if (received.longValue() >= userStats.getCurrentBytesReceived()) { - netBytes = received.longValue(); - } else { - netBytes = userStats.getCurrentBytesReceived() + received; - } - } else { - netBytes = userStats.getCurrentBytesReceived(); - } - userStats.setCurrentBytesReceived(0); - userStats.setNetBytesReceived(userStats.getNetBytesReceived() + netBytes); - - final Long sent = sa.getBytesSent(); - - if (sent != null) { - if (sent.longValue() >= userStats.getCurrentBytesSent()) { - netBytes = sent.longValue(); - } else { - netBytes = userStats.getCurrentBytesSent() + sent; - } - } else { - netBytes = userStats.getCurrentBytesSent(); - } - userStats.setNetBytesSent(userStats.getNetBytesSent() + netBytes); - userStats.setCurrentBytesSent(0); - _userStatsDao.update(userStats.getId(), userStats); - } else { - s_logger.warn("User stats were not created for account " + router.getAccountId() + " and dc " + router.getDataCenterId()); - } - txn.commit(); - } catch (final Exception e) { - throw new CloudRuntimeException("Problem getting stats after reboot/stop ", e); - } - } - @Override public boolean getRouterStatistics(final long vmId, final Map netStats, final Map diskStats) { - final DomainRouterVO router = _routerDao.findById(vmId); - - if (router == null || router.getState() != State.Running || router.getHostId() == null) { - return true; - } - - /* - final GetVmStatsCommand cmd = new GetVmStatsCommand(router, router.getInstanceName()); - final Answer answer = _agentMgr.easySend(router.getHostId(), cmd); - if (answer == null) { - return false; - } - - final GetVmStatsAnswer stats = (GetVmStatsAnswer)answer; - - netStats.putAll(stats.getNetworkStats()); - diskStats.putAll(stats.getDiskStats()); - */ - - return true; + return _routerMgr.getRouterStatistics(vmId, netStats, diskStats); } @Override public boolean rebootRouter(final long routerId, long startEventId) { - AsyncJobExecutor asyncExecutor = BaseAsyncJobExecutor.getCurrentExecutor(); - if (asyncExecutor != null) { - AsyncJobVO job = asyncExecutor.getJob(); - - if (s_logger.isInfoEnabled()) - s_logger.info("Reboot router " + routerId + ", update async job-" + job.getId()); - _asyncMgr.updateAsyncJobAttachment(job.getId(), "domain_router", routerId); - } - - final DomainRouterVO router = _routerDao.findById(routerId); - - if (router == null || router.getState() == State.Destroyed) { - return false; - } - - EventVO event = new EventVO(); - event.setUserId(1L); - event.setAccountId(router.getAccountId()); - event.setType(EventTypes.EVENT_ROUTER_REBOOT); - event.setState(EventState.Started); - event.setDescription("Rebooting Router with Id: "+routerId); - event.setStartId(startEventId); - _eventDao.persist(event); - - - event = new EventVO(); - event.setUserId(1L); - event.setAccountId(router.getAccountId()); - event.setType(EventTypes.EVENT_ROUTER_REBOOT); - event.setStartId(startEventId); - - if (router.getState() == State.Running && router.getHostId() != null) { - final RebootRouterCommand cmd = new RebootRouterCommand(router.getInstanceName(), router.getPrivateIpAddress()); - final RebootAnswer answer = (RebootAnswer)_agentMgr.easySend(router.getHostId(), cmd); - - if (answer != null && resendRouterState(router)) { - processStopOrRebootAnswer(router, answer); - event.setDescription("successfully rebooted Domain Router : " + router.getName()); - _eventDao.persist(event); - return true; - } else { - event.setDescription("failed to reboot Domain Router : " + router.getName()); - event.setLevel(EventVO.LEVEL_ERROR); - _eventDao.persist(event); - return false; - } - } else { - return startRouter(routerId, 0) != null; - } + return _routerMgr.rebootRouter(routerId, startEventId); } @Override public boolean rebootRouter(RebootRouterCmd cmd) throws InvalidParameterValueException, PermissionDeniedException{ - Long routerId = cmd.getId(); - Account account = (Account)UserContext.current().getAccountObject(); - - //verify parameters - DomainRouterVO router = _routerDao.findById(routerId); - if (router == null) { - throw new PermissionDeniedException("Unable to reboot domain router with id " + routerId + ". Permission denied"); - } - - if ((account != null) && !_domainDao.isChildDomain(account.getDomainId(), router.getDomainId())) { - throw new PermissionDeniedException("Unable to reboot domain router with id " + routerId + ". Permission denied"); - } - long eventId = EventUtils.saveScheduledEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM, EventTypes.EVENT_ROUTER_REBOOT, "rebooting Router with Id: "+routerId); - - return rebootRouter(routerId, eventId); + return _routerMgr.rebootRouter(cmd); } @Override @@ -1648,7 +550,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager throw rae; } - DomainRouterVO router = _routerDao.findBy(accountId, zoneId); + DomainRouterVO router = _routerMgr.getRouter(accountId, zoneId); if (router == null) { throw new InvalidParameterValueException("No router found for account: " + accountToLock.getAccountName() + "."); } @@ -1736,7 +638,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager return false; } - final DomainRouterVO router = _routerDao.findBy(ipVO.getAccountId(), ipVO.getDataCenterId()); + final DomainRouterVO router = _routerMgr.getRouter(ipVO.getAccountId(), ipVO.getDataCenterId()); Long hostId = router.getHostId(); if (router == null || router.getHostId() == null) { return true; @@ -2061,7 +963,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager throw new InvalidParameterValueException("Failed to assign to load balancer " + loadBalancerId + ", the load balancer was not found."); } - DomainRouterVO syncObject = _routerDao.findByPublicIpAddress(loadBalancer.getIpAddress()); + DomainRouterVO syncObject = _routerMgr.getRouter(loadBalancer.getIpAddress()); cmd.synchronizeCommand("Router", syncObject.getId()); // Permission check... @@ -2126,7 +1028,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager DomainRouterVO nextRouter = null; if (userVm.getDomainRouterId() != null) - nextRouter = _routerDao.findById(userVm.getDomainRouterId()); + nextRouter = _routerMgr.getRouter(userVm.getDomainRouterId()); if (nextRouter == null) { s_logger.warn("Unable to find router (" + userVm.getDomainRouterId() + ") for virtual machine with id " + instanceId); throw new InvalidParameterValueException("Unable to find router (" + userVm.getDomainRouterId() + ") for virtual machine with id " + instanceId); @@ -2425,14 +1327,14 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager DomainRouterVO router = null; if (ip.isSourceNat()) { - router = _routerDao.findByPublicIpAddress(ipAddress); + router = _routerMgr.getRouter(ipAddress); if (router != null) { if (router.getPublicIpAddress() != null) { return false; } } } else { - router = _routerDao.findBy(ip.getAccountId(), ip.getDataCenterId()); + router = _routerMgr.getRouter(ip.getAccountId(), ip.getDataCenterId()); } // Now send the updates down to the domR (note: we still hold locks on address and firewall) @@ -2540,12 +1442,12 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager @Override public DomainRouterVO getRouter(final long routerId) { - return _routerDao.findById(routerId); + return _routerMgr.getRouter(routerId); } @Override public List getRouters(final long hostId) { - return _routerDao.listByHostId(hostId); + return _routerMgr.getRouters(hostId); } @Override @@ -2576,64 +1478,8 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager public boolean configure(final String name, final Map params) throws ConfigurationException { _name = name; - _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("RouterMonitor")); - - final ComponentLocator locator = ComponentLocator.getCurrentLocator(); - final Map configs = _configDao.getConfiguration("AgentManager", params); - _routerRamSize = NumbersUtil.parseInt(configs.get("router.ram.size"), 128); - -// String value = configs.get("guest.ip.network"); -// _guestIpAddress = value != null ? value : "10.1.1.1"; -// -// value = configs.get("guest.netmask"); -// _guestNetmask = value != null ? value : "255.255.255.0"; - - String value = configs.get("start.retry"); - _retry = NumbersUtil.parseInt(value, 2); - - value = configs.get("router.stats.interval"); - _routerStatsInterval = NumbersUtil.parseInt(value, 300); - - value = configs.get("router.cleanup.interval"); - _routerCleanupInterval = NumbersUtil.parseInt(value, 3600); - - _domain = configs.get("domain"); - if (_domain == null) { - _domain = "foo.com"; - } - - _instance = configs.get("instance.name"); - if (_instance == null) { - _instance = "DEFAULT"; - } - - s_logger.info("Router configurations: " + "ramsize=" + _routerRamSize + "; templateId=" + _routerTemplateId); - - final UserStatisticsDao statsDao = locator.getDao(UserStatisticsDao.class); - if (statsDao == null) { - throw new ConfigurationException("Unable to get " + UserStatisticsDao.class.getName()); - } - - _agentMgr.registerForHostEvents(new SshKeysDistriMonitor(this, _hostDao, _configDao), true, false, false); - _haMgr.registerHandler(VirtualMachine.Type.DomainRouter, this); - - boolean useLocalStorage = Boolean.parseBoolean(configs.get(Config.SystemVMUseLocalStorage.key())); - String networkRateStr = _configDao.getValue("network.throttling.rate"); - String multicastRateStr = _configDao.getValue("multicast.throttling.rate"); - _networkRate = ((networkRateStr == null) ? 200 : Integer.parseInt(networkRateStr)); - _multicastRate = ((multicastRateStr == null) ? 10 : Integer.parseInt(multicastRateStr)); - _offering = new ServiceOfferingVO("Fake Offering For DomR", 1, _routerRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, useLocalStorage, true, null); - _offering.setUniqueName("Cloud.Com-SoftwareRouter"); - _offering = _serviceOfferingDao.persistSystemServiceOffering(_offering); - _template = _templateDao.findRoutingTemplate(); - if (_template == null) { - s_logger.error("Unable to find system vm template."); - } else { - _routerTemplateId = _template.getId(); - } - NetworkOfferingVO publicNetworkOffering = new NetworkOfferingVO(NetworkOfferingVO.SystemVmPublicNetwork, TrafficType.Public, null); publicNetworkOffering = _networkOfferingDao.persistSystemNetworkOffering(publicNetworkOffering); _systemNetworks.put(NetworkOfferingVO.SystemVmPublicNetwork, publicNetworkOffering); @@ -2662,8 +1508,6 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager @Override public boolean start() { - _executor.scheduleAtFixedRate(new RouterCleanupTask(), _routerCleanupInterval, _routerCleanupInterval, TimeUnit.SECONDS); - _executor.scheduleAtFixedRate(new NetworkUsageTask(), _routerStatsInterval, _routerStatsInterval, TimeUnit.SECONDS); return true; } @@ -2675,320 +1519,6 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager protected NetworkManagerImpl() { } - @Override - public Command cleanup(final DomainRouterVO vm, final String vmName) { - if (vmName != null) { - return new StopCommand(vm, vmName, VirtualMachineName.getVnet(vmName)); - } else if (vm != null) { - final DomainRouterVO vo = vm; - return new StopCommand(vo, vo.getVnet()); - } else { - throw new CloudRuntimeException("Shouldn't even be here!"); - } - } - - @Override - public void completeStartCommand(final DomainRouterVO router) { - _routerDao.updateIf(router, Event.AgentReportRunning, router.getHostId()); - } - - @Override - public void completeStopCommand(final DomainRouterVO router) { - completeStopCommand(router, Event.AgentReportStopped); - } - - @DB - public void completeStopCommand(final DomainRouterVO router, final Event ev) { - final long routerId = router.getId(); - - final Transaction txn = Transaction.currentTxn(); - try { - txn.start(); - if (_vmDao.listBy(routerId, State.Starting, State.Running).size() == 0) { - _dcDao.releaseVnet(router.getVnet(), router.getDataCenterId(), router.getAccountId()); - } - - router.setVnet(null); - - String privateIpAddress = router.getPrivateIpAddress(); - - if (privateIpAddress != null) { - _dcDao.releaseLinkLocalPrivateIpAddress(privateIpAddress, router.getDataCenterId(), router.getId()); - } - router.setPrivateIpAddress(null); - - if (!_routerDao.updateIf(router, ev, null)) { - s_logger.debug("Router is not updated"); - return; - } - txn.commit(); - } catch (final Exception e) { - throw new CloudRuntimeException("Unable to complete stop", e); - } - - if (_storageMgr.unshare(router, null) == null) { - s_logger.warn("Unable to set share to false for " + router.getId() + " on host "); - } - } - - @Override - public DomainRouterVO get(final long id) { - return getRouter(id); - } - - @Override - public Long convertToId(final String vmName) { - if (!VirtualMachineName.isValidRouterName(vmName, _instance)) { - return null; - } - - return VirtualMachineName.getRouterId(vmName); - } - - private boolean sendStopCommand(DomainRouterVO router) { - final StopCommand stop = new StopCommand(router, router.getInstanceName(), router.getVnet()); - - Answer answer = null; - boolean stopped = false; - try { - answer = _agentMgr.send(router.getHostId(), stop); - if (!answer.getResult()) { - s_logger.error("Unable to stop router"); - } else { - stopped = true; - } - } catch (AgentUnavailableException e) { - s_logger.warn("Unable to reach agent to stop vm: " + router.getId()); - } catch (OperationTimedoutException e) { - s_logger.warn("Unable to reach agent to stop vm: " + router.getId()); - s_logger.error("Unable to stop router"); - } - - return stopped; - } - - @Override - @DB - public boolean stop(DomainRouterVO router, long eventId) { - long routerId = router.getId(); - - router = _routerDao.acquire(routerId); - if (router == null) { - s_logger.debug("Unable to acquire lock on router " + routerId); - return false; - } - - EventVO event = new EventVO(); - event.setUserId(1L); - event.setAccountId(router.getAccountId()); - event.setType(EventTypes.EVENT_ROUTER_STOP); - event.setState(EventState.Started); - event.setDescription("Stopping Router with Id: "+routerId); - event.setStartId(eventId); - event = _eventDao.persist(event); - if(eventId == 0){ - eventId = event.getId(); - } - - try { - - if(s_logger.isDebugEnabled()) - s_logger.debug("Lock on router " + routerId + " for stop is acquired"); - - if (router.getRemoved() != null) { - s_logger.debug("router " + routerId + " is removed"); - return false; - } - - final Long hostId = router.getHostId(); - final State state = router.getState(); - if (state == State.Stopped || state == State.Destroyed || state == State.Expunging || router.getRemoved() != null) { - s_logger.debug("Router was either not found or the host id is null"); - return true; - } - - event = new EventVO(); - event.setUserId(1L); - event.setAccountId(router.getAccountId()); - event.setType(EventTypes.EVENT_ROUTER_STOP); - event.setStartId(eventId); - - if (!_routerDao.updateIf(router, Event.StopRequested, hostId)) { - s_logger.debug("VM " + router.toString() + " is not in a state to be stopped."); - return false; - } - - if (hostId == null) { - s_logger.debug("VM " + router.toString() + " doesn't have a host id"); - return false; - } - - final StopCommand stop = new StopCommand(router, router.getInstanceName(), router.getVnet(), router.getPrivateIpAddress()); - - Answer answer = null; - boolean stopped = false; - try { - answer = _agentMgr.send(hostId, stop); - if (!answer.getResult()) { - s_logger.error("Unable to stop router"); - event.setDescription("failed to stop Domain Router : " + router.getName()); - event.setLevel(EventVO.LEVEL_ERROR); - _eventDao.persist(event); - } else { - stopped = true; - } - } catch (AgentUnavailableException e) { - s_logger.warn("Unable to reach agent to stop vm: " + router.getId()); - } catch (OperationTimedoutException e) { - s_logger.warn("Unable to reach agent to stop vm: " + router.getId()); - s_logger.error("Unable to stop router"); - } - - if (!stopped) { - event.setDescription("failed to stop Domain Router : " + router.getName()); - event.setLevel(EventVO.LEVEL_ERROR); - _eventDao.persist(event); - _routerDao.updateIf(router, Event.OperationFailed, router.getHostId()); - return false; - } - - completeStopCommand(router, Event.OperationSucceeded); - event.setDescription("successfully stopped Domain Router : " + router.getName()); - _eventDao.persist(event); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Router " + router.toString() + " is stopped"); - } - - processStopOrRebootAnswer(router, answer); - } finally { - if(s_logger.isDebugEnabled()) - s_logger.debug("Release lock on router " + routerId + " for stop"); - _routerDao.release(routerId); - } - return true; - } - - @Override - public HostVO prepareForMigration(final DomainRouterVO router) throws StorageUnavailableException { - final long routerId = router.getId(); - final boolean mirroredVols = router.isMirroredVols(); - final DataCenterVO dc = _dcDao.findById(router.getDataCenterId()); - final HostPodVO pod = _podDao.findById(router.getPodId()); - final ServiceOfferingVO offering = _serviceOfferingDao.findById(router.getServiceOfferingId()); - List sps = _storageMgr.getStoragePoolsForVm(router.getId()); - StoragePoolVO sp = sps.get(0); // FIXME - - final List vols = _volsDao.findCreatedByInstance(routerId); - - final String [] storageIps = new String[2]; - final VolumeVO vol = vols.get(0); - storageIps[0] = vol.getHostIp(); - if (mirroredVols && (vols.size() == 2)) { - storageIps[1] = vols.get(1).getHostIp(); - } - - final PrepareForMigrationCommand cmd = new PrepareForMigrationCommand(router.getInstanceName(), router.getVnet(), storageIps, vols, mirroredVols); - - HostVO routingHost = null; - final HashSet avoid = new HashSet(); - - final HostVO fromHost = _hostDao.findById(router.getHostId()); - if (fromHost.getHypervisorType() != HypervisorType.KVM && fromHost.getClusterId() == null) { - s_logger.debug("The host is not in a cluster"); - return null; - } - avoid.add(fromHost); - - while ((routingHost = (HostVO)_agentMgr.findHost(Host.Type.Routing, dc, pod, sp, offering, _template, router, fromHost, avoid)) != null) { - avoid.add(routingHost); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Trying to migrate router to host " + routingHost.getName()); - } - - if( ! _storageMgr.share(router, vols, routingHost, false) ) { - s_logger.warn("Can not share " + vol.getPath() + " to " + router.getName() ); - throw new StorageUnavailableException("Can not share " + vol.getPath() + " to " + router.getName(), vol); - } - - final Answer answer = _agentMgr.easySend(routingHost.getId(), cmd); - if (answer != null && answer.getResult()) { - return routingHost; - } - - _storageMgr.unshare(router, vols, routingHost); - } - - return null; - } - - @Override - public boolean migrate(final DomainRouterVO router, final HostVO host) { - final HostVO fromHost = _hostDao.findById(router.getHostId()); - - if (!_routerDao.updateIf(router, Event.MigrationRequested, router.getHostId())) { - s_logger.debug("State for " + router.toString() + " has changed so migration can not take place."); - return false; - } - - final MigrateCommand cmd = new MigrateCommand(router.getInstanceName(), host.getPrivateIpAddress(), false); - final Answer answer = _agentMgr.easySend(fromHost.getId(), cmd); - if (answer == null) { - return false; - } - - final List vols = _volsDao.findCreatedByInstance(router.getId()); - if (vols.size() == 0) { - return true; - } - - _storageMgr.unshare(router, vols, fromHost); - - return true; - } - - @Override - public boolean completeMigration(final DomainRouterVO router, final HostVO host) throws OperationTimedoutException, AgentUnavailableException { - final CheckVirtualMachineCommand cvm = new CheckVirtualMachineCommand(router.getInstanceName()); - final CheckVirtualMachineAnswer answer = (CheckVirtualMachineAnswer)_agentMgr.send(host.getId(), cvm); - if (answer == null || !answer.getResult()) { - s_logger.debug("Unable to complete migration for " + router.getId()); - _routerDao.updateIf(router, Event.AgentReportStopped, null); - return false; - } - - final State state = answer.getState(); - if (state == State.Stopped) { - s_logger.warn("Unable to complete migration as we can not detect it on " + host.getId()); - _routerDao.updateIf(router, Event.AgentReportStopped, null); - return false; - } - - _routerDao.updateIf(router, Event.OperationSucceeded, host.getId()); - - return true; - } - - protected class RouterCleanupTask implements Runnable { - - public RouterCleanupTask() { - } - - @Override - public void run() { - try { - final List ids = _routerDao.findLonelyRouters(); - s_logger.info("Found " + ids.size() + " routers to stop. "); - - for (final Long id : ids) { - stopRouter(id, 0); - } - s_logger.info("Done my job. Time to rest."); - } catch (Exception e) { - s_logger.warn("Unable to stop routers. Will retry. ", e); - } - } - } - @Override public boolean addDhcpEntry(final long routerHostId, final String routerIp, String vmName, String vmMac, String vmIp) { final DhcpEntryCommand dhcpEntry = new DhcpEntryCommand(vmMac, vmIp, routerIp, vmName); @@ -3000,95 +1530,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager @Override public DomainRouterVO addVirtualMachineToGuestNetwork(UserVmVO vm, String password, long startEventId) throws ConcurrentOperationException { - try { - DomainRouterVO router = start(vm.getDomainRouterId(), 0); - if (router == null) { - s_logger.error("Can't find a domain router to start VM: " + vm.getName()); - return null; - } - - if (vm.getGuestMacAddress() == null){ - String routerGuestMacAddress = null; - if(USE_POD_VLAN){ - if((vm.getPodId() == router.getPodId())){ - routerGuestMacAddress = router.getGuestMacAddress(); - } else { - //Not in the same pod use guest zone mac address - routerGuestMacAddress = router.getGuestZoneMacAddress(); - } - String vmMacAddress = NetUtils.long2Mac((NetUtils.mac2Long(routerGuestMacAddress) & 0xffffffff0000L) | (NetUtils.ip2Long(vm.getGuestIpAddress()) & 0xffff)); - vm.setGuestMacAddress(vmMacAddress); - } - else { - String vmMacAddress = NetUtils.long2Mac((NetUtils.mac2Long(router.getGuestMacAddress()) & 0xffffffff0000L) | (NetUtils.ip2Long(vm.getGuestIpAddress()) & 0xffff)); - vm.setGuestMacAddress(vmMacAddress); - } - } - String userData = vm.getUserData(); - int cmdsLength = (password == null ? 0:1) + 1; - Commands cmds = new Commands(OnError.Stop); - int cmdIndex = 0; - int passwordIndex = -1; - int vmDataIndex = -1; - cmds.addCommand(new DhcpEntryCommand(vm.getGuestMacAddress(), vm.getGuestIpAddress(), router.getPrivateIpAddress(), vm.getName())); - if (password != null) { - final String encodedPassword = rot13(password); - cmds.addCommand(new SavePasswordCommand(encodedPassword, vm.getPrivateIpAddress(), router.getPrivateIpAddress(), vm.getName())); - passwordIndex = cmdIndex; - } - - - String serviceOffering = _serviceOfferingDao.findById(vm.getServiceOfferingId()).getDisplayText(); - String zoneName = _dcDao.findById(vm.getDataCenterId()).getName(); - String routerPublicIpAddress = (router.getPublicIpAddress() != null) ? router.getPublicIpAddress() : vm.getGuestIpAddress(); - - cmds.addCommand(generateVmDataCommand(router.getPrivateIpAddress(), routerPublicIpAddress, vm.getPrivateIpAddress(), userData, serviceOffering, zoneName, vm.getGuestIpAddress(), vm.getName(), vm.getInstanceName(), vm.getId())); - vmDataIndex = cmdIndex; - - Answer[] answers = _agentMgr.send(router.getHostId(), cmds); - if (!answers[0].getResult()) { - s_logger.error("Unable to set dhcp entry for " + vm.getId() + " - " + vm.getName() +" on domR: " + router.getName() + " due to " + answers[0].getDetails()); - return null; - } - - if (password != null && !answers[passwordIndex].getResult()) { - s_logger.error("Unable to set password for " + vm.getId() + " - " + vm.getName() + " due to " + answers[passwordIndex].getDetails()); - return null; - } - - if (vmDataIndex > 0 && !answers[vmDataIndex].getResult()) { - s_logger.error("Unable to set VM data for " + vm.getId() + " - " + vm.getName() + " due to " + answers[vmDataIndex].getDetails()); - return null; - } - return router; - } catch (StorageUnavailableException e) { - s_logger.error("Unable to start router " + vm.getDomainRouterId() + " because storage is unavailable."); - return null; - } catch (AgentUnavailableException e) { - s_logger.error("Unable to setup the router " + vm.getDomainRouterId() + " for vm " + vm.getId() + " - " + vm.getName() + " because agent is unavailable"); - return null; - } catch (OperationTimedoutException e) { - s_logger.error("Unable to setup the router " + vm.getDomainRouterId() + " for vm " + vm.getId() + " - " + vm.getName() + " because agent is too busy"); - return null; - } - } - - private VmDataCommand generateVmDataCommand(String routerPrivateIpAddress, String routerPublicIpAddress, - String vmPrivateIpAddress, String userData, String serviceOffering, String zoneName, - String guestIpAddress, String vmName, String vmInstanceName, long vmId) { - VmDataCommand cmd = new VmDataCommand(routerPrivateIpAddress, vmPrivateIpAddress); - - cmd.addVmData("userdata", "user-data", userData); - cmd.addVmData("metadata", "service-offering", serviceOffering); - cmd.addVmData("metadata", "availability-zone", zoneName); - cmd.addVmData("metadata", "local-ipv4", guestIpAddress); - cmd.addVmData("metadata", "local-hostname", vmName); - cmd.addVmData("metadata", "public-ipv4", routerPublicIpAddress); - cmd.addVmData("metadata", "public-hostname", routerPublicIpAddress); - cmd.addVmData("metadata", "instance-id", vmInstanceName); - cmd.addVmData("metadata", "vm-id", String.valueOf(vmId)); - - return cmd; + return _routerMgr.addVirtualMachineToGuestNetwork(vm, password, startEventId); } public void releaseVirtualMachineFromGuestNetwork(UserVmVO vm) { @@ -3096,18 +1538,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager @Override public String createZoneVlan(DomainRouterVO router) { - String zoneVlan = _dcDao.allocateVnet(router.getDataCenterId(), router.getAccountId()); - final DataCenterVO dc = _dcDao.findById(router.getDataCenterId()); - router.setZoneVlan(zoneVlan); - router.setGuestZoneMacAddress(getRouterMacForZoneVlan(dc, zoneVlan)); - _routerDao.update(router.getId(), router); - final CreateZoneVlanCommand cmdCreateZoneVlan = new CreateZoneVlanCommand(router); - CreateZoneVlanAnswer answer = (CreateZoneVlanAnswer) _agentMgr.easySend(router.getHostId(), cmdCreateZoneVlan); - if(!answer.getResult()){ - s_logger.error("Unable to create zone vlan for router: "+router.getName()+ " zoneVlan: "+zoneVlan); - return null; - } - return zoneVlan; + return _routerMgr.createZoneVlan(router); } @Override @@ -3402,62 +1833,6 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager return _nicDao.listBy(vm.getId()); } - protected class NetworkUsageTask implements Runnable { - - public NetworkUsageTask() { - } - - @Override - public void run() { - final List routers = _routerDao.listUpByHostId(null); - s_logger.debug("Found " + routers.size() + " running routers. "); - - for (DomainRouterVO router : routers) { - String privateIP = router.getPrivateIpAddress(); - if(privateIP != null){ - final NetworkUsageCommand usageCmd = new NetworkUsageCommand(privateIP, router.getName()); - final NetworkUsageAnswer answer = (NetworkUsageAnswer)_agentMgr.easySend(router.getHostId(), usageCmd); - if(answer != null){ - Transaction txn = Transaction.open(Transaction.CLOUD_DB); - try { - if ((answer.getBytesReceived() == 0) && (answer.getBytesSent() == 0)) { - s_logger.debug("Recieved and Sent bytes are both 0. Not updating user_statistics"); - continue; - } - txn.start(); - UserStatisticsVO stats = _statsDao.lock(router.getAccountId(), router.getDataCenterId()); - if (stats == null) { - s_logger.warn("unable to find stats for account: " + router.getAccountId()); - continue; - } - if (stats.getCurrentBytesReceived() > answer.getBytesReceived()) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Received # of bytes that's less than the last one. Assuming something went wrong and persisting it. Reported: " + answer.getBytesReceived() + " Stored: " + stats.getCurrentBytesReceived()); - } - stats.setNetBytesReceived(stats.getNetBytesReceived() + stats.getCurrentBytesReceived()); - } - stats.setCurrentBytesReceived(answer.getBytesReceived()); - if (stats.getCurrentBytesSent() > answer.getBytesSent()) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Received # of bytes that's less than the last one. Assuming something went wrong and persisting it. Reported: " + answer.getBytesSent() + " Stored: " + stats.getCurrentBytesSent()); - } - stats.setNetBytesSent(stats.getNetBytesSent() + stats.getCurrentBytesSent()); - } - stats.setCurrentBytesSent(answer.getBytesSent()); - _statsDao.update(stats.getId(), stats); - txn.commit(); - } catch(Exception e) { - txn.rollback(); - s_logger.warn("Unable to update user statistics for account: " + router.getAccountId() + " Rx: " + answer.getBytesReceived() + "; Tx: " + answer.getBytesSent()); - } finally { - txn.close(); - } - } - } - } - } - } - @Override @DB public boolean removeFromLoadBalancer(RemoveFromLoadBalancerRuleCmd cmd) throws InvalidParameterValueException { @@ -3504,7 +1879,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager return false; } - DomainRouterVO router = _routerDao.findBy(ipAddress.getAccountId(), ipAddress.getDataCenterId()); + DomainRouterVO router = _routerMgr.getRouter(ipAddress.getAccountId(), ipAddress.getDataCenterId()); if (router == null) { return false; } @@ -3605,7 +1980,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager return false; } - DomainRouterVO router = _routerDao.findBy(ipAddress.getAccountId(), ipAddress.getDataCenterId()); + DomainRouterVO router = _routerMgr.getRouter(ipAddress.getAccountId(), ipAddress.getDataCenterId()); List fwRules = _firewallRulesDao.listByLoadBalancerId(loadBalancerId); txn.start(); @@ -3763,7 +2138,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager } IPAddressVO ip = _ipAddressDao.findById(loadBalancer.getIpAddress()); - DomainRouterVO router = _routerDao.findBy(ip.getAccountId(), ip.getDataCenterId()); + DomainRouterVO router = _routerMgr.getRouter(ip.getAccountId(), ip.getDataCenterId()); updateFirewallRules(loadBalancer.getIpAddress(), allLbRules, router); return _loadBalancerDao.findById(loadBalancer.getId()); } diff --git a/server/src/com/cloud/network/router/DomainRouterManager.java b/server/src/com/cloud/network/router/DomainRouterManager.java index 12ccf966c0f..a2610adc559 100644 --- a/server/src/com/cloud/network/router/DomainRouterManager.java +++ b/server/src/com/cloud/network/router/DomainRouterManager.java @@ -20,16 +20,17 @@ package com.cloud.network.router; import java.util.List; import java.util.Map; +import com.cloud.api.commands.RebootRouterCmd; +import com.cloud.api.commands.StartRouterCmd; +import com.cloud.api.commands.StopRouterCmd; +import com.cloud.api.commands.UpgradeRouterCmd; import com.cloud.dc.DataCenterVO; import com.cloud.dc.HostPodVO; import com.cloud.dc.VlanVO; import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.network.IPAddressVO; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.PermissionDeniedException; import com.cloud.service.ServiceOfferingVO; -import com.cloud.user.AccountVO; import com.cloud.utils.component.Manager; import com.cloud.vm.DomainRouter; import com.cloud.vm.DomainRouterVO; @@ -42,18 +43,6 @@ import com.cloud.vm.UserVmVO; public interface DomainRouterManager extends Manager { public static final int DEFAULT_ROUTER_VM_RAMSIZE = 128; // 128M public static final boolean USE_POD_VLAN = false; - /** - * Assigns a router to the user. - * - * @param userId user id. - * @param dcId data center id. - * @param podId pod id. - * @param domain domain to use - * @return DomainRouter if one is assigned. - * @throws InsufficientCapacityException if assigning causes any capacity issues. - */ - DomainRouterVO assignRouter(long userId, long accountId, long dcId, long podId, String domain, String instance) throws InsufficientCapacityException; - /** * create the router. * @@ -96,18 +85,39 @@ public interface DomainRouterManager extends Manager { DomainRouterVO startRouter(long routerId, long eventId); + /** + * Starts domain router + * @param cmd the command specifying router's id + * @return DomainRouter object + * @throws InvalidParameterValueException, PermissionDeniedException + */ + DomainRouterVO startRouter(StartRouterCmd cmd) throws InvalidParameterValueException, PermissionDeniedException; + boolean releaseRouter(long routerId); boolean destroyRouter(long routerId); boolean stopRouter(long routerId, long eventId); + /** + * Stops domain router + * @param cmd the command specifying router's id + * @return router if successful, null otherwise + * @throws InvalidParameterValueException, PermissionDeniedException + */ + DomainRouterVO stopRouter(StopRouterCmd cmd) throws InvalidParameterValueException, PermissionDeniedException; + boolean getRouterStatistics(long vmId, Map netStats, Map diskStats); - DomainRouterVO findByPublicIpAddress(String publicIpAddress); - DomainRouterVO findByAccountAndDataCenter(long accountId, long dataCenterId); - boolean rebootRouter(long routerId, long eventId); + + /** + * Reboots domain router + * @param cmd the command specifying router's id + * @return success or failure + * @throws InvalidParameterValueException, PermissionDeniedException + */ + boolean rebootRouter(RebootRouterCmd cmd) throws InvalidParameterValueException, PermissionDeniedException; /** * @param hostId get all of the virtual machine routers on a host. * @return collection of VirtualMachineRouter @@ -120,37 +130,6 @@ public interface DomainRouterManager extends Manager { */ DomainRouterVO getRouter(long routerId); - /** - * Do all of the work of releasing public ip addresses. Note that - * if this method fails, there can be side effects. - * @param userId - * @param ipAddress - * @return true if it did; false if it didn't - */ - public boolean releasePublicIpAddress(long userId, String ipAddress); - - /** - * Find or create the source nat ip address a user uses within the - * data center. - * - * @param account account - * @param dc data center - * @param domain domain used for user's network. - * @param so service offering associated with this request - * @return public ip address. - */ - public String assignSourceNatIpAddress(AccountVO account, DataCenterVO dc, String domain, ServiceOfferingVO so, long startEventId, HypervisorType hyperType) throws ResourceAllocationException; - - /** - * Associates or disassociates a list of public IP address for a router. - * @param router router object to send the association to - * @param ipAddrList list of public IP addresses - * @param add true if associate, false if disassociate - * @param vmId - * @return - */ - boolean associateIP(DomainRouterVO router, List ipAddrList, boolean add, long vmId) throws ResourceAllocationException; - /** * Add a DHCP entry on the domr dhcp server * @param routerHostId - the host id of the domr @@ -178,14 +157,8 @@ public interface DomainRouterManager extends Manager { String createZoneVlan(DomainRouterVO router); - /** - * Lists IP addresses that belong to VirtualNetwork VLANs - * @param accountId - account that the IP address should belong to - * @param dcId - zone that the IP address should belong to - * @param sourceNat - (optional) true if the IP address should be a source NAT address - * @return - list of IP addresses - */ - List listPublicIpAddressesInVirtualNetwork(long accountId, long dcId, Boolean sourceNat); - - boolean upgradeRouter(long routerId, long serviceOfferingId); + boolean upgradeRouter(UpgradeRouterCmd cmd) throws InvalidParameterValueException, PermissionDeniedException; + + DomainRouterVO getRouter(long accountId, long zoneId); + DomainRouterVO getRouter(String publicIpAddress); } diff --git a/server/src/com/cloud/network/router/DomainRouterManagerImpl.java b/server/src/com/cloud/network/router/DomainRouterManagerImpl.java index 4f2f525c017..6a6a68a400b 100644 --- a/server/src/com/cloud/network/router/DomainRouterManagerImpl.java +++ b/server/src/com/cloud/network/router/DomainRouterManagerImpl.java @@ -50,11 +50,14 @@ import com.cloud.agent.api.StartRouterAnswer; import com.cloud.agent.api.StartRouterCommand; import com.cloud.agent.api.StopCommand; import com.cloud.agent.api.routing.DhcpEntryCommand; -import com.cloud.agent.api.routing.IPAssocCommand; import com.cloud.agent.api.routing.SavePasswordCommand; import com.cloud.agent.api.routing.VmDataCommand; import com.cloud.agent.manager.Commands; import com.cloud.alert.AlertManager; +import com.cloud.api.commands.RebootRouterCmd; +import com.cloud.api.commands.StartRouterCmd; +import com.cloud.api.commands.StopRouterCmd; +import com.cloud.api.commands.UpgradeRouterCmd; import com.cloud.async.AsyncJobExecutor; import com.cloud.async.AsyncJobManager; import com.cloud.async.AsyncJobVO; @@ -62,7 +65,6 @@ import com.cloud.async.BaseAsyncJobExecutor; import com.cloud.capacity.dao.CapacityDao; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; -import com.cloud.configuration.ResourceCount.ResourceType; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.configuration.dao.ResourceLimitDao; import com.cloud.dc.DataCenterVO; @@ -70,6 +72,7 @@ import com.cloud.dc.HostPodVO; import com.cloud.dc.Vlan; import com.cloud.dc.Vlan.VlanType; import com.cloud.dc.VlanVO; +import com.cloud.dc.dao.AccountVlanMapDao; import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.HostPodDao; import com.cloud.dc.dao.VlanDao; @@ -77,13 +80,14 @@ import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao; import com.cloud.event.EventState; import com.cloud.event.EventTypes; +import com.cloud.event.EventUtils; import com.cloud.event.EventVO; import com.cloud.event.dao.EventDao; import com.cloud.exception.AgentUnavailableException; import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.OperationTimedoutException; -import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.PermissionDeniedException; import com.cloud.exception.StorageUnavailableException; import com.cloud.ha.HighAvailabilityManager; import com.cloud.host.Host; @@ -92,15 +96,15 @@ import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.network.FirewallRuleVO; import com.cloud.network.IPAddressVO; -import com.cloud.network.LoadBalancerVO; -import com.cloud.network.NetworkConfiguration; import com.cloud.network.NetworkManager; -import com.cloud.network.SecurityGroupVMMapVO; import com.cloud.network.SshKeysDistriMonitor; import com.cloud.network.dao.FirewallRulesDao; import com.cloud.network.dao.IPAddressDao; import com.cloud.network.dao.LoadBalancerDao; +import com.cloud.network.dao.LoadBalancerVMMapDao; import com.cloud.network.dao.NetworkConfigurationDao; +import com.cloud.network.dao.NetworkRuleConfigDao; +import com.cloud.network.dao.SecurityGroupDao; import com.cloud.network.dao.SecurityGroupVMMapDao; import com.cloud.offering.NetworkOffering; import com.cloud.offerings.dao.NetworkOfferingDao; @@ -121,6 +125,7 @@ import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.user.AccountVO; import com.cloud.user.User; +import com.cloud.user.UserContext; import com.cloud.user.UserStatisticsVO; import com.cloud.user.dao.AccountDao; import com.cloud.user.dao.UserDao; @@ -131,9 +136,6 @@ import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.component.Inject; import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.DB; -import com.cloud.utils.db.JoinBuilder; -import com.cloud.utils.db.SearchBuilder; -import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.exception.ExecutionException; @@ -164,6 +166,7 @@ public class DomainRouterManagerImpl implements DomainRouterManager, VirtualMach @Inject FirewallRulesDao _rulesDao = null; @Inject SecurityGroupVMMapDao _securityGroupVMMapDao = null; @Inject LoadBalancerDao _loadBalancerDao = null; + @Inject LoadBalancerVMMapDao _loadBalancerVMMapDao = null; @Inject IPAddressDao _ipAddressDao = null; @Inject VMTemplateDao _templateDao = null; @Inject DiskTemplateDao _diskDao = null; @@ -189,7 +192,12 @@ public class DomainRouterManagerImpl implements DomainRouterManager, VirtualMach @Inject ConfigurationManager _configMgr; @Inject AsyncJobManager _asyncMgr; @Inject StoragePoolDao _storagePoolDao = null; + @Inject SecurityGroupDao _securityGroupDao = null; @Inject ServiceOfferingDao _serviceOfferingDao = null; + @Inject UserVmDao _userVmDao; + @Inject FirewallRulesDao _firewallRulesDao; + @Inject NetworkRuleConfigDao _networkRuleConfigDao; + @Inject AccountVlanMapDao _accountVlanMapDao; @Inject UserStatisticsDao _statsDao = null; @Inject NetworkOfferingDao _networkOfferingDao = null; @Inject NetworkConfigurationDao _networkProfileDao = null; @@ -213,6 +221,16 @@ public class DomainRouterManagerImpl implements DomainRouterManager, VirtualMach ScheduledExecutorService _executor; + @Override + public DomainRouterVO getRouter(long accountId, long dataCenterId) { + return _routerDao.findBy(accountId, dataCenterId); + } + + @Override + public DomainRouterVO getRouter(String publicIpAddress) { + return _routerDao.findByPublicIpAddress(publicIpAddress); + } + @Override public boolean destroy(DomainRouterVO router) { return destroyRouter(router.getId()); @@ -229,143 +247,6 @@ public class DomainRouterManagerImpl implements DomainRouterManager, VirtualMach return false; } - @Override @DB - public String assignSourceNatIpAddress(AccountVO account, final DataCenterVO dc, final String domain, final ServiceOfferingVO serviceOffering, long startEventId, HypervisorType hyperType) throws ResourceAllocationException { - if (serviceOffering.getGuestIpType() == NetworkOffering.GuestIpType.DirectDual || serviceOffering.getGuestIpType() == NetworkOffering.GuestIpType.DirectSingle) { - return null; - } - final long dcId = dc.getId(); - String sourceNat = null; - - final long accountId = account.getId(); - - Transaction txn = Transaction.currentTxn(); - try { - final EventVO event = new EventVO(); - event.setUserId(1L); // system user performed the action... - event.setAccountId(account.getId()); - event.setType(EventTypes.EVENT_NET_IP_ASSIGN); - - txn.start(); - - account = _accountDao.acquire(accountId); - if (account == null) { - s_logger.warn("Unable to lock account " + accountId); - return null; - } - if(s_logger.isDebugEnabled()) - s_logger.debug("lock account " + accountId + " is acquired"); - - boolean isAccountIP = false; - List addrs = listPublicIpAddressesInVirtualNetwork(account.getId(), dcId, true); - if (addrs.size() == 0) { - - // Check that the maximum number of public IPs for the given accountId will not be exceeded - if (_accountMgr.resourceLimitExceeded(account, ResourceType.public_ip)) { - ResourceAllocationException rae = new ResourceAllocationException("Maximum number of public IP addresses for account: " + account.getAccountName() + " has been exceeded."); - rae.setResourceType("ip"); - throw rae; - } - - //check for account specific IP pool. - addrs = listPublicIpAddressesInVirtualNetwork(account.getId(), dcId, null); - if (addrs.size() == 0){ - - if (s_logger.isDebugEnabled()) { - s_logger.debug("assigning a new ip address"); - } - Pair ipAndVlan = _vlanDao.assignIpAddress(dc.getId(), accountId, account.getDomainId(), VlanType.VirtualNetwork, true); - - if (ipAndVlan != null) { - sourceNat = ipAndVlan.first(); - - // Increment the number of public IPs for this accountId in the database - _accountMgr.incrementResourceCount(accountId, ResourceType.public_ip); - event.setParameters("address=" + sourceNat + "\nsourceNat=true\ndcId="+dcId); - event.setDescription("Acquired a public ip: " + sourceNat); - _eventDao.persist(event); - } - }else{ - isAccountIP = true; - sourceNat = addrs.get(0).getAddress(); - _ipAddressDao.setIpAsSourceNat(sourceNat); - s_logger.debug("assigning a new ip address " +sourceNat); - - // Increment the number of public IPs for this accountId in the database - _accountMgr.incrementResourceCount(accountId, ResourceType.public_ip); - event.setParameters("address=" + sourceNat + "\nsourceNat=true\ndcId="+dcId); - event.setDescription("Acquired a public ip: " + sourceNat); - _eventDao.persist(event); - } - - } else { - sourceNat = addrs.get(0).getAddress(); - } - - if (sourceNat == null) { - txn.rollback(); - event.setLevel(EventVO.LEVEL_ERROR); - event.setParameters("dcId=" + dcId); - event.setDescription("Failed to acquire a public ip."); - _eventDao.persist(event); - s_logger.error("Unable to get source nat ip address for account " + account.getId()); - return null; - } - - UserStatisticsVO stats = _userStatsDao.findBy(account.getId(), dcId); - if (stats == null) { - stats = new UserStatisticsVO(account.getId(), dcId); - _userStatsDao.persist(stats); - } - - txn.commit(); - - if (s_logger.isDebugEnabled()) { - s_logger.debug("Source Nat is " + sourceNat); - } - - DomainRouterVO router = null; - try { - router = createRouter(account.getId(), sourceNat, dcId, domain, serviceOffering, startEventId); - } catch (final Exception e) { - s_logger.error("Unable to create router for " + account.getAccountName(), e); - } - - if (router != null) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Router is " + router.getName()); - } - return sourceNat; - } - - s_logger.warn("releasing the source nat because router was not created: " + sourceNat); - txn.start(); - if(isAccountIP){ - _ipAddressDao.unassignIpAsSourceNat(sourceNat); - }else{ - _ipAddressDao.unassignIpAddress(sourceNat); - } - - _accountMgr.decrementResourceCount(accountId, ResourceType.public_ip); - EventVO event2 = new EventVO(); - event2.setUserId(1L); - event2.setAccountId(account.getId()); - event2.setType(EventTypes.EVENT_NET_IP_RELEASE); - event2.setParameters("address=" + sourceNat + "\nsourceNat=true"); - event2.setDescription("released source nat ip " + sourceNat + " since router could not be started"); - _eventDao.persist(event2); - txn.commit(); - return null; - } finally { - if (account != null) { - if(s_logger.isDebugEnabled()) - s_logger.debug("Releasing lock account " + accountId); - - _accountDao.release(accountId); - } - } - } - @Override @DB public DomainRouterVO createDhcpServerForDirectlyAttachedGuests(long userId, long accountId, DataCenterVO dc, HostPodVO pod, Long candidateHost, VlanVO guestVlan) throws ConcurrentOperationException{ @@ -502,11 +383,6 @@ public class DomainRouterManagerImpl implements DomainRouterManager, VirtualMach } } - @Override - public DomainRouterVO assignRouter(final long userId, final long accountId, final long dataCenterId, final long podId, final String domain, final String instance) throws InsufficientCapacityException { - return null; - } - @Override public boolean releaseRouter(final long routerId) { return destroyRouter(routerId); @@ -756,8 +632,42 @@ public class DomainRouterManagerImpl implements DomainRouterManager, VirtualMach @Override @DB - public boolean upgradeRouter(long routerId, long serviceOfferingId) { - DomainRouterVO router = _routerDao.acquire(routerId); + public boolean upgradeRouter(UpgradeRouterCmd cmd) throws InvalidParameterValueException, PermissionDeniedException { + Long routerId = cmd.getId(); + Long serviceOfferingId = cmd.getServiceOfferingId(); + Account account = (Account)UserContext.current().getAccountObject(); + + DomainRouterVO router = _routerDao.findById(routerId); + if (router == null) { + throw new InvalidParameterValueException("Unable to find router with id " + routerId); + } + + if ((account != null) && !_domainDao.isChildDomain(account.getDomainId(), router.getDomainId())) { + throw new PermissionDeniedException("Invalid domain router id (" + routerId + ") given, unable to stop router."); + } + + if (router.getServiceOfferingId() == serviceOfferingId) { + s_logger.debug("Router: " + routerId + "already has service offering: " + serviceOfferingId); + return true; + } + + ServiceOfferingVO newServiceOffering = _serviceOfferingDao.findById(serviceOfferingId); + if (newServiceOffering == null) { + throw new InvalidParameterValueException("Unable to find service offering with id " + serviceOfferingId); + } + + ServiceOfferingVO currentServiceOffering = _serviceOfferingDao.findById(router.getServiceOfferingId()); + + if (!currentServiceOffering.getGuestIpType().equals(newServiceOffering.getGuestIpType())) { + throw new InvalidParameterValueException("Can't upgrade, due to new newtowrk type: " + newServiceOffering.getGuestIpType() + " is different from " + + "curruent network type: " + currentServiceOffering.getGuestIpType()); + } + if (currentServiceOffering.getUseLocalStorage() != newServiceOffering.getUseLocalStorage()) { + throw new InvalidParameterValueException("Can't upgrade, due to new local storage status : " + newServiceOffering.getGuestIpType() + " is different from " + + "curruent local storage status: " + currentServiceOffering.getUseLocalStorage()); + } + + router = _routerDao.acquire(routerId); router.setServiceOfferingId(serviceOfferingId); return _routerDao.update(routerId, router); @@ -811,6 +721,24 @@ public class DomainRouterManagerImpl implements DomainRouterManager, VirtualMach return null; } } + + @Override + public DomainRouterVO startRouter(StartRouterCmd cmd) throws InvalidParameterValueException, PermissionDeniedException{ + Long routerId = cmd.getId(); + Account account = (Account)UserContext.current().getAccountObject(); + + //verify parameters + DomainRouterVO router = _routerDao.findById(routerId); + if (router == null) { + throw new PermissionDeniedException ("Unable to start router with id " + routerId + ". Permisssion denied"); + } + if ((account != null) && !_domainDao.isChildDomain(account.getDomainId(), router.getDomainId())) { + throw new PermissionDeniedException ("Unable to start router with id " + routerId + ". Permission denied."); + } + + long eventId = EventUtils.saveScheduledEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM, EventTypes.EVENT_ROUTER_START, "starting Router with Id: "+routerId); + return startRouter(routerId, eventId); + } @Override @DB public DomainRouterVO start(long routerId, long startEventId) throws StorageUnavailableException, ConcurrentOperationException { @@ -1130,13 +1058,13 @@ public class DomainRouterManagerImpl implements DomainRouterManager, VirtualMach if (router.getRole() == Role.DHCP_FIREWALL_LB_PASSWD_USERDATA) { //source NAT address is stored in /proc/cmdline of the domR and gets //reassigned upon powerup. Source NAT rule gets configured in StartRouter command - final List ipAddrs = listPublicIpAddressesInVirtualNetwork(router.getAccountId(), router.getDataCenterId(), null); + final List ipAddrs = _networkMgr.listPublicIpAddressesInVirtualNetwork(router.getAccountId(), router.getDataCenterId(), null); final List ipAddrList = new ArrayList(); for (final IPAddressVO ipVO : ipAddrs) { ipAddrList.add(ipVO.getAddress()); } if (!ipAddrList.isEmpty()) { - final boolean success = associateIP(router, ipAddrList, true, 0); + final boolean success = _networkMgr.associateIP(router, ipAddrList, true, 0); if (!success) { return false; } @@ -1245,6 +1173,32 @@ public class DomainRouterManagerImpl implements DomainRouterManager, VirtualMach return stop(_routerDao.findById(routerId), eventId); } + + + @Override + public DomainRouterVO stopRouter(StopRouterCmd cmd) throws InvalidParameterValueException, PermissionDeniedException{ + Long routerId = cmd.getId(); + Account account = (Account)UserContext.current().getAccountObject(); + + // verify parameters + DomainRouterVO router = _routerDao.findById(routerId); + if (router == null) { + throw new PermissionDeniedException ("Unable to stop router with id " + routerId + ". Permission denied."); + } + + if ((account != null) && !_domainDao.isChildDomain(account.getDomainId(), router.getDomainId())) { + throw new PermissionDeniedException ("Unable to stop router with id " + routerId + ". Permission denied"); + } + + long eventId = EventUtils.saveScheduledEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM, EventTypes.EVENT_ROUTER_STOP, "stopping Router with Id: "+routerId); + + boolean success = stopRouter(routerId, eventId); + + if (success) { + return _routerDao.findById(routerId); + } + return null; + } @DB public void processStopOrRebootAnswer(final DomainRouterVO router, Answer answer) { @@ -1368,390 +1322,24 @@ public class DomainRouterManagerImpl implements DomainRouterManager, VirtualMach return startRouter(routerId, 0) != null; } } - - @Override - public boolean associateIP(final DomainRouterVO router, final List ipAddrList, final boolean add, long vmId) { - Commands cmds = new Commands(OnError.Continue); - int i=0; - boolean sourceNat = false; - for (final String ipAddress: ipAddrList) { - if (ipAddress.equalsIgnoreCase(router.getPublicIpAddress())) - sourceNat=true; - - IPAddressVO ip = _ipAddressDao.findById(ipAddress); - VlanVO vlan = _vlanDao.findById(ip.getVlanDbId()); - String vlanId = vlan.getVlanId(); - String vlanGateway = vlan.getVlanGateway(); - String vlanNetmask = vlan.getVlanNetmask(); - boolean firstIP = (!sourceNat && (_ipAddressDao.countIPs(vlan.getDataCenterId(), vlan.getVlanId(), vlan.getVlanGateway(), vlan.getVlanNetmask(), true) == 1)); - - String vifMacAddress = null; - if (firstIP) { - String[] macAddresses = _dcDao.getNextAvailableMacAddressPair(ip.getDataCenterId()); - vifMacAddress = macAddresses[1]; - } - - String vmGuestAddress = null; - if(vmId!=0){ - vmGuestAddress = _vmDao.findById(vmId).getGuestIpAddress(); - } - - cmds.addCommand(new IPAssocCommand(router.getInstanceName(), router.getPrivateIpAddress(), ipAddress, add, firstIP, sourceNat, vlanId, vlanGateway, vlanNetmask, vifMacAddress, vmGuestAddress)); - - sourceNat = false; - } - - Answer[] answers = null; - try { - answers = _agentMgr.send(router.getHostId(), cmds); - } catch (final AgentUnavailableException e) { - s_logger.warn("Agent unavailable", e); - return false; - } catch (final OperationTimedoutException e) { - s_logger.warn("Timed Out", e); - return false; - } - - if (answers == null) { - return false; - } - - if (answers.length != ipAddrList.size()) { - return false; - } - - for (int i1=0; i1 < answers.length; i1++) { - Answer ans = answers[i1]; - return ans.getResult(); - } - - return true; - } - - @Override @DB - public boolean releasePublicIpAddress(long userId, final String ipAddress) { - IPAddressVO ip = null; - try { - ip = _ipAddressDao.acquire(ipAddress); - - if (ip == null) { - s_logger.warn("Unable to find allocated ip: " + ipAddress); - return false; - } - - if(s_logger.isDebugEnabled()) - s_logger.debug("lock on ip " + ipAddress + " is acquired"); - - if (ip.getAllocated() == null) { - s_logger.warn("ip: " + ipAddress + " is already released"); - return false; - } - - if (s_logger.isDebugEnabled()) { - s_logger.debug("Releasing ip " + ipAddress + "; sourceNat = " + ip.isSourceNat()); - } - - final List ipAddrs = new ArrayList(); - ipAddrs.add(ip.getAddress()); - final List firewallRules = _rulesDao.listIPForwardingForUpdate(ipAddress); - - if (s_logger.isDebugEnabled()) { - s_logger.debug("Found firewall rules: " + firewallRules.size()); - } - - for (final FirewallRuleVO fw: firewallRules) { - fw.setEnabled(false); - } - - DomainRouterVO router = null; - if (ip.isSourceNat()) { - router = _routerDao.findByPublicIpAddress(ipAddress); - if (router != null) { - if (router.getPublicIpAddress() != null) { - return false; - } - } - } else { - router = _routerDao.findBy(ip.getAccountId(), ip.getDataCenterId()); - } - - // Now send the updates down to the domR (note: we still hold locks on address and firewall) - _networkMgr.updateFirewallRules(ipAddress, firewallRules, router); - - for (final FirewallRuleVO rule: firewallRules) { - _rulesDao.remove(rule.getId()); - - // Save and create the event - String ruleName = (rule.isForwarding() ? "ip forwarding" : "load balancer"); - String description = "deleted " + ruleName + " rule [" + rule.getPublicIpAddress() + ":" + rule.getPublicPort() - + "]->[" + rule.getPrivateIpAddress() + ":" + rule.getPrivatePort() + "]" + " " - + rule.getProtocol(); - - // save off an event for removing the network rule - EventVO event = new EventVO(); - event.setUserId(userId); - event.setAccountId(ip.getAccountId()); - event.setType(EventTypes.EVENT_NET_RULE_DELETE); - event.setDescription(description); - event.setLevel(EventVO.LEVEL_INFO); - _eventDao.persist(event); - } - - // We've deleted all the rules for the given public IP, so remove any security group mappings for that public IP - List securityGroupMappings = _securityGroupVMMapDao.listByIp(ipAddress); - for (SecurityGroupVMMapVO securityGroupMapping : securityGroupMappings) { - _securityGroupVMMapDao.remove(securityGroupMapping.getId()); - - // save off an event for removing the security group - EventVO event = new EventVO(); - event.setUserId(userId); - event.setAccountId(ip.getAccountId()); - event.setType(EventTypes.EVENT_PORT_FORWARDING_SERVICE_REMOVE); - String params = "sgId="+securityGroupMapping.getId()+"\nvmId="+securityGroupMapping.getInstanceId(); - event.setParameters(params); - event.setDescription("Successfully removed security group " + Long.valueOf(securityGroupMapping.getSecurityGroupId()).toString() + " from virtual machine " + Long.valueOf(securityGroupMapping.getInstanceId()).toString()); - event.setLevel(EventVO.LEVEL_INFO); - _eventDao.persist(event); - } - - List loadBalancers = _loadBalancerDao.listByIpAddress(ipAddress); - for (LoadBalancerVO loadBalancer : loadBalancers) { - _loadBalancerDao.remove(loadBalancer.getId()); - - // save off an event for removing the load balancer - EventVO event = new EventVO(); - event.setUserId(userId); - event.setAccountId(ip.getAccountId()); - event.setType(EventTypes.EVENT_LOAD_BALANCER_DELETE); - String params = "id="+loadBalancer.getId(); - event.setParameters(params); - event.setDescription("Successfully deleted load balancer " + loadBalancer.getId().toString()); - event.setLevel(EventVO.LEVEL_INFO); - _eventDao.persist(event); - } - - if ((router != null) && (router.getState() == State.Running)) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Disassociate ip " + router.getName()); - } - - if (associateIP(router, ipAddrs, false, 0)) { - _ipAddressDao.unassignIpAddress(ipAddress); - } else { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Unable to dissociate IP : " + ipAddress + " due to failing to dissociate with router: " + router.getName()); - } - - final EventVO event = new EventVO(); - event.setUserId(userId); - event.setAccountId(ip.getAccountId()); - event.setType(EventTypes.EVENT_NET_IP_RELEASE); - event.setLevel(EventVO.LEVEL_ERROR); - event.setParameters("address=" + ipAddress + "\nsourceNat="+ip.isSourceNat()); - event.setDescription("failed to released a public ip: " + ipAddress + " due to failure to disassociate with router " + router.getName()); - _eventDao.persist(event); - - return false; - } - } else { - _ipAddressDao.unassignIpAddress(ipAddress); - } - s_logger.debug("released a public ip: " + ipAddress); - final EventVO event = new EventVO(); - event.setUserId(userId); - event.setAccountId(ip.getAccountId()); - event.setType(EventTypes.EVENT_NET_IP_RELEASE); - event.setParameters("address=" + ipAddress + "\nsourceNat="+ip.isSourceNat()); - event.setDescription("released a public ip: " + ipAddress); - _eventDao.persist(event); - - return true; - } catch (final Throwable e) { - s_logger.warn("ManagementServer error", e); - return false; - } finally { - if(ip != null) { - if(s_logger.isDebugEnabled()) - s_logger.debug("Releasing lock on ip " + ipAddress); - _ipAddressDao.release(ipAddress); - } - } - } - /** - * Start a router for this network configuration. - * @param config - * @param account - */ - public void start(NetworkConfiguration config, NetworkOffering offering, Account account) { - // DomainRouterVO vo = new DomainRouterVO(f)); -// if (s_logger.isDebugEnabled()) { -// s_logger.debug("Creating a router for account=" + accountId + "; publicIpAddress=" + publicIpAddress + "; dc=" + dataCenterId + "domain=" + domain); -// } -// -// final AccountVO account = _accountDao.acquire(accountId); -// if (account == null) { -// throw new ConcurrentOperationException("Unable to acquire account " + accountId); -// } -// -// if(s_logger.isDebugEnabled()) -// s_logger.debug("lock on account " + accountId + " for createRouter is acquired"); -// -// final Transaction txn = Transaction.currentTxn(); -// DomainRouterVO router = null; -// boolean success = false; -// try { -// router = _routerDao.findBy(accountId, dataCenterId); -// if (router != null && router.getState() != State.Creating) { -// if (s_logger.isDebugEnabled()) { -// s_logger.debug("Router " + router.toString() + " found for account " + accountId + " in data center " + dataCenterId); -// } -// success = true; -// return router; -// } -// EventVO event = new EventVO(); -// event.setUserId(1L); -// event.setAccountId(accountId); -// event.setType(EventTypes.EVENT_ROUTER_CREATE); -// event.setState(EventState.Started); -// event.setStartId(startEventId); -// event.setDescription("Creating Router for account with Id: "+accountId); -// event = _eventDao.persist(event); -// -// final DataCenterVO dc = _dcDao.findById(dataCenterId); -// final VMTemplateVO template = _templateDao.findRoutingTemplate(); -// -// String[] macAddresses = getMacAddressPair(dataCenterId); -// String privateMacAddress = macAddresses[0]; -// String publicMacAddress = macAddresses[1]; -// -// final long id = _routerDao.getNextInSequence(Long.class, "id"); -// -// if (domain == null) { -// domain = "v" + Long.toHexString(accountId) + "." + _domain; -// } -// -// final String name = VirtualMachineName.getRouterName(id, _instance).intern(); -// long routerMacAddress = NetUtils.mac2Long(dc.getRouterMacAddress()) | ((dc.getId() & 0xff) << 32); -// -// //set the guestNetworkCidr from the dc obj -// String guestNetworkCidr = dc.getGuestNetworkCidr(); -// String[] cidrTuple = guestNetworkCidr.split("\\/"); -// String guestIpAddress = NetUtils.getIpRangeStartIpFromCidr(cidrTuple[0], Long.parseLong(cidrTuple[1])); -// String guestNetmask = NetUtils.getCidrNetmask(Long.parseLong(cidrTuple[1])); -// -//// String path = null; -//// final int numVolumes = offering.isMirroredVolumes()?2:1; -//// long routerId = 0; -// -// // Find the VLAN ID, VLAN gateway, and VLAN netmask for publicIpAddress -// IPAddressVO ipVO = _ipAddressDao.findById(publicIpAddress); -// VlanVO vlan = _vlanDao.findById(ipVO.getVlanDbId()); -// String vlanId = vlan.getVlanId(); -// String vlanGateway = vlan.getVlanGateway(); -// String vlanNetmask = vlan.getVlanNetmask(); -// -// Pair pod = null; -// Set avoids = new HashSet(); -// boolean found = false; -// while ((pod = _agentMgr.findPod(template, offering, dc, accountId, avoids)) != null) { -// -// if (s_logger.isDebugEnabled()) { -// s_logger.debug("Attempting to create in pod " + pod.first().getName()); -// } -// -// router = new DomainRouterVO(id, -// _offering.getId(), -// name, -// privateMacAddress, -// null, -// null, -// _routerTemplateId, -// template.getGuestOSId(), -// NetUtils.long2Mac(routerMacAddress), -// guestIpAddress, -// guestNetmask, -// accountId, -// account.getDomainId(), -// publicMacAddress, -// publicIpAddress, -// vlanNetmask, -// vlan.getId(), -// vlanId, -// pod.first().getId(), -// dataCenterId, -// _routerRamSize, -// vlanGateway, -// domain, -// dc.getDns1(), -// dc.getDns2()); -// router.setMirroredVols(offering.isMirrored()); -// -// router.setLastHostId(pod.second()); -// router = _routerDao.persist(router); -// -// List vols = _storageMgr.create(account, router, template, dc, pod.first(), _offering, null,0); -// if(vols != null) { -// found = true; -// break; -// } -// -// _routerDao.expunge(router.getId()); -// if (s_logger.isDebugEnabled()) { -// s_logger.debug("Unable to find storage host or pool in pod " + pod.first().getName() + " (id:" + pod.first().getId() + "), checking other pods"); -// } -// avoids.add(pod.first().getId()); -// } -// -// if (!found) { -// event.setDescription("failed to create Domain Router : " + name); -// event.setLevel(EventVO.LEVEL_ERROR); -// _eventDao.persist(event); -// throw new ExecutionException("Unable to create DomainRouter"); -// } -// _routerDao.updateIf(router, Event.OperationSucceeded, null); -// -// s_logger.debug("Router created: id=" + router.getId() + "; name=" + router.getName()); -// -// event = new EventVO(); -// event.setUserId(1L); // system user performed the action -// event.setAccountId(accountId); -// event.setType(EventTypes.EVENT_ROUTER_CREATE); -// event.setStartId(startEventId); -// event.setDescription("successfully created Domain Router : " + router.getName() + " with ip : " + publicIpAddress); -// _eventDao.persist(event); -// success = true; -// return router; -// } catch (final Throwable th) { -// if (th instanceof ExecutionException) { -// s_logger.error("Error while starting router due to " + th.getMessage()); -// } else { -// s_logger.error("Unable to create router", th); -// } -// txn.rollback(); -// -// if (router != null && router.getState() == State.Creating) { -// _routerDao.expunge(router.getId()); -// } -// return null; -// } finally { -// if (account != null) { -// if(s_logger.isDebugEnabled()) -// s_logger.debug("Releasing lock on account " + account.getId() + " for createRouter"); -// _accountDao.release(account.getId()); -// } -// if(!success){ -// EventVO event = new EventVO(); -// event.setUserId(1L); // system user performed the action -// event.setAccountId(accountId); -// event.setType(EventTypes.EVENT_ROUTER_CREATE); -// event.setStartId(startEventId); -// event.setLevel(EventVO.LEVEL_ERROR); -// event.setDescription("Failed to create router for account " + accountId + " in data center " + dataCenterId); -// _eventDao.persist(event); -// } -// } + @Override + public boolean rebootRouter(RebootRouterCmd cmd) throws InvalidParameterValueException, PermissionDeniedException{ + Long routerId = cmd.getId(); + Account account = (Account)UserContext.current().getAccountObject(); + + //verify parameters + DomainRouterVO router = _routerDao.findById(routerId); + if (router == null) { + throw new PermissionDeniedException("Unable to reboot domain router with id " + routerId + ". Permission denied"); + } + if ((account != null) && !_domainDao.isChildDomain(account.getDomainId(), router.getDomainId())) { + throw new PermissionDeniedException("Unable to reboot domain router with id " + routerId + ". Permission denied"); + } + long eventId = EventUtils.saveScheduledEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM, EventTypes.EVENT_ROUTER_REBOOT, "rebooting Router with Id: "+routerId); + + return rebootRouter(routerId, eventId); } @Override @@ -1826,7 +1414,7 @@ public class DomainRouterManagerImpl implements DomainRouterManager, VirtualMach _routerTemplateId = _template.getId(); } - s_logger.info("Network Manager is configured."); + s_logger.info("DomainRouterManager is configured."); return true; } @@ -1942,17 +1530,6 @@ public class DomainRouterManagerImpl implements DomainRouterManager, VirtualMach return stopped; } - - @Override - public DomainRouterVO findByPublicIpAddress(String publicIpAddress) { - return _routerDao.findByPublicIpAddress(publicIpAddress); - } - - @Override - public DomainRouterVO findByAccountAndDataCenter(long accountId, long dataCenterId) { - return _routerDao.findBy(accountId, dataCenterId); - } - @Override @DB @@ -2297,30 +1874,6 @@ public class DomainRouterManagerImpl implements DomainRouterManager, VirtualMach return zoneVlan; } - @Override - public List listPublicIpAddressesInVirtualNetwork(long accountId, long dcId, Boolean sourceNat) { - SearchBuilder ipAddressSB = _ipAddressDao.createSearchBuilder(); - ipAddressSB.and("accountId", ipAddressSB.entity().getAccountId(), SearchCriteria.Op.EQ); - ipAddressSB.and("dataCenterId", ipAddressSB.entity().getDataCenterId(), SearchCriteria.Op.EQ); - if (sourceNat != null) { - ipAddressSB.and("sourceNat", ipAddressSB.entity().isSourceNat(), SearchCriteria.Op.EQ); - } - - SearchBuilder virtualNetworkVlanSB = _vlanDao.createSearchBuilder(); - virtualNetworkVlanSB.and("vlanType", virtualNetworkVlanSB.entity().getVlanType(), SearchCriteria.Op.EQ); - ipAddressSB.join("virtualNetworkVlanSB", virtualNetworkVlanSB, ipAddressSB.entity().getVlanDbId(), virtualNetworkVlanSB.entity().getId(), JoinBuilder.JoinType.INNER); - - SearchCriteria ipAddressSC = ipAddressSB.create(); - ipAddressSC.setParameters("accountId", accountId); - ipAddressSC.setParameters("dataCenterId", dcId); - if (sourceNat != null) { - ipAddressSC.setParameters("sourceNat", sourceNat); - } - ipAddressSC.setJoinParameters("virtualNetworkVlanSB", "vlanType", VlanType.VirtualNetwork); - - return _ipAddressDao.search(ipAddressSC, null); - } - protected class NetworkUsageTask implements Runnable { public NetworkUsageTask() { @@ -2377,4 +1930,11 @@ public class DomainRouterManagerImpl implements DomainRouterManager, VirtualMach } } + + public static boolean isAdmin(short accountType) { + return ((accountType == Account.ACCOUNT_TYPE_ADMIN) || + (accountType == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) || + (accountType == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN)); + } + }