You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/08/22 00:39:55 UTC

[6/6] Fixed line endings in VirtualNetworkApplianceManagerImpl

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14dd3f07/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 082c630..2e1ec2a 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1,3389 +1,3389 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-// 
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package com.cloud.network.router;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import javax.ejb.Local;
-import javax.naming.ConfigurationException;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.agent.AgentManager;
-import com.cloud.agent.AgentManager.OnError;
-import com.cloud.agent.Listener;
-import com.cloud.agent.api.AgentControlAnswer;
-import com.cloud.agent.api.AgentControlCommand;
-import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.BumpUpPriorityCommand;
-import com.cloud.agent.api.CheckRouterAnswer;
-import com.cloud.agent.api.CheckRouterCommand;
-import com.cloud.agent.api.CheckS2SVpnConnectionsAnswer;
-import com.cloud.agent.api.CheckS2SVpnConnectionsCommand;
-import com.cloud.agent.api.Command;
-import com.cloud.agent.api.GetDomRVersionAnswer;
-import com.cloud.agent.api.GetDomRVersionCmd;
-import com.cloud.agent.api.ModifySshKeysCommand;
-import com.cloud.agent.api.NetworkUsageAnswer;
-import com.cloud.agent.api.NetworkUsageCommand;
-import com.cloud.agent.api.StartupCommand;
-import com.cloud.agent.api.StopAnswer;
-import com.cloud.agent.api.check.CheckSshAnswer;
-import com.cloud.agent.api.check.CheckSshCommand;
-import com.cloud.agent.api.routing.DhcpEntryCommand;
-import com.cloud.agent.api.routing.IpAssocCommand;
-import com.cloud.agent.api.routing.LoadBalancerConfigCommand;
-import com.cloud.agent.api.routing.NetworkElementCommand;
-import com.cloud.agent.api.routing.RemoteAccessVpnCfgCommand;
-import com.cloud.agent.api.routing.SavePasswordCommand;
-import com.cloud.agent.api.routing.SetFirewallRulesCommand;
-import com.cloud.agent.api.routing.SetPortForwardingRulesCommand;
-import com.cloud.agent.api.routing.SetPortForwardingRulesVpcCommand;
-import com.cloud.agent.api.routing.SetStaticNatRulesCommand;
-import com.cloud.agent.api.routing.VmDataCommand;
-import com.cloud.agent.api.routing.VpnUsersCfgCommand;
-import com.cloud.agent.api.to.FirewallRuleTO;
-import com.cloud.agent.api.to.IpAddressTO;
-import com.cloud.agent.api.to.LoadBalancerTO;
-import com.cloud.agent.api.to.NicTO;
-import com.cloud.agent.api.to.PortForwardingRuleTO;
-import com.cloud.agent.api.to.StaticNatRuleTO;
-import com.cloud.agent.api.to.VirtualMachineTO;
-import com.cloud.agent.manager.Commands;
-import com.cloud.alert.AlertManager;
-import com.cloud.api.commands.UpgradeRouterCmd;
-import com.cloud.cluster.ManagementServerHostVO;
-import com.cloud.cluster.ManagementServerNode;
-import com.cloud.cluster.dao.ManagementServerHostDao;
-import com.cloud.configuration.Config;
-import com.cloud.configuration.ConfigurationManager;
-import com.cloud.configuration.ZoneConfig;
-import com.cloud.configuration.dao.ConfigurationDao;
-import com.cloud.dc.ClusterVO;
-import com.cloud.dc.DataCenter;
-import com.cloud.dc.DataCenter.NetworkType;
-import com.cloud.dc.DataCenterVO;
-import com.cloud.dc.HostPodVO;
-import com.cloud.dc.Pod;
-import com.cloud.dc.dao.ClusterDao;
-import com.cloud.dc.dao.DataCenterDao;
-import com.cloud.dc.dao.HostPodDao;
-import com.cloud.dc.dao.VlanDao;
-import com.cloud.deploy.DataCenterDeployment;
-import com.cloud.deploy.DeployDestination;
-import com.cloud.deploy.DeploymentPlan;
-import com.cloud.deploy.DeploymentPlanner.ExcludeList;
-import com.cloud.event.ActionEvent;
-import com.cloud.event.EventTypes;
-import com.cloud.exception.AgentUnavailableException;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.ConnectionException;
-import com.cloud.exception.InsufficientAddressCapacityException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.InsufficientServerCapacityException;
-import com.cloud.exception.InsufficientVirtualNetworkCapcityException;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.OperationTimedoutException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.exception.StorageUnavailableException;
-import com.cloud.host.HostVO;
-import com.cloud.host.Status;
-import com.cloud.host.dao.HostDao;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.network.IPAddressVO;
-import com.cloud.network.IpAddress;
-import com.cloud.network.LoadBalancerVO;
-import com.cloud.network.Network;
-import com.cloud.network.Network.GuestType;
-import com.cloud.network.Network.Provider;
-import com.cloud.network.Network.Service;
-import com.cloud.network.NetworkManager;
-import com.cloud.network.NetworkVO;
-import com.cloud.network.Networks.BroadcastDomainType;
-import com.cloud.network.Networks.IsolationType;
-import com.cloud.network.Networks.TrafficType;
-import com.cloud.network.PhysicalNetworkServiceProvider;
-import com.cloud.network.PublicIpAddress;
-import com.cloud.network.RemoteAccessVpn;
-import com.cloud.network.Site2SiteCustomerGateway;
-import com.cloud.network.Site2SiteVpnConnection;
-import com.cloud.network.Site2SiteVpnConnectionVO;
-import com.cloud.network.SshKeysDistriMonitor;
-import com.cloud.network.VirtualNetworkApplianceService;
-import com.cloud.network.VirtualRouterProvider;
-import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType;
-import com.cloud.network.VpnUser;
-import com.cloud.network.VpnUserVO;
-import com.cloud.network.addr.PublicIp;
-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.NetworkDao;
-import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
-import com.cloud.network.dao.RemoteAccessVpnDao;
-import com.cloud.network.dao.Site2SiteCustomerGatewayDao;
-import com.cloud.network.dao.Site2SiteVpnConnectionDao;
-import com.cloud.network.dao.Site2SiteVpnGatewayDao;
-import com.cloud.network.dao.VirtualRouterProviderDao;
-import com.cloud.network.dao.VpnUserDao;
-import com.cloud.network.lb.LoadBalancingRule;
-import com.cloud.network.lb.LoadBalancingRule.LbDestination;
-import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy;
-import com.cloud.network.lb.LoadBalancingRulesManager;
-import com.cloud.network.router.VirtualRouter.RedundantState;
-import com.cloud.network.router.VirtualRouter.Role;
-import com.cloud.network.rules.FirewallRule;
-import com.cloud.network.rules.FirewallRule.Purpose;
-import com.cloud.network.rules.PortForwardingRule;
-import com.cloud.network.rules.RulesManager;
-import com.cloud.network.rules.StaticNat;
-import com.cloud.network.rules.StaticNatImpl;
-import com.cloud.network.rules.StaticNatRule;
-import com.cloud.network.rules.dao.PortForwardingRulesDao;
-import com.cloud.network.vpn.Site2SiteVpnManager;
-import com.cloud.offering.ServiceOffering;
-import com.cloud.offerings.NetworkOfferingVO;
-import com.cloud.offerings.dao.NetworkOfferingDao;
-import com.cloud.resource.ResourceManager;
-import com.cloud.service.ServiceOfferingVO;
-import com.cloud.service.dao.ServiceOfferingDao;
-import com.cloud.storage.GuestOSVO;
-import com.cloud.storage.VMTemplateVO;
-import com.cloud.storage.Volume.Type;
-import com.cloud.storage.VolumeVO;
-import com.cloud.storage.dao.GuestOSDao;
-import com.cloud.storage.dao.VMTemplateDao;
-import com.cloud.storage.dao.VolumeDao;
-import com.cloud.user.Account;
-import com.cloud.user.AccountManager;
-import com.cloud.user.User;
-import com.cloud.user.UserContext;
-import com.cloud.user.UserStatisticsVO;
-import com.cloud.user.UserStatsLogVO;
-import com.cloud.user.UserVO;
-import com.cloud.user.dao.UserDao;
-import com.cloud.user.dao.UserStatisticsDao;
-import com.cloud.user.dao.UserStatsLogDao;
-import com.cloud.uservm.UserVm;
-import com.cloud.utils.NumbersUtil;
-import com.cloud.utils.Pair;
-import com.cloud.utils.PasswordGenerator;
-import com.cloud.utils.StringUtils;
-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.Filter;
-import com.cloud.utils.db.GlobalLock;
-import com.cloud.utils.db.Transaction;
-import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.utils.net.MacAddress;
-import com.cloud.utils.net.NetUtils;
-import com.cloud.vm.DomainRouterVO;
-import com.cloud.vm.Nic;
-import com.cloud.vm.NicProfile;
-import com.cloud.vm.NicVO;
-import com.cloud.vm.ReservationContext;
-import com.cloud.vm.ReservationContextImpl;
-import com.cloud.vm.UserVmVO;
-import com.cloud.vm.VMInstanceVO;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VirtualMachine.State;
-import com.cloud.vm.VirtualMachineGuru;
-import com.cloud.vm.VirtualMachineManager;
-import com.cloud.vm.VirtualMachineName;
-import com.cloud.vm.VirtualMachineProfile;
-import com.cloud.vm.VirtualMachineProfile.Param;
-import com.cloud.vm.dao.DomainRouterDao;
-import com.cloud.vm.dao.NicDao;
-import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
-
-/**
- * VirtualNetworkApplianceManagerImpl manages the different types of virtual network appliances available in the Cloud Stack.
- */
-@Local(value = { VirtualNetworkApplianceManager.class, VirtualNetworkApplianceService.class })
-public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplianceManager, VirtualNetworkApplianceService, 
-                            VirtualMachineGuru<DomainRouterVO>, Listener {
-    private static final Logger s_logger = Logger.getLogger(VirtualNetworkApplianceManagerImpl.class);
-
-    String _name;
-    @Inject
-    DataCenterDao _dcDao = null;
-    @Inject
-    VlanDao _vlanDao = null;
-    @Inject
-    FirewallRulesDao _rulesDao = null;
-    @Inject
-    LoadBalancerDao _loadBalancerDao = null;
-    @Inject
-    LoadBalancerVMMapDao _loadBalancerVMMapDao = null;
-    @Inject
-    IPAddressDao _ipAddressDao = null;
-    @Inject
-    VMTemplateDao _templateDao = null;
-    @Inject
-    DomainRouterDao _routerDao = null;
-    @Inject
-    UserDao _userDao = null;
-    @Inject
-    UserStatisticsDao _userStatsDao = null;
-    @Inject
-    HostDao _hostDao = null;
-    @Inject
-    ConfigurationDao _configDao;
-    @Inject
-    HostPodDao _podDao = null;
-    @Inject
-    UserStatsLogDao _userStatsLogDao = null;
-    @Inject
-    AgentManager _agentMgr;
-    @Inject
-    AlertManager _alertMgr;
-    @Inject
-    AccountManager _accountMgr;
-    @Inject
-    ConfigurationManager _configMgr;
-    @Inject
-    ServiceOfferingDao _serviceOfferingDao = null;
-    @Inject
-    UserVmDao _userVmDao;
-    @Inject
-    UserStatisticsDao _statsDao = null;
-    @Inject
-    NetworkOfferingDao _networkOfferingDao = null;
-    @Inject
-    GuestOSDao _guestOSDao = null;
-    @Inject
-    NetworkManager _networkMgr;
-    @Inject
-    VirtualMachineManager _itMgr;
-    @Inject
-    VpnUserDao _vpnUsersDao;
-    @Inject
-    RemoteAccessVpnDao _remoteAccessVpnDao;
-    @Inject
-    RulesManager _rulesMgr;
-    @Inject
-    NetworkDao _networkDao;
-    @Inject
-    LoadBalancingRulesManager _lbMgr;
-    @Inject
-    PortForwardingRulesDao _pfRulesDao;
-    @Inject
-    RemoteAccessVpnDao _vpnDao;
-    @Inject
-    NicDao _nicDao;
-    @Inject
-    VolumeDao _volumeDao = null;
-    @Inject
-    UserVmDetailsDao _vmDetailsDao;
-    @Inject
-    ClusterDao _clusterDao;
-    @Inject
-    ResourceManager _resourceMgr;
-    @Inject
-    PhysicalNetworkServiceProviderDao _physicalProviderDao;
-    @Inject
-    VirtualRouterProviderDao _vrProviderDao;
-    @Inject
-    ManagementServerHostDao _msHostDao;
-    @Inject
-    Site2SiteCustomerGatewayDao _s2sCustomerGatewayDao;
-    @Inject
-    Site2SiteVpnGatewayDao _s2sVpnGatewayDao;
-    @Inject
-    Site2SiteVpnConnectionDao _s2sVpnConnectionDao;
-    @Inject
-    Site2SiteVpnManager _s2sVpnMgr;
-    
-    int _routerRamSize;
-    int _routerCpuMHz;
-    int _retry = 2;
-    String _instance;
-    String _mgmt_host;
-    String _mgmt_cidr;
-
-    int _routerStatsInterval = 300;
-    int _routerCheckInterval = 30;
-    protected ServiceOfferingVO _offering;
-    private String _dnsBasicZoneUpdates = "all";
-
-    private boolean _disable_rp_filter = false;
-    int _routerExtraPublicNics = 2;
-    private int _usageAggregationRange = 1440;
-    private String _usageTimeZone = "GMT";
-    private final long mgmtSrvrId = MacAddress.getMacAddress().toLong();
-    private static final int ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION = 5;    // 5 seconds
-    
-    ScheduledExecutorService _executor;
-    ScheduledExecutorService _checkExecutor;
-    ScheduledExecutorService _networkStatsUpdateExecutor;
-
-    Account _systemAcct;
-
-    @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;
-        }
-    }
-
-    @Override
-    public VirtualRouter destroyRouter(final long routerId) throws ResourceUnavailableException, ConcurrentOperationException {
-        UserContext context = UserContext.current();
-        User user = _accountMgr.getActiveUser(context.getCallerUserId());
-
-        if (s_logger.isDebugEnabled()) {
-            s_logger.debug("Attempting to destroy router " + routerId);
-        }
-
-        DomainRouterVO router = _routerDao.findById(routerId);
-        if (router == null) {
-            return null;
-        }
-
-        _accountMgr.checkAccess(context.getCaller(), null, true, router);
-
-        boolean result = _itMgr.expunge(router, user, _accountMgr.getAccount(router.getAccountId()));
-
-        if (result) {
-            return router;
-        }
-        return null;
-    }
-
-    @Override
-    @DB
-    public VirtualRouter upgradeRouter(UpgradeRouterCmd cmd) {
-        Long routerId = cmd.getId();
-        Long serviceOfferingId = cmd.getServiceOfferingId();
-        Account caller = UserContext.current().getCaller();
-
-        DomainRouterVO router = _routerDao.findById(routerId);
-        if (router == null) {
-            throw new InvalidParameterValueException("Unable to find router with id " + routerId);
-        }
-
-        _accountMgr.checkAccess(caller, null, true, router);
-
-        if (router.getServiceOfferingId() == serviceOfferingId) {
-            s_logger.debug("Router: " + routerId + "already has service offering: " + serviceOfferingId);
-            return _routerDao.findById(routerId);
-        }
-
-        ServiceOffering newServiceOffering = _configMgr.getServiceOffering(serviceOfferingId);
-        if (newServiceOffering == null) {
-            throw new InvalidParameterValueException("Unable to find service offering with id " + serviceOfferingId);
-        }
-
-        // check if it is a system service offering, if yes return with error as it cannot be used for user vms
-        if (!newServiceOffering.getSystemUse()) {
-            throw new InvalidParameterValueException("Cannot upgrade router vm to a non system service offering " + serviceOfferingId);
-        }
-
-        // Check that the router is stopped
-        if (!router.getState().equals(State.Stopped)) {
-            s_logger.warn("Unable to upgrade router " + router.toString() + " in state " + router.getState());
-            throw new InvalidParameterValueException("Unable to upgrade router " + router.toString() + " in state " + router.getState()
-                    + "; make sure the router is stopped and not in an error state before upgrading.");
-        }
-
-        ServiceOfferingVO currentServiceOffering = _serviceOfferingDao.findById(router.getServiceOfferingId());
-
-        // Check that the service offering being upgraded to has the same storage pool preference as the VM's current service
-        // offering
-        if (currentServiceOffering.getUseLocalStorage() != newServiceOffering.getUseLocalStorage()) {
-            throw new InvalidParameterValueException("Can't upgrade, due to new local storage status : " + 
-        newServiceOffering.getUseLocalStorage() + " is different from "
-                    + "curruent local storage status: " + currentServiceOffering.getUseLocalStorage());
-        }
-
-        router.setServiceOfferingId(serviceOfferingId);
-        if (_routerDao.update(routerId, router)) {
-            return _routerDao.findById(routerId);
-        } else {
-            throw new CloudRuntimeException("Unable to upgrade router " + routerId);
-        }
-
-    }
-
-    @Override
-    public boolean savePasswordToRouter(Network network, NicProfile nic, VirtualMachineProfile<UserVm> profile, List<? extends VirtualRouter> routers) throws ResourceUnavailableException {
-        if (routers == null || routers.isEmpty()) {
-            s_logger.warn("Unable save password, router doesn't exist in network " + network.getId());
-            throw new CloudRuntimeException("Unable to save password to router");
-        }
-
-        UserVm userVm = profile.getVirtualMachine();
-        String password = (String) profile.getParameter(Param.VmPassword);
-        String encodedPassword = PasswordGenerator.rot13(password);
-        DataCenter dc = _dcDao.findById(userVm.getDataCenterIdToDeployIn());
-
-        boolean result = true;
-        for (VirtualRouter router : routers) {
-            boolean sendPassword = true;
-            if (dc.getNetworkType() == NetworkType.Basic && userVm.getPodIdToDeployIn().longValue() != router.getPodIdToDeployIn().longValue()) {
-                sendPassword = false;
-            }
-
-            if (sendPassword) {
-                Commands cmds = new Commands(OnError.Continue);
-                SavePasswordCommand cmd = new SavePasswordCommand(encodedPassword, nic.getIp4Address(), userVm.getHostName());
-                cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId()));
-                cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
-                DataCenterVO dcVo = _dcDao.findById(router.getDataCenterIdToDeployIn());
-                cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
-                cmds.addCommand("password", cmd);
-
-                result = result && sendCommandsToRouter(router, cmds);
-            }
-        }
-        return result;
-    }
-
-    @Override @ActionEvent(eventType = EventTypes.EVENT_ROUTER_STOP, eventDescription = "stopping router Vm", async = true)
-    public VirtualRouter stopRouter(long routerId, boolean forced) throws ResourceUnavailableException, ConcurrentOperationException {
-        UserContext context = UserContext.current();
-        Account account = context.getCaller();
-
-        // verify parameters
-        DomainRouterVO router = _routerDao.findById(routerId);
-        if (router == null) {
-            throw new InvalidParameterValueException("Unable to find router by id " + routerId + ".");
-        }
-
-        _accountMgr.checkAccess(account, null, true, router);
-
-        UserVO user = _userDao.findById(UserContext.current().getCallerUserId());
-
-        VirtualRouter virtualRouter = stop(router, forced, user, account);
-        if(virtualRouter == null){
-            throw new CloudRuntimeException("Failed to stop router with id " + routerId);
-        }
-        return virtualRouter;
-    }
-
-    @DB
-    public void processStopOrRebootAnswer(final DomainRouterVO router, Answer answer) {
-        final Transaction txn = Transaction.currentTxn();
-        try {
-            txn.start();
-            //FIXME!!! - UserStats command should grab bytesSent/Received for all guest interfaces of the VR
-            List<Long> routerGuestNtwkIds = _routerDao.getRouterNetworks(router.getId());
-            for (Long guestNtwkId : routerGuestNtwkIds) {
-                final UserStatisticsVO userStats = _userStatsDao.lock(router.getAccountId(), router.getDataCenterIdToDeployIn(),
-                        guestNtwkId, null, router.getId(), router.getType().toString());
-            if (userStats != null) {
-                final long currentBytesRcvd = userStats.getCurrentBytesReceived();
-                userStats.setCurrentBytesReceived(0);
-                userStats.setNetBytesReceived(userStats.getNetBytesReceived() + currentBytesRcvd);
-
-                final long currentBytesSent = userStats.getCurrentBytesSent();
-                userStats.setCurrentBytesSent(0);
-                userStats.setNetBytesSent(userStats.getNetBytesSent() + currentBytesSent);
-                _userStatsDao.update(userStats.getId(), userStats);
-                s_logger.debug("Successfully updated user statistics as a part of domR " + router + " reboot/stop");
-            } else {
-                s_logger.warn("User stats were not created for account " + router.getAccountId() + " and dc " + router.getDataCenterIdToDeployIn());
-            }
-            }
-            
-            txn.commit();
-        } catch (final Exception e) {
-            txn.rollback();
-            throw new CloudRuntimeException("Problem updating stats after reboot/stop ", e);
-        }
-    }
-
-    @Override @ActionEvent(eventType = EventTypes.EVENT_ROUTER_REBOOT, eventDescription = "rebooting router Vm", async = true)
-    public VirtualRouter rebootRouter(long routerId, boolean reprogramNetwork) throws ConcurrentOperationException, 
-    ResourceUnavailableException, InsufficientCapacityException {
-        Account caller = UserContext.current().getCaller();
-
-        // verify parameters
-        DomainRouterVO router = _routerDao.findById(routerId);
-        if (router == null) {
-            throw new InvalidParameterValueException("Unable to find domain router with id " + routerId + ".");
-        }
-
-        _accountMgr.checkAccess(caller, null, true, router);
-
-        // Can reboot domain router only in Running state
-        if (router == null || router.getState() != State.Running) {
-            s_logger.warn("Unable to reboot, virtual router is not in the right state " + router.getState());
-            throw new ResourceUnavailableException("Unable to reboot domR, it is not in right state " + router.getState(),
-                    DataCenter.class, router.getDataCenterIdToDeployIn());
-        }
-
-        UserVO user = _userDao.findById(UserContext.current().getCallerUserId());
-        s_logger.debug("Stopping and starting router " + router + " as a part of router reboot");
-
-        if (stop(router, false, user, caller) != null) {
-            return startRouter(routerId, reprogramNetwork);
-        } else {
-            throw new CloudRuntimeException("Failed to reboot router " + router);
-        }
-    }
-
-    @Override
-    public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
-        _name = name;
-
-        _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("RouterMonitor"));
-        _checkExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("RouterStatusMonitor"));
-        _networkStatsUpdateExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("NetworkStatsUpdater"));
-
-        final ComponentLocator locator = ComponentLocator.getCurrentLocator();
-
-        final Map<String, String> configs = _configDao.getConfiguration("AgentManager", params);
-
-        _mgmt_host = configs.get("host");
-        _routerRamSize = NumbersUtil.parseInt(configs.get("router.ram.size"), DEFAULT_ROUTER_VM_RAMSIZE);
-        _routerCpuMHz = NumbersUtil.parseInt(configs.get("router.cpu.mhz"), DEFAULT_ROUTER_CPU_MHZ);
-
-        _routerExtraPublicNics = NumbersUtil.parseInt(_configDao.getValue(Config.RouterExtraPublicNics.key()), 2);
-
-        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.check.interval");
-        _routerCheckInterval = NumbersUtil.parseInt(value, 30);
-        
-        _instance = configs.get("instance.name");
-        if (_instance == null) {
-            _instance = "DEFAULT";
-        }
-
-        String rpValue = configs.get("network.disable.rpfilter");
-        if (rpValue != null && rpValue.equalsIgnoreCase("true")) {
-            _disable_rp_filter = true;
-        }
-
-        _dnsBasicZoneUpdates = String.valueOf(_configDao.getValue(Config.DnsBasicZoneUpdates.key()));
-
-        s_logger.info("Router configurations: " + "ramsize=" + _routerRamSize);
-
-        final UserStatisticsDao statsDao = locator.getDao(UserStatisticsDao.class);
-        if (statsDao == null) {
-            throw new ConfigurationException("Unable to get " + UserStatisticsDao.class.getName());
-        }
-
-        _agentMgr.registerForHostEvents(new SshKeysDistriMonitor(_agentMgr, _hostDao, _configDao), true, false, false);
-        _itMgr.registerGuru(VirtualMachine.Type.DomainRouter, this);
-
-        boolean useLocalStorage = Boolean.parseBoolean(configs.get(Config.SystemVMUseLocalStorage.key()));
-        _offering = new ServiceOfferingVO("System Offering For Software Router", 1, _routerRamSize, _routerCpuMHz, null,
-                null, true, null, useLocalStorage, true, null, true, VirtualMachine.Type.DomainRouter, true);
-        _offering.setUniqueName(ServiceOffering.routerDefaultOffUniqueName);
-        _offering = _serviceOfferingDao.persistSystemServiceOffering(_offering);
-
-        // this can sometimes happen, if DB is manually or programmatically manipulated
-        if(_offering == null) {
-            String msg = "Data integrity problem : System Offering For Software router VM has been removed?";
-            s_logger.error(msg);
-            throw new ConfigurationException(msg);
-        }
-
-        _systemAcct = _accountMgr.getSystemAccount();
-
-        String aggregationRange = configs.get("usage.stats.job.aggregation.range");
-        _usageAggregationRange  = NumbersUtil.parseInt(aggregationRange, 1440);
-        _usageTimeZone = configs.get("usage.aggregation.timezone");
-        if(_usageTimeZone == null){
-            _usageTimeZone = "GMT";
-        }
-
-        _agentMgr.registerForHostEvents(this, true, false, false);
-
-        s_logger.info("DomainRouterManager is configured.");
-
-        return true;
-    }
-
-    @Override
-    public String getName() {
-        return _name;
-    }
-
-    @Override
-    public boolean start() {
-        if (_routerStatsInterval > 0){
-            _executor.scheduleAtFixedRate(new NetworkUsageTask(), _routerStatsInterval, _routerStatsInterval, TimeUnit.SECONDS);
-        }else{
-            s_logger.debug("router.stats.interval - " + _routerStatsInterval+ " so not scheduling the router stats thread");
-        }
-
-        //Schedule Network stats update task
-        TimeZone usageTimezone = TimeZone.getTimeZone(_usageTimeZone);
-        Calendar cal = Calendar.getInstance(usageTimezone);
-        cal.setTime(new Date());
-        long endDate = 0;
-        int HOURLY_TIME = 60;
-        final int DAILY_TIME = 60 * 24;
-        if (_usageAggregationRange == DAILY_TIME) {
-        	cal.roll(Calendar.DAY_OF_YEAR, false);
-        	cal.set(Calendar.HOUR_OF_DAY, 0);
-        	cal.set(Calendar.MINUTE, 0);
-        	cal.set(Calendar.SECOND, 0);
-        	cal.set(Calendar.MILLISECOND, 0);
-        	cal.roll(Calendar.DAY_OF_YEAR, true);
-        	cal.add(Calendar.MILLISECOND, -1);
-        	endDate = cal.getTime().getTime();
-        } else if (_usageAggregationRange == HOURLY_TIME) {
-        	cal.roll(Calendar.HOUR_OF_DAY, false);
-        	cal.set(Calendar.MINUTE, 0);
-        	cal.set(Calendar.SECOND, 0);
-        	cal.set(Calendar.MILLISECOND, 0);
-        	cal.roll(Calendar.HOUR_OF_DAY, true);
-        	cal.add(Calendar.MILLISECOND, -1);
-        	endDate = cal.getTime().getTime();
-        } else {
-        	endDate = cal.getTime().getTime();
-        }
-
-        _networkStatsUpdateExecutor.scheduleAtFixedRate(new NetworkStatsUpdateTask(), (endDate - System.currentTimeMillis()),
-                (_usageAggregationRange * 60 * 1000), TimeUnit.MILLISECONDS);
-        
-        if (_routerCheckInterval > 0) {
-            _checkExecutor.scheduleAtFixedRate(new CheckRouterTask(), _routerCheckInterval, _routerCheckInterval, TimeUnit.SECONDS);
-        } else {
-            s_logger.debug("router.check.interval - " + _routerCheckInterval+ " so not scheduling the redundant router checking thread");
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean stop() {
-        return true;
-    }
-
-    protected VirtualNetworkApplianceManagerImpl() {
-    }
-
-    @Override
-    public Long convertToId(final String vmName) {
-        if (!VirtualMachineName.isValidRouterName(vmName, _instance)) {
-            return null;
-        }
-
-        return VirtualMachineName.getRouterId(vmName);
-    }
-
-    private VmDataCommand generateVmDataCommand(VirtualRouter router, String vmPrivateIpAddress, String userData, 
-            String serviceOffering, String zoneName, String guestIpAddress, String vmName,
-            String vmInstanceName, long vmId, String publicKey, long guestNetworkId) {
-        VmDataCommand cmd = new VmDataCommand(vmPrivateIpAddress, vmName);
-
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId()));
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, getRouterIpInNetwork(guestNetworkId, router.getId()));
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
-
-        DataCenterVO dcVo = _dcDao.findById(router.getDataCenterIdToDeployIn());
-        cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
-
-        cmd.addVmData("userdata", "user-data", userData);
-        cmd.addVmData("metadata", "service-offering", StringUtils.unicodeEscape(serviceOffering));
-        cmd.addVmData("metadata", "availability-zone", StringUtils.unicodeEscape(zoneName));
-        cmd.addVmData("metadata", "local-ipv4", guestIpAddress);
-        cmd.addVmData("metadata", "local-hostname", StringUtils.unicodeEscape(vmName));
-        if (dcVo.getNetworkType() == NetworkType.Basic) {
-            cmd.addVmData("metadata", "public-ipv4", guestIpAddress);
-            cmd.addVmData("metadata", "public-hostname",  StringUtils.unicodeEscape(vmName));
-        } else
-        {
-        	if (router.getPublicIpAddress() == null) {
-        		 cmd.addVmData("metadata", "public-ipv4", guestIpAddress);
-        	} else {
-        		cmd.addVmData("metadata", "public-ipv4", router.getPublicIpAddress());
-        	}
-            cmd.addVmData("metadata", "public-hostname", router.getPublicIpAddress());
-        }
-        cmd.addVmData("metadata", "instance-id", vmInstanceName);
-        cmd.addVmData("metadata", "vm-id", String.valueOf(vmId));
-        cmd.addVmData("metadata", "public-keys", publicKey);
-
-        String cloudIdentifier = _configDao.getValue("cloud.identifier");
-        if (cloudIdentifier == null) {
-            cloudIdentifier = "";
-        } else {
-            cloudIdentifier = "CloudStack-{" + cloudIdentifier + "}";
-        }
-        cmd.addVmData("metadata", "cloud-identifier", cloudIdentifier);
-
-        return cmd;
-    }
-
-    protected class NetworkUsageTask implements Runnable {
-
-        public NetworkUsageTask() {
-        }
-
-        @Override
-        public void run() {
-        	try{
-        		final List<DomainRouterVO> routers = _routerDao.listByStateAndNetworkType(State.Running, GuestType.Isolated, mgmtSrvrId);
-        		s_logger.debug("Found " + routers.size() + " running routers. ");
-
-        		for (DomainRouterVO router : routers) {
-        			String privateIP = router.getPrivateIpAddress();
-
-        			if (privateIP != null) {
-        				List<? extends Nic> routerNics = _nicDao.listByVmId(router.getId());
-        				for (Nic routerNic : routerNics) {
-        					Network network = _networkMgr.getNetwork(routerNic.getNetworkId());
-        					if (network.getTrafficType() == TrafficType.Public) {
-        						boolean forVpc = router.getVpcId() != null;
-        						final NetworkUsageCommand usageCmd = new NetworkUsageCommand(privateIP, router.getHostName(),
-        								forVpc, routerNic.getIp4Address());
-        						UserStatisticsVO previousStats = _statsDao.findBy(router.getAccountId(), 
-        								router.getDataCenterIdToDeployIn(), network.getId(), null, router.getId(), router.getType().toString());
-        						NetworkUsageAnswer answer = null;
-        						try {
-        							answer = (NetworkUsageAnswer) _agentMgr.easySend(router.getHostId(), usageCmd);
-        						} catch (Exception e) {
-        							s_logger.warn("Error while collecting network stats from router: "+router.getInstanceName()+" from host: "+router.getHostId(), e);
-        							continue;
-        						}
-
-        						if (answer != null) {
-        							if (!answer.getResult()) {
-        								s_logger.warn("Error while collecting network stats from router: "+router.getInstanceName()+" from host: "+router.getHostId() + "; details: " + answer.getDetails());
-        								continue;
-        							}
-        							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.getDataCenterIdToDeployIn(), network.getId(), routerNic.getIp4Address(), router.getId(), router.getType().toString());
-        								if (stats == null) {
-        									s_logger.warn("unable to find stats for account: " + router.getAccountId());
-        									continue;
-        								}
-
-        								if(previousStats != null 
-        										&& ((previousStats.getCurrentBytesReceived() != stats.getCurrentBytesReceived()) 
-        												|| (previousStats.getCurrentBytesSent() != stats.getCurrentBytesSent()))){
-        									s_logger.debug("Router stats changed from the time NetworkUsageCommand was sent. " +
-        											"Ignoring current answer. Router: "+answer.getRouterName()+" Rcvd: " + 
-        											answer.getBytesReceived()+ "Sent: " +answer.getBytesSent());
-        									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. Router: " + 
-        												answer.getRouterName()+" 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. Router: " + 
-        												answer.getRouterName()+" 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();
-        							}
-        						}
-        					}
-        				}
-        			}
-        		}
-        	} catch (Exception e) {
-        		s_logger.warn("Error while collecting network stats", e);
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+// 
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.network.router;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import javax.ejb.Local;
+import javax.naming.ConfigurationException;
+
+import org.apache.log4j.Logger;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.agent.AgentManager.OnError;
+import com.cloud.agent.Listener;
+import com.cloud.agent.api.AgentControlAnswer;
+import com.cloud.agent.api.AgentControlCommand;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.BumpUpPriorityCommand;
+import com.cloud.agent.api.CheckRouterAnswer;
+import com.cloud.agent.api.CheckRouterCommand;
+import com.cloud.agent.api.CheckS2SVpnConnectionsAnswer;
+import com.cloud.agent.api.CheckS2SVpnConnectionsCommand;
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.GetDomRVersionAnswer;
+import com.cloud.agent.api.GetDomRVersionCmd;
+import com.cloud.agent.api.ModifySshKeysCommand;
+import com.cloud.agent.api.NetworkUsageAnswer;
+import com.cloud.agent.api.NetworkUsageCommand;
+import com.cloud.agent.api.StartupCommand;
+import com.cloud.agent.api.StopAnswer;
+import com.cloud.agent.api.check.CheckSshAnswer;
+import com.cloud.agent.api.check.CheckSshCommand;
+import com.cloud.agent.api.routing.DhcpEntryCommand;
+import com.cloud.agent.api.routing.IpAssocCommand;
+import com.cloud.agent.api.routing.LoadBalancerConfigCommand;
+import com.cloud.agent.api.routing.NetworkElementCommand;
+import com.cloud.agent.api.routing.RemoteAccessVpnCfgCommand;
+import com.cloud.agent.api.routing.SavePasswordCommand;
+import com.cloud.agent.api.routing.SetFirewallRulesCommand;
+import com.cloud.agent.api.routing.SetPortForwardingRulesCommand;
+import com.cloud.agent.api.routing.SetPortForwardingRulesVpcCommand;
+import com.cloud.agent.api.routing.SetStaticNatRulesCommand;
+import com.cloud.agent.api.routing.VmDataCommand;
+import com.cloud.agent.api.routing.VpnUsersCfgCommand;
+import com.cloud.agent.api.to.FirewallRuleTO;
+import com.cloud.agent.api.to.IpAddressTO;
+import com.cloud.agent.api.to.LoadBalancerTO;
+import com.cloud.agent.api.to.NicTO;
+import com.cloud.agent.api.to.PortForwardingRuleTO;
+import com.cloud.agent.api.to.StaticNatRuleTO;
+import com.cloud.agent.api.to.VirtualMachineTO;
+import com.cloud.agent.manager.Commands;
+import com.cloud.alert.AlertManager;
+import com.cloud.api.commands.UpgradeRouterCmd;
+import com.cloud.cluster.ManagementServerHostVO;
+import com.cloud.cluster.ManagementServerNode;
+import com.cloud.cluster.dao.ManagementServerHostDao;
+import com.cloud.configuration.Config;
+import com.cloud.configuration.ConfigurationManager;
+import com.cloud.configuration.ZoneConfig;
+import com.cloud.configuration.dao.ConfigurationDao;
+import com.cloud.dc.ClusterVO;
+import com.cloud.dc.DataCenter;
+import com.cloud.dc.DataCenter.NetworkType;
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.HostPodVO;
+import com.cloud.dc.Pod;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.dc.dao.HostPodDao;
+import com.cloud.dc.dao.VlanDao;
+import com.cloud.deploy.DataCenterDeployment;
+import com.cloud.deploy.DeployDestination;
+import com.cloud.deploy.DeploymentPlan;
+import com.cloud.deploy.DeploymentPlanner.ExcludeList;
+import com.cloud.event.ActionEvent;
+import com.cloud.event.EventTypes;
+import com.cloud.exception.AgentUnavailableException;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.ConnectionException;
+import com.cloud.exception.InsufficientAddressCapacityException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.InsufficientServerCapacityException;
+import com.cloud.exception.InsufficientVirtualNetworkCapcityException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.OperationTimedoutException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.exception.StorageUnavailableException;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.network.IPAddressVO;
+import com.cloud.network.IpAddress;
+import com.cloud.network.LoadBalancerVO;
+import com.cloud.network.Network;
+import com.cloud.network.Network.GuestType;
+import com.cloud.network.Network.Provider;
+import com.cloud.network.Network.Service;
+import com.cloud.network.NetworkManager;
+import com.cloud.network.NetworkVO;
+import com.cloud.network.Networks.BroadcastDomainType;
+import com.cloud.network.Networks.IsolationType;
+import com.cloud.network.Networks.TrafficType;
+import com.cloud.network.PhysicalNetworkServiceProvider;
+import com.cloud.network.PublicIpAddress;
+import com.cloud.network.RemoteAccessVpn;
+import com.cloud.network.Site2SiteCustomerGateway;
+import com.cloud.network.Site2SiteVpnConnection;
+import com.cloud.network.Site2SiteVpnConnectionVO;
+import com.cloud.network.SshKeysDistriMonitor;
+import com.cloud.network.VirtualNetworkApplianceService;
+import com.cloud.network.VirtualRouterProvider;
+import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType;
+import com.cloud.network.VpnUser;
+import com.cloud.network.VpnUserVO;
+import com.cloud.network.addr.PublicIp;
+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.NetworkDao;
+import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
+import com.cloud.network.dao.RemoteAccessVpnDao;
+import com.cloud.network.dao.Site2SiteCustomerGatewayDao;
+import com.cloud.network.dao.Site2SiteVpnConnectionDao;
+import com.cloud.network.dao.Site2SiteVpnGatewayDao;
+import com.cloud.network.dao.VirtualRouterProviderDao;
+import com.cloud.network.dao.VpnUserDao;
+import com.cloud.network.lb.LoadBalancingRule;
+import com.cloud.network.lb.LoadBalancingRule.LbDestination;
+import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy;
+import com.cloud.network.lb.LoadBalancingRulesManager;
+import com.cloud.network.router.VirtualRouter.RedundantState;
+import com.cloud.network.router.VirtualRouter.Role;
+import com.cloud.network.rules.FirewallRule;
+import com.cloud.network.rules.FirewallRule.Purpose;
+import com.cloud.network.rules.PortForwardingRule;
+import com.cloud.network.rules.RulesManager;
+import com.cloud.network.rules.StaticNat;
+import com.cloud.network.rules.StaticNatImpl;
+import com.cloud.network.rules.StaticNatRule;
+import com.cloud.network.rules.dao.PortForwardingRulesDao;
+import com.cloud.network.vpn.Site2SiteVpnManager;
+import com.cloud.offering.ServiceOffering;
+import com.cloud.offerings.NetworkOfferingVO;
+import com.cloud.offerings.dao.NetworkOfferingDao;
+import com.cloud.resource.ResourceManager;
+import com.cloud.service.ServiceOfferingVO;
+import com.cloud.service.dao.ServiceOfferingDao;
+import com.cloud.storage.GuestOSVO;
+import com.cloud.storage.VMTemplateVO;
+import com.cloud.storage.Volume.Type;
+import com.cloud.storage.VolumeVO;
+import com.cloud.storage.dao.GuestOSDao;
+import com.cloud.storage.dao.VMTemplateDao;
+import com.cloud.storage.dao.VolumeDao;
+import com.cloud.user.Account;
+import com.cloud.user.AccountManager;
+import com.cloud.user.User;
+import com.cloud.user.UserContext;
+import com.cloud.user.UserStatisticsVO;
+import com.cloud.user.UserStatsLogVO;
+import com.cloud.user.UserVO;
+import com.cloud.user.dao.UserDao;
+import com.cloud.user.dao.UserStatisticsDao;
+import com.cloud.user.dao.UserStatsLogDao;
+import com.cloud.uservm.UserVm;
+import com.cloud.utils.NumbersUtil;
+import com.cloud.utils.Pair;
+import com.cloud.utils.PasswordGenerator;
+import com.cloud.utils.StringUtils;
+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.Filter;
+import com.cloud.utils.db.GlobalLock;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.net.MacAddress;
+import com.cloud.utils.net.NetUtils;
+import com.cloud.vm.DomainRouterVO;
+import com.cloud.vm.Nic;
+import com.cloud.vm.NicProfile;
+import com.cloud.vm.NicVO;
+import com.cloud.vm.ReservationContext;
+import com.cloud.vm.ReservationContextImpl;
+import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachine.State;
+import com.cloud.vm.VirtualMachineGuru;
+import com.cloud.vm.VirtualMachineManager;
+import com.cloud.vm.VirtualMachineName;
+import com.cloud.vm.VirtualMachineProfile;
+import com.cloud.vm.VirtualMachineProfile.Param;
+import com.cloud.vm.dao.DomainRouterDao;
+import com.cloud.vm.dao.NicDao;
+import com.cloud.vm.dao.UserVmDao;
+import com.cloud.vm.dao.UserVmDetailsDao;
+
+/**
+ * VirtualNetworkApplianceManagerImpl manages the different types of virtual network appliances available in the Cloud Stack.
+ */
+@Local(value = { VirtualNetworkApplianceManager.class, VirtualNetworkApplianceService.class })
+public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplianceManager, VirtualNetworkApplianceService, 
+                            VirtualMachineGuru<DomainRouterVO>, Listener {
+    private static final Logger s_logger = Logger.getLogger(VirtualNetworkApplianceManagerImpl.class);
+
+    String _name;
+    @Inject
+    DataCenterDao _dcDao = null;
+    @Inject
+    VlanDao _vlanDao = null;
+    @Inject
+    FirewallRulesDao _rulesDao = null;
+    @Inject
+    LoadBalancerDao _loadBalancerDao = null;
+    @Inject
+    LoadBalancerVMMapDao _loadBalancerVMMapDao = null;
+    @Inject
+    IPAddressDao _ipAddressDao = null;
+    @Inject
+    VMTemplateDao _templateDao = null;
+    @Inject
+    DomainRouterDao _routerDao = null;
+    @Inject
+    UserDao _userDao = null;
+    @Inject
+    UserStatisticsDao _userStatsDao = null;
+    @Inject
+    HostDao _hostDao = null;
+    @Inject
+    ConfigurationDao _configDao;
+    @Inject
+    HostPodDao _podDao = null;
+    @Inject
+    UserStatsLogDao _userStatsLogDao = null;
+    @Inject
+    AgentManager _agentMgr;
+    @Inject
+    AlertManager _alertMgr;
+    @Inject
+    AccountManager _accountMgr;
+    @Inject
+    ConfigurationManager _configMgr;
+    @Inject
+    ServiceOfferingDao _serviceOfferingDao = null;
+    @Inject
+    UserVmDao _userVmDao;
+    @Inject
+    UserStatisticsDao _statsDao = null;
+    @Inject
+    NetworkOfferingDao _networkOfferingDao = null;
+    @Inject
+    GuestOSDao _guestOSDao = null;
+    @Inject
+    NetworkManager _networkMgr;
+    @Inject
+    VirtualMachineManager _itMgr;
+    @Inject
+    VpnUserDao _vpnUsersDao;
+    @Inject
+    RemoteAccessVpnDao _remoteAccessVpnDao;
+    @Inject
+    RulesManager _rulesMgr;
+    @Inject
+    NetworkDao _networkDao;
+    @Inject
+    LoadBalancingRulesManager _lbMgr;
+    @Inject
+    PortForwardingRulesDao _pfRulesDao;
+    @Inject
+    RemoteAccessVpnDao _vpnDao;
+    @Inject
+    NicDao _nicDao;
+    @Inject
+    VolumeDao _volumeDao = null;
+    @Inject
+    UserVmDetailsDao _vmDetailsDao;
+    @Inject
+    ClusterDao _clusterDao;
+    @Inject
+    ResourceManager _resourceMgr;
+    @Inject
+    PhysicalNetworkServiceProviderDao _physicalProviderDao;
+    @Inject
+    VirtualRouterProviderDao _vrProviderDao;
+    @Inject
+    ManagementServerHostDao _msHostDao;
+    @Inject
+    Site2SiteCustomerGatewayDao _s2sCustomerGatewayDao;
+    @Inject
+    Site2SiteVpnGatewayDao _s2sVpnGatewayDao;
+    @Inject
+    Site2SiteVpnConnectionDao _s2sVpnConnectionDao;
+    @Inject
+    Site2SiteVpnManager _s2sVpnMgr;
+    
+    int _routerRamSize;
+    int _routerCpuMHz;
+    int _retry = 2;
+    String _instance;
+    String _mgmt_host;
+    String _mgmt_cidr;
+
+    int _routerStatsInterval = 300;
+    int _routerCheckInterval = 30;
+    protected ServiceOfferingVO _offering;
+    private String _dnsBasicZoneUpdates = "all";
+
+    private boolean _disable_rp_filter = false;
+    int _routerExtraPublicNics = 2;
+    private int _usageAggregationRange = 1440;
+    private String _usageTimeZone = "GMT";
+    private final long mgmtSrvrId = MacAddress.getMacAddress().toLong();
+    private static final int ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION = 5;    // 5 seconds
+    
+    ScheduledExecutorService _executor;
+    ScheduledExecutorService _checkExecutor;
+    ScheduledExecutorService _networkStatsUpdateExecutor;
+
+    Account _systemAcct;
+
+    @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;
+        }
+    }
+
+    @Override
+    public VirtualRouter destroyRouter(final long routerId) throws ResourceUnavailableException, ConcurrentOperationException {
+        UserContext context = UserContext.current();
+        User user = _accountMgr.getActiveUser(context.getCallerUserId());
+
+        if (s_logger.isDebugEnabled()) {
+            s_logger.debug("Attempting to destroy router " + routerId);
+        }
+
+        DomainRouterVO router = _routerDao.findById(routerId);
+        if (router == null) {
+            return null;
+        }
+
+        _accountMgr.checkAccess(context.getCaller(), null, true, router);
+
+        boolean result = _itMgr.expunge(router, user, _accountMgr.getAccount(router.getAccountId()));
+
+        if (result) {
+            return router;
+        }
+        return null;
+    }
+
+    @Override
+    @DB
+    public VirtualRouter upgradeRouter(UpgradeRouterCmd cmd) {
+        Long routerId = cmd.getId();
+        Long serviceOfferingId = cmd.getServiceOfferingId();
+        Account caller = UserContext.current().getCaller();
+
+        DomainRouterVO router = _routerDao.findById(routerId);
+        if (router == null) {
+            throw new InvalidParameterValueException("Unable to find router with id " + routerId);
+        }
+
+        _accountMgr.checkAccess(caller, null, true, router);
+
+        if (router.getServiceOfferingId() == serviceOfferingId) {
+            s_logger.debug("Router: " + routerId + "already has service offering: " + serviceOfferingId);
+            return _routerDao.findById(routerId);
+        }
+
+        ServiceOffering newServiceOffering = _configMgr.getServiceOffering(serviceOfferingId);
+        if (newServiceOffering == null) {
+            throw new InvalidParameterValueException("Unable to find service offering with id " + serviceOfferingId);
+        }
+
+        // check if it is a system service offering, if yes return with error as it cannot be used for user vms
+        if (!newServiceOffering.getSystemUse()) {
+            throw new InvalidParameterValueException("Cannot upgrade router vm to a non system service offering " + serviceOfferingId);
+        }
+
+        // Check that the router is stopped
+        if (!router.getState().equals(State.Stopped)) {
+            s_logger.warn("Unable to upgrade router " + router.toString() + " in state " + router.getState());
+            throw new InvalidParameterValueException("Unable to upgrade router " + router.toString() + " in state " + router.getState()
+                    + "; make sure the router is stopped and not in an error state before upgrading.");
+        }
+
+        ServiceOfferingVO currentServiceOffering = _serviceOfferingDao.findById(router.getServiceOfferingId());
+
+        // Check that the service offering being upgraded to has the same storage pool preference as the VM's current service
+        // offering
+        if (currentServiceOffering.getUseLocalStorage() != newServiceOffering.getUseLocalStorage()) {
+            throw new InvalidParameterValueException("Can't upgrade, due to new local storage status : " + 
+        newServiceOffering.getUseLocalStorage() + " is different from "
+                    + "curruent local storage status: " + currentServiceOffering.getUseLocalStorage());
+        }
+
+        router.setServiceOfferingId(serviceOfferingId);
+        if (_routerDao.update(routerId, router)) {
+            return _routerDao.findById(routerId);
+        } else {
+            throw new CloudRuntimeException("Unable to upgrade router " + routerId);
+        }
+
+    }
+
+    @Override
+    public boolean savePasswordToRouter(Network network, NicProfile nic, VirtualMachineProfile<UserVm> profile, List<? extends VirtualRouter> routers) throws ResourceUnavailableException {
+        if (routers == null || routers.isEmpty()) {
+            s_logger.warn("Unable save password, router doesn't exist in network " + network.getId());
+            throw new CloudRuntimeException("Unable to save password to router");
+        }
+
+        UserVm userVm = profile.getVirtualMachine();
+        String password = (String) profile.getParameter(Param.VmPassword);
+        String encodedPassword = PasswordGenerator.rot13(password);
+        DataCenter dc = _dcDao.findById(userVm.getDataCenterIdToDeployIn());
+
+        boolean result = true;
+        for (VirtualRouter router : routers) {
+            boolean sendPassword = true;
+            if (dc.getNetworkType() == NetworkType.Basic && userVm.getPodIdToDeployIn().longValue() != router.getPodIdToDeployIn().longValue()) {
+                sendPassword = false;
+            }
+
+            if (sendPassword) {
+                Commands cmds = new Commands(OnError.Continue);
+                SavePasswordCommand cmd = new SavePasswordCommand(encodedPassword, nic.getIp4Address(), userVm.getHostName());
+                cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId()));
+                cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
+                DataCenterVO dcVo = _dcDao.findById(router.getDataCenterIdToDeployIn());
+                cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
+                cmds.addCommand("password", cmd);
+
+                result = result && sendCommandsToRouter(router, cmds);
+            }
+        }
+        return result;
+    }
+
+    @Override @ActionEvent(eventType = EventTypes.EVENT_ROUTER_STOP, eventDescription = "stopping router Vm", async = true)
+    public VirtualRouter stopRouter(long routerId, boolean forced) throws ResourceUnavailableException, ConcurrentOperationException {
+        UserContext context = UserContext.current();
+        Account account = context.getCaller();
+
+        // verify parameters
+        DomainRouterVO router = _routerDao.findById(routerId);
+        if (router == null) {
+            throw new InvalidParameterValueException("Unable to find router by id " + routerId + ".");
+        }
+
+        _accountMgr.checkAccess(account, null, true, router);
+
+        UserVO user = _userDao.findById(UserContext.current().getCallerUserId());
+
+        VirtualRouter virtualRouter = stop(router, forced, user, account);
+        if(virtualRouter == null){
+            throw new CloudRuntimeException("Failed to stop router with id " + routerId);
+        }
+        return virtualRouter;
+    }
+
+    @DB
+    public void processStopOrRebootAnswer(final DomainRouterVO router, Answer answer) {
+        final Transaction txn = Transaction.currentTxn();
+        try {
+            txn.start();
+            //FIXME!!! - UserStats command should grab bytesSent/Received for all guest interfaces of the VR
+            List<Long> routerGuestNtwkIds = _routerDao.getRouterNetworks(router.getId());
+            for (Long guestNtwkId : routerGuestNtwkIds) {
+                final UserStatisticsVO userStats = _userStatsDao.lock(router.getAccountId(), router.getDataCenterIdToDeployIn(),
+                        guestNtwkId, null, router.getId(), router.getType().toString());
+            if (userStats != null) {
+                final long currentBytesRcvd = userStats.getCurrentBytesReceived();
+                userStats.setCurrentBytesReceived(0);
+                userStats.setNetBytesReceived(userStats.getNetBytesReceived() + currentBytesRcvd);
+
+                final long currentBytesSent = userStats.getCurrentBytesSent();
+                userStats.setCurrentBytesSent(0);
+                userStats.setNetBytesSent(userStats.getNetBytesSent() + currentBytesSent);
+                _userStatsDao.update(userStats.getId(), userStats);
+                s_logger.debug("Successfully updated user statistics as a part of domR " + router + " reboot/stop");
+            } else {
+                s_logger.warn("User stats were not created for account " + router.getAccountId() + " and dc " + router.getDataCenterIdToDeployIn());
+            }
+            }
+            
+            txn.commit();
+        } catch (final Exception e) {
+            txn.rollback();
+            throw new CloudRuntimeException("Problem updating stats after reboot/stop ", e);
+        }
+    }
+
+    @Override @ActionEvent(eventType = EventTypes.EVENT_ROUTER_REBOOT, eventDescription = "rebooting router Vm", async = true)
+    public VirtualRouter rebootRouter(long routerId, boolean reprogramNetwork) throws ConcurrentOperationException, 
+    ResourceUnavailableException, InsufficientCapacityException {
+        Account caller = UserContext.current().getCaller();
+
+        // verify parameters
+        DomainRouterVO router = _routerDao.findById(routerId);
+        if (router == null) {
+            throw new InvalidParameterValueException("Unable to find domain router with id " + routerId + ".");
+        }
+
+        _accountMgr.checkAccess(caller, null, true, router);
+
+        // Can reboot domain router only in Running state
+        if (router == null || router.getState() != State.Running) {
+            s_logger.warn("Unable to reboot, virtual router is not in the right state " + router.getState());
+            throw new ResourceUnavailableException("Unable to reboot domR, it is not in right state " + router.getState(),
+                    DataCenter.class, router.getDataCenterIdToDeployIn());
+        }
+
+        UserVO user = _userDao.findById(UserContext.current().getCallerUserId());
+        s_logger.debug("Stopping and starting router " + router + " as a part of router reboot");
+
+        if (stop(router, false, user, caller) != null) {
+            return startRouter(routerId, reprogramNetwork);
+        } else {
+            throw new CloudRuntimeException("Failed to reboot router " + router);
+        }
+    }
+
+    @Override
+    public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
+        _name = name;
+
+        _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("RouterMonitor"));
+        _checkExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("RouterStatusMonitor"));
+        _networkStatsUpdateExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("NetworkStatsUpdater"));
+
+        final ComponentLocator locator = ComponentLocator.getCurrentLocator();
+
+        final Map<String, String> configs = _configDao.getConfiguration("AgentManager", params);
+
+        _mgmt_host = configs.get("host");
+        _routerRamSize = NumbersUtil.parseInt(configs.get("router.ram.size"), DEFAULT_ROUTER_VM_RAMSIZE);
+        _routerCpuMHz = NumbersUtil.parseInt(configs.get("router.cpu.mhz"), DEFAULT_ROUTER_CPU_MHZ);
+
+        _routerExtraPublicNics = NumbersUtil.parseInt(_configDao.getValue(Config.RouterExtraPublicNics.key()), 2);
+
+        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.check.interval");
+        _routerCheckInterval = NumbersUtil.parseInt(value, 30);
+        
+        _instance = configs.get("instance.name");
+        if (_instance == null) {
+            _instance = "DEFAULT";
+        }
+
+        String rpValue = configs.get("network.disable.rpfilter");
+        if (rpValue != null && rpValue.equalsIgnoreCase("true")) {
+            _disable_rp_filter = true;
+        }
+
+        _dnsBasicZoneUpdates = String.valueOf(_configDao.getValue(Config.DnsBasicZoneUpdates.key()));
+
+        s_logger.info("Router configurations: " + "ramsize=" + _routerRamSize);
+
+        final UserStatisticsDao statsDao = locator.getDao(UserStatisticsDao.class);
+        if (statsDao == null) {
+            throw new ConfigurationException("Unable to get " + UserStatisticsDao.class.getName());
+        }
+
+        _agentMgr.registerForHostEvents(new SshKeysDistriMonitor(_agentMgr, _hostDao, _configDao), true, false, false);
+        _itMgr.registerGuru(VirtualMachine.Type.DomainRouter, this);
+
+        boolean useLocalStorage = Boolean.parseBoolean(configs.get(Config.SystemVMUseLocalStorage.key()));
+        _offering = new ServiceOfferingVO("System Offering For Software Router", 1, _routerRamSize, _routerCpuMHz, null,
+                null, true, null, useLocalStorage, true, null, true, VirtualMachine.Type.DomainRouter, true);
+        _offering.setUniqueName(ServiceOffering.routerDefaultOffUniqueName);
+        _offering = _serviceOfferingDao.persistSystemServiceOffering(_offering);
+
+        // this can sometimes happen, if DB is manually or programmatically manipulated
+        if(_offering == null) {
+            String msg = "Data integrity problem : System Offering For Software router VM has been removed?";
+            s_logger.error(msg);
+            throw new ConfigurationException(msg);
+        }
+
+        _systemAcct = _accountMgr.getSystemAccount();
+
+        String aggregationRange = configs.get("usage.stats.job.aggregation.range");
+        _usageAggregationRange  = NumbersUtil.parseInt(aggregationRange, 1440);
+        _usageTimeZone = configs.get("usage.aggregation.timezone");
+        if(_usageTimeZone == null){
+            _usageTimeZone = "GMT";
+        }
+
+        _agentMgr.registerForHostEvents(this, true, false, false);
+
+        s_logger.info("DomainRouterManager is configured.");
+
+        return true;
+    }
+
+    @Override
+    public String getName() {
+        return _name;
+    }
+
+    @Override
+    public boolean start() {
+        if (_routerStatsInterval > 0){
+            _executor.scheduleAtFixedRate(new NetworkUsageTask(), _routerStatsInterval, _routerStatsInterval, TimeUnit.SECONDS);
+        }else{
+            s_logger.debug("router.stats.interval - " + _routerStatsInterval+ " so not scheduling the router stats thread");
+        }
+
+        //Schedule Network stats update task
+        TimeZone usageTimezone = TimeZone.getTimeZone(_usageTimeZone);
+        Calendar cal = Calendar.getInstance(usageTimezone);
+        cal.setTime(new Date());
+        long endDate = 0;
+        int HOURLY_TIME = 60;
+        final int DAILY_TIME = 60 * 24;
+        if (_usageAggregationRange == DAILY_TIME) {
+        	cal.roll(Calendar.DAY_OF_YEAR, false);
+        	cal.set(Calendar.HOUR_OF_DAY, 0);
+        	cal.set(Calendar.MINUTE, 0);
+        	cal.set(Calendar.SECOND, 0);
+        	cal.set(Calendar.MILLISECOND, 0);
+        	cal.roll(Calendar.DAY_OF_YEAR, true);
+        	cal.add(Calendar.MILLISECOND, -1);
+        	endDate = cal.getTime().getTime();
+        } else if (_usageAggregationRange == HOURLY_TIME) {
+        	cal.roll(Calendar.HOUR_OF_DAY, false);
+        	cal.set(Calendar.MINUTE, 0);
+        	cal.set(Calendar.SECOND, 0);
+        	cal.set(Calendar.MILLISECOND, 0);
+        	cal.roll(Calendar.HOUR_OF_DAY, true);
+        	cal.add(Calendar.MILLISECOND, -1);
+        	endDate = cal.getTime().getTime();
+        } else {
+        	endDate = cal.getTime().getTime();
+        }
+
+        _networkStatsUpdateExecutor.scheduleAtFixedRate(new NetworkStatsUpdateTask(), (endDate - System.currentTimeMillis()),
+                (_usageAggregationRange * 60 * 1000), TimeUnit.MILLISECONDS);
+        
+        if (_routerCheckInterval > 0) {
+            _checkExecutor.scheduleAtFixedRate(new CheckRouterTask(), _routerCheckInterval, _routerCheckInterval, TimeUnit.SECONDS);
+        } else {
+            s_logger.debug("router.check.interval - " + _routerCheckInterval+ " so not scheduling the redundant router checking thread");
+        }
+
+        return true;
+    }
+
+    @Override
+    public boolean stop() {
+        return true;
+    }
+
+    protected VirtualNetworkApplianceManagerImpl() {
+    }
+
+    @Override
+    public Long convertToId(final String vmName) {
+        if (!VirtualMachineName.isValidRouterName(vmName, _instance)) {
+            return null;
+        }
+
+        return VirtualMachineName.getRouterId(vmName);
+    }
+
+    private VmDataCommand generateVmDataCommand(VirtualRouter router, String vmPrivateIpAddress, String userData, 
+            String serviceOffering, String zoneName, String guestIpAddress, String vmName,
+            String vmInstanceName, long vmId, String publicKey, long guestNetworkId) {
+        VmDataCommand cmd = new VmDataCommand(vmPrivateIpAddress, vmName);
+
+        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId()));
+        cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, getRouterIpInNetwork(guestNetworkId, router.getId()));
+        cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
+
+        DataCenterVO dcVo = _dcDao.findById(router.getDataCenterIdToDeployIn());
+        cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
+
+        cmd.addVmData("userdata", "user-data", userData);
+        cmd.addVmData("metadata", "service-offering", StringUtils.unicodeEscape(serviceOffering));
+        cmd.addVmData("metadata", "availability-zone", StringUtils.unicodeEscape(zoneName));
+        cmd.addVmData("metadata", "local-ipv4", guestIpAddress);
+        cmd.addVmData("metadata", "local-hostname", StringUtils.unicodeEscape(vmName));
+        if (dcVo.getNetworkType() == NetworkType.Basic) {
+            cmd.addVmData("metadata", "public-ipv4", guestIpAddress);
+            cmd.addVmData("metadata", "public-hostname",  StringUtils.unicodeEscape(vmName));
+        } else
+        {
+        	if (router.getPublicIpAddress() == null) {
+        		 cmd.addVmData("metadata", "public-ipv4", guestIpAddress);
+        	} else {
+        		cmd.addVmData("metadata", "public-ipv4", router.getPublicIpAddress());
+        	}
+            cmd.addVmData("metadata", "public-hostname", router.getPublicIpAddress());
+        }
+        cmd.addVmData("metadata", "instance-id", vmInstanceName);
+        cmd.addVmData("metadata", "vm-id", String.valueOf(vmId));
+        cmd.addVmData("metadata", "public-keys", publicKey);
+
+        String cloudIdentifier = _configDao.getValue("cloud.identifier");
+        if (cloudIdentifier == null) {
+            cloudIdentifier = "";
+        } else {
+            cloudIdentifier = "CloudStack-{" + cloudIdentifier + "}";
+        }
+        cmd.addVmData("metadata", "cloud-identifier", cloudIdentifier);
+
+        return cmd;
+    }
+
+    protected class NetworkUsageTask implements Runnable {
+
+        public NetworkUsageTask() {
+        }
+
+        @Override
+        public void run() {
+        	try{
+        		final List<DomainRouterVO> routers = _routerDao.listByStateAndNetworkType(State.Running, GuestType.Isolated, mgmtSrvrId);
+        		s_logger.debug("Found " + routers.size() + " running routers. ");
+
+        		for (DomainRouterVO router : routers) {
+        			String privateIP = router.getPrivateIpAddress();
+
+        			if (privateIP != null) {
+        				List<? extends Nic> routerNics = _nicDao.listByVmId(router.getId());
+        				for (Nic routerNic : routerNics) {
+        					Network network = _networkMgr.getNetwork(routerNic.getNetworkId());
+        					if (network.getTrafficType() == TrafficType.Public) {
+        						boolean forVpc = router.getVpcId() != null;
+        						final NetworkUsageCommand usageCmd = new NetworkUsageCommand(privateIP, router.getHostName(),
+        								forVpc, routerNic.getIp4Address());
+        						UserStatisticsVO previousStats = _statsDao.findBy(router.getAccountId(), 
+        								router.getDataCenterIdToDeployIn(), network.getId(), null, router.getId(), router.getType().toString());
+        						NetworkUsageAnswer answer = null;
+        						try {
+        							answer = (NetworkUsageAnswer) _agentMgr.easySend(router.getHostId(), usageCmd);
+        						} catch (Exception e) {
+        							s_logger.warn("Error while collecting network stats from router: "+router.getInstanceName()+" from host: "+router.getHostId(), e);
+        							continue;
+        						}
+
+        						if (answer != null) {
+        							if (!answer.getResult()) {
+        								s_logger.warn("Error while collecting network stats from router: "+router.getInstanceName()+" from host: "+router.getHostId() + "; details: " + answer.getDetails());
+        								continue;
+        							}
+        							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.getDataCenterIdToDeployIn(), network.getId(), routerNic.getIp4Address(), router.getId(), router.getType().toString());
+        								if (stats == null) {
+        									s_logger.warn("unable to find stats for account: " + router.getAccountId());
+        									continue;
+        								}
+
+        								if(previousStats != null 
+        										&& ((previousStats.getCurrentBytesReceived() != stats.getCurrentBytesReceived()) 
+        												|| (previousStats.getCurrentBytesSent() != stats.getCurrentBytesSent()))){
+        									s_logger.debug("Router stats changed from the time NetworkUsageCommand was sent. " +
+        											"Ignoring current answer. Router: "+answer.getRouterName()+" Rcvd: " + 
+        											answer.getBytesReceived()+ "Sent: " +answer.getBytesSent());
+        									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. Router: " + 
+        												answer.getRouterName()+" 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. Router: " + 
+        												answer.getRouterName()+" 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();
+        							}
+        						}
+        					}
+        				}
+        			}
+        		}
+        	} catch (Exception e) {
+        		s_logger.warn("Error while collecting network stats", e);
         	}
-        }
-    }
-
-    protected class NetworkStatsUpdateTask implements Runnable {
-
-        public NetworkStatsUpdateTask() {
-        }
-
-        @Override
-        public void run() {
-        	GlobalLock scanLock = GlobalLock.getInternLock("network.stats");
-            try {
-                if(scanLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION)) {
-                	//Check for ownership
-                	//msHost in UP state with min id should run the job
-                	ManagementServerHostVO msHost = _msHostDao.findOneInUpState(new Filter(ManagementServerHostVO.class, "id", true, 0L, 1L));
-                	if(msHost == null || (msHost.getMsid() != mgmtSrvrId)){
-                		s_logger.debug("Skipping aggregate network stats update");
-                		scanLock.unlock();
-                		return;
-                	}
-                	Transaction txn = Transaction.open(Transaction.CLOUD_DB);
-                    try {
-                    	txn.start();
-                    	//get all stats with delta > 0
-                    	List<UserStatisticsVO> updatedStats = _statsDao.listUpdatedStats();
-                    	Date updatedTime = new Date();
-                    	for(UserStatisticsVO stat : updatedStats){
-                    		//update agg bytes            		
-                    		stat.setAggBytesReceived(stat.getCurrentBytesReceived() + stat.getNetBytesReceived());
-                    		stat.setAggBytesSent(stat.getCurrentBytesSent() + stat.getNetBytesSent());
-                    		_userStatsDao.update(stat.getId(), stat);
-                    		//insert into op_user_stats_log
-                    		UserStatsLogVO statsLog = new UserStatsLogVO(stat.getId(), stat.getNetBytesReceived(), stat.getNetBytesSent(), stat.getCurrentBytesReceived(), 
-                    													 stat.getCurrentBytesSent(), stat.getAggBytesReceived(), stat.getAggBytesSent(), updatedTime);
-                    		_userStatsLogDao.persist(statsLog);
-                    	}
-                    	s_logger.debug("Successfully updated aggregate network stats");
-                    	txn.commit();
-                    } catch (Exception e){
-                    	txn.rollback();
-                        s_logger.debug("Failed to update aggregate network stats", e);
-                    } finally {
-                        scanLock.unlock();
-                        txn.close();
-                    }
-                }
-            } catch (Exception e){
-                s_logger.debug("Exception while trying to acquire network stats lock", e);
-            }  finally {
-                scanLock.releaseRef();
-            }
-        }
-    }
-
-    @DB
-    protected void updateSite2SiteVpnConnectionState(List<DomainRouterVO> routers) {
-        for (DomainRouterVO router : routers) {
-            List<Site2SiteVpnConnectionVO> conns = _s2sVpnMgr.getConnectionsForRouter(router);
-            if (conns == null || conns.isEmpty()) {
-                continue;
-            }
-            if (router.getState() != State.Running) {
-                for (Site2SiteVpnConnectionVO conn : conns) {
-                    if (conn.getState() != Site2SiteVpnConnection.State.Error) {
-                        conn.setState(Site2SiteVpnConnection.State.Disconnected);
-                        _s2sVpnConnectionDao.persist(conn);
-                    }
-                }
-                continue;
-            }
-            List<String> ipList = new ArrayList<String>();
-            for (Site2SiteVpnConnectionVO conn : conns) {
-                if (conn.getState() != Site2SiteVpnConnection.State.Connected &&
-                        conn.getState() != Site2SiteVpnConnection.State.Disconnected) {
-                    continue;
-                }
-                Site2SiteCustomerGateway gw = _s2sCustomerGatewayDao.findById(conn.getCustomerGatewayId());
-                ipList.add(gw.getGatewayIp());
-            }
-            String privateIP = router.getPrivateIpAddress();
-            HostVO host = _hostDao.findById(router.getHostId());
-            if (host == null || host.getStatus() != Status.Up) {
-                continue;
-            } else if (host.getManagementServerId() != ManagementServerNode.getManagementServerId()) {
-                /* Only cover hosts managed by this management server */
-                continue;
-            } else if (privateIP != null) {
-                final CheckS2SVpnConnectionsCommand command = new CheckS2SVpnConnectionsCommand(ipList);
-                command.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId()));
-                command.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
-                command.setWait(30);
-                final Answer origAnswer = _agentMgr.easySend(router.getHostId(), command);
-                CheckS2SVpnConnectionsAnswer answer = null;
-                if (origAnswer instanceof CheckS2SVpnConnectionsAnswer) {
-                    answer = (CheckS2SVpnConnectionsAnswer)origAnswer;
-                } else {
-                    s_logger.warn("Unable to update router " + router.getHostName() + "'s VPN connection status");
-                    continue;
-                }
-                if (!answer.getResult()) {
-                    s_logger.warn("Unable to update router " + router.getHostName() + "'s VPN connection status");
-                    continue;
-                }
-                for (Site2SiteVpnConnectionVO conn : conns) {
+        }
+    }
+
+    protected class NetworkStatsUpdateTask implements Runnable {
+
+        public NetworkStatsUpdateTask() {
+        }
+
+        @Override
+        public void run() {
+        	GlobalLock scanLock = GlobalLock.getInternLock("network.stats");
+            try {
+                if(scanLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION)) {
+                	//Check for ownership
+                	//msHost in UP state with min id should run the job
+                	ManagementServerHostVO msHost = _msHostDao.findOneInUpState(new Filter(ManagementServerHostVO.class, "id", true, 0L, 1L));
+                	if(msHost == null || (msHost.getMsid() != mgmtSrvrId)){
+                		s_logger.debug("Skipping aggregate network stats update");
+                		scanLock.unlock();
+                		return;
+                	}
+                	Transaction txn = Transaction.open(Transaction.CLOUD_DB);
+                    try {
+                    	txn.start();
+                    	//get all stats with delta > 0
+                    	List<UserStatisticsVO> updatedStats = _statsDao.listUpdatedStats();
+                    	Date updatedTime = new Date();
+                    	for(UserStatisticsVO stat : updatedStats){
+                    		//update agg bytes            		
+                    		stat.setAggBytesReceived(stat.getCurrentBytesReceived() + stat.getNetBytesReceived());
+                    		stat.setAggBytesSent(stat.getCurrentBytesSent() + stat.getNetBytesSent());
+                    		_userStatsDao.update(stat.getId(), stat);
+                    		//insert into op_user_stats_log
+                    		UserStatsLogVO statsLog = new UserStatsLogVO(stat.getId(), stat.getNetBytesReceived(), stat.getNetBytesSent(), stat.getCurrentBytesReceived(), 
+                    													 stat.getCurrentBytesSent(), stat.getAggBytesReceived(), stat.getAggBytesSent(), updatedTime);
+                    		_userStatsLogDao.persist(statsLog);
+                    	}
+                    	s_logger.debug("Successfully updated aggregate network stats");
+                    	txn.commit();
+                    } catch (Exception e){
+                    	txn.rollback();
+                        s_logger.debug("Failed to update aggregate network stats", e);
+                    } finally {
+                        scanLock.unlock();
+                        txn.close();
+                    }
+                }
+            } catch (Exception e){
+                s_logger.debug("Exception while trying to acquire network stats lock", e);
+            }  finally {
+                scanLock.releaseRef();
+            }
+        }
+    }
+
+    @DB
+    protected void updateSite2SiteVpnConnectionState(List<DomainRouterVO> routers) {
+        for (DomainRouterVO router : routers) {
+            List<Site2SiteVpnConnectionVO> conns = _s2sVpnMgr.getConnectionsForRouter(router);
+            if (conns == null || conns.isEmpty()) {
+                continue;
+            }
+            if (router.getState() != State.Running) {
+                for (Site2SiteVpnConnectionVO conn : conns) {
+                    if (conn.getState() != Site2SiteVpnConnection.State.Error) {
+                        conn.setState(Site2SiteVpnConnection.State.Disconnected);
+                        _s2sVpnConnectionDao.persist(conn);
+                    }
+                }
+                continue;
+            }
+            List<String> ipList = new ArrayList<String>();
+            for (Site2SiteVpnConnectionVO conn : conns) {
+                if (conn.getState() != Site2SiteVpnConnection.State.Connected &&
+                        conn.getState() != Site2SiteVpnConnection.State.Disconnected) {
+                    continue;
+                }
+                Site2SiteCustomerGateway gw = _s2sCustomerGatewayDao.findById(conn.getCustomerGatewayId());
+                ipList.add(gw.getGatewayIp());
+            }
+            String privateIP = router.getPrivateIpAddress();
+            HostVO host = _hostDao.findById(router.getHostId());
+            if (host == null || host.getStatus() != Status.Up) {
+                continue;
+            } else if (host.getManagementServerId() != ManagementServerNode.getManagementServerId()) {
+                /* Only cover hosts managed by this management server */
+                continue;
+            } else if (privateIP != null) {
+                final CheckS2SVpnConnectionsCommand command = new CheckS2SVpnConnectionsCommand(ipList);
+                command.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId()));
+                command.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
+                command.setWait(30);
+                final Answer origAnswer = _agentMgr.easySend(router.getHostId(), command);
+                CheckS2SVpnConnectionsAnswer answer = null;
+                if (origAnswer instanceof CheckS2SVpnConnectionsAnswer) {
+                    answer = (CheckS2SVpnConnectionsAnswer)origAnswer;
+                } else {
+                    s_logger.warn("Unable to update router " + router.getHostName() + "'s VPN connection status");
+                    continue;
+                }
+                if (!answer.getResult()) {
+                    s_logger.warn("Unable to update router " + router.getHostName() + "'s VPN connection status");
+                    continue;
+                }
+                for (Site2SiteVpnConnectionVO conn : conns) {
                     Site2SiteVpnConnectionVO lock = _s2sVpnConnectionDao.acquireInLockTable(conn.getId());
                     if (lock == null) {
                         throw new CloudRuntimeException("Unable to acquire lock on " + lock);
-                    }
+                    }
                     try {
-                        if (conn.getState() != Site2SiteVpnConnection.State.Connected &&
-                                conn.getState() != Site2SiteVpnConnection.State.Disconnected) {
-                            continue;
-                        }
-                        Site2SiteVpnConnection.State oldState = conn.getState();
-                        Site2SiteCustomerGateway gw = _s2sCustomerGatewayDao.findBy

<TRUNCATED>