cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [2/2] git commit: updated refs/heads/internallb to a3321ce
Date Thu, 18 Apr 2013 20:47:47 GMT
Internal LB : renamed the classes responsible for managing internal lb elements. Now the names are InternalLoadBalancerVMManager, InternalLoadBalancerVMService and InternalLoadBalancerVMManagerImpl


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a3321ce6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a3321ce6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a3321ce6

Branch: refs/heads/internallb
Commit: a3321ce617eab795288ab75357345d45794db93d
Parents: 2baf7c3
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Thu Apr 18 13:31:16 2013 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Thu Apr 18 13:41:55 2013 -0700

----------------------------------------------------------------------
 api/src/org/apache/cloudstack/api/BaseCmd.java     |    4 +-
 .../network/lb/InternalLoadBalancerService.java    |   34 -
 .../network/lb/InternalLoadBalancerVMService.java  |   34 +
 client/tomcatconf/applicationContext.xml.in        |    2 +-
 .../element/InternalLoadBalancerElement.java       |    4 +-
 .../network/lb/InternalLoadBalancerManager.java    |   86 --
 .../lb/InternalLoadBalancerManagerImpl.java        |  910 ---------------
 .../network/lb/InternalLoadBalancerVMManager.java  |   86 ++
 .../lb/InternalLoadBalancerVMManagerImpl.java      |  910 +++++++++++++++
 9 files changed, 1035 insertions(+), 1035 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a3321ce6/api/src/org/apache/cloudstack/api/BaseCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseCmd.java b/api/src/org/apache/cloudstack/api/BaseCmd.java
index beebe5b..e66e522 100644
--- a/api/src/org/apache/cloudstack/api/BaseCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseCmd.java
@@ -30,7 +30,7 @@ import javax.inject.Inject;
 import org.apache.cloudstack.affinity.AffinityGroupService;
 import org.apache.cloudstack.network.element.InternalLoadBalancerElementService;
 import org.apache.cloudstack.network.lb.ApplicationLoadBalancerService;
-import org.apache.cloudstack.network.lb.InternalLoadBalancerService;
+import org.apache.cloudstack.network.lb.InternalLoadBalancerVMService;
 import org.apache.cloudstack.query.QueryService;
 import org.apache.cloudstack.usage.UsageService;
 import org.apache.log4j.Logger;
@@ -142,7 +142,7 @@ public abstract class BaseCmd {
     @Inject public ApplicationLoadBalancerService _appLbService;
     @Inject public AffinityGroupService _affinityGroupService;
     @Inject public InternalLoadBalancerElementService _internalLbElementSvc;
-    @Inject public InternalLoadBalancerService _internalLbSvc;
+    @Inject public InternalLoadBalancerVMService _internalLbSvc;
     
 
     public abstract void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a3321ce6/api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerService.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerService.java b/api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerService.java
deleted file mode 100644
index f908936..0000000
--- a/api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-// 
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package org.apache.cloudstack.network.lb;
-
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.exception.StorageUnavailableException;
-import com.cloud.network.router.VirtualRouter;
-import com.cloud.user.Account;
-
-public interface InternalLoadBalancerService {
-
-    VirtualRouter startInternalLbVm(long internalLbVmId, Account caller, long callerUserId) 
-            throws StorageUnavailableException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException;
-
-    VirtualRouter stopInternalLbVm(long vmId, boolean forced, Account caller, long callerUserId)
-            throws ConcurrentOperationException, ResourceUnavailableException;
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a3321ce6/api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java b/api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java
new file mode 100644
index 0000000..91cd88d
--- /dev/null
+++ b/api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java
@@ -0,0 +1,34 @@
+// 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 org.apache.cloudstack.network.lb;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.exception.StorageUnavailableException;
+import com.cloud.network.router.VirtualRouter;
+import com.cloud.user.Account;
+
+public interface InternalLoadBalancerVMService {
+
+    VirtualRouter startInternalLbVm(long internalLbVmId, Account caller, long callerUserId) 
+            throws StorageUnavailableException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException;
+
+    VirtualRouter stopInternalLbVm(long vmId, boolean forced, Account caller, long callerUserId)
+            throws ConcurrentOperationException, ResourceUnavailableException;
+
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a3321ce6/client/tomcatconf/applicationContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in
index 1617167..84a7f50 100644
--- a/client/tomcatconf/applicationContext.xml.in
+++ b/client/tomcatconf/applicationContext.xml.in
@@ -792,7 +792,7 @@
   <bean id="volumeManagerImpl" class="com.cloud.storage.VolumeManagerImpl" />
   <bean id="ClassicalPrimaryDataStoreProvider" class="org.apache.cloudstack.storage.datastore.provider.CloudStackPrimaryDataStoreProviderImpl" />
   <bean id="ApplicationLoadBalancerService" class="org.apache.cloudstack.network.lb.ApplicationLoadBalancerManagerImpl" />
-  <bean id="InternalLoadBalancerManager" class="org.apache.cloudstack.network.lb.InternalLoadBalancerManagerImpl" />
+  <bean id="InternalLoadBalancerVMManager" class="org.apache.cloudstack.network.lb.InternalLoadBalancerVMManagerImpl" />
 
 
 <!--=======================================================================================================-->

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a3321ce6/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java
index 2d10e51..3857730 100644
--- a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java
+++ b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java
@@ -30,7 +30,7 @@ import javax.inject.Inject;
 import org.apache.cloudstack.api.command.admin.internallb.ConfigureInternalLoadBalancerElementCmd;
 import org.apache.cloudstack.api.command.admin.internallb.CreateInternalLoadBalancerElementCmd;
 import org.apache.cloudstack.api.command.admin.internallb.ListInternalLoadBalancerElementsCmd;
-import org.apache.cloudstack.network.lb.InternalLoadBalancerManager;
+import org.apache.cloudstack.network.lb.InternalLoadBalancerVMManager;
 import org.apache.cloudstack.network.lb.dao.ApplicationLoadBalancerRuleDao;
 import org.apache.log4j.Logger;
 
@@ -95,7 +95,7 @@ public class InternalLoadBalancerElement extends AdapterBase implements LoadBala
     @Inject DomainRouterDao _routerDao;
     @Inject VirtualRouterProviderDao _vrProviderDao;
     @Inject PhysicalNetworkServiceProviderDao _pNtwkSvcProviderDao;
-    @Inject InternalLoadBalancerManager _internalLbMgr;
+    @Inject InternalLoadBalancerVMManager _internalLbMgr;
     @Inject ConfigurationManager _configMgr;
     @Inject AccountManager _accountMgr;
     @Inject ApplicationLoadBalancerRuleDao _appLbDao;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a3321ce6/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerManager.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerManager.java b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerManager.java
deleted file mode 100644
index c3cccb3..0000000
--- a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerManager.java
+++ /dev/null
@@ -1,86 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-// 
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package org.apache.cloudstack.network.lb;
-
-import java.util.List;
-import java.util.Map;
-
-import com.cloud.deploy.DeployDestination;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.Network;
-import com.cloud.network.lb.LoadBalancingRule;
-import com.cloud.network.router.VirtualRouter;
-import com.cloud.user.Account;
-import com.cloud.utils.component.Manager;
-import com.cloud.utils.net.Ip;
-import com.cloud.vm.VirtualMachineProfile.Param;
-
-public interface InternalLoadBalancerManager extends Manager, InternalLoadBalancerService{
-    /**
-     * Destroys Internal LB vm instance
-     * @param vmId
-     * @param caller
-     * @param callerUserId
-     * @return 
-     * @throws ResourceUnavailableException
-     * @throws ConcurrentOperationException
-     */
-    boolean destroyInternalLbVm(long vmId, Account caller, Long callerUserId) 
-            throws ResourceUnavailableException, ConcurrentOperationException;
-
-
-    /**
-     * Deploys internal lb vm
-     * @param guestNetwork
-     * @param requestedGuestIp
-     * @param dest
-     * @param owner
-     * @param params
-     * @return
-     * @throws InsufficientCapacityException
-     * @throws ConcurrentOperationException
-     * @throws ResourceUnavailableException
-     */
-    List<? extends VirtualRouter> deployInternalLbVm(Network guestNetwork, Ip requestedGuestIp, DeployDestination dest, Account owner,
-            Map<Param, Object> params) throws InsufficientCapacityException,
-            ConcurrentOperationException, ResourceUnavailableException;
-
-
-
-    /**
-     * 
-     * @param network
-     * @param rules
-     * @param internalLbVms
-     * @return
-     * @throws ResourceUnavailableException
-     */
-    boolean applyLoadBalancingRules(Network network, List<LoadBalancingRule> rules, List<? extends VirtualRouter> internalLbVms)
-            throws ResourceUnavailableException;
-
-
-    /**
-     * Returns existing Internal Load Balancer elements based on guestNetworkId (requried) and requestedIp (optional)
-     * @param guestNetworkId
-     * @param requestedGuestIp
-     * @return
-     */
-    List<? extends VirtualRouter> findInternalLbVms(long guestNetworkId, Ip requestedGuestIp);
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a3321ce6/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerManagerImpl.java b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerManagerImpl.java
deleted file mode 100644
index 2471c49..0000000
--- a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerManagerImpl.java
+++ /dev/null
@@ -1,910 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-// 
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package org.apache.cloudstack.network.lb;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.ejb.Local;
-import javax.inject.Inject;
-import javax.naming.ConfigurationException;
-
-import org.apache.cloudstack.network.lb.dao.ApplicationLoadBalancerRuleDao;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
-import com.cloud.agent.AgentManager;
-import com.cloud.agent.AgentManager.OnError;
-import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.GetDomRVersionAnswer;
-import com.cloud.agent.api.GetDomRVersionCmd;
-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.LoadBalancerConfigCommand;
-import com.cloud.agent.api.routing.NetworkElementCommand;
-import com.cloud.agent.api.to.LoadBalancerTO;
-import com.cloud.agent.api.to.NicTO;
-import com.cloud.agent.api.to.VirtualMachineTO;
-import com.cloud.agent.manager.Commands;
-import com.cloud.configuration.Config;
-import com.cloud.configuration.dao.ConfigurationDao;
-import com.cloud.dc.DataCenter;
-import com.cloud.dc.DataCenterVO;
-import com.cloud.dc.dao.DataCenterDao;
-import com.cloud.deploy.DataCenterDeployment;
-import com.cloud.deploy.DeployDestination;
-import com.cloud.deploy.DeploymentPlan;
-import com.cloud.exception.AgentUnavailableException;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientAddressCapacityException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.InsufficientServerCapacityException;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.OperationTimedoutException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.exception.StorageUnavailableException;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.network.Network;
-import com.cloud.network.Network.Provider;
-import com.cloud.network.Network.Service;
-import com.cloud.network.NetworkManager;
-import com.cloud.network.NetworkModel;
-import com.cloud.network.Networks.TrafficType;
-import com.cloud.network.PhysicalNetworkServiceProvider;
-import com.cloud.network.VirtualRouterProvider;
-import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType;
-import com.cloud.network.dao.NetworkDao;
-import com.cloud.network.dao.NetworkVO;
-import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
-import com.cloud.network.dao.VirtualRouterProviderDao;
-import com.cloud.network.lb.LoadBalancingRule;
-import com.cloud.network.lb.LoadBalancingRule.LbDestination;
-import com.cloud.network.lb.LoadBalancingRule.LbHealthCheckPolicy;
-import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy;
-import com.cloud.network.lb.LoadBalancingRulesManager;
-import com.cloud.network.router.VirtualNetworkApplianceManager;
-import com.cloud.network.router.VirtualRouter;
-import com.cloud.network.router.VirtualRouter.RedundantState;
-import com.cloud.network.router.VirtualRouter.Role;
-import com.cloud.network.rules.FirewallRule;
-import com.cloud.offering.NetworkOffering;
-import com.cloud.offering.ServiceOffering;
-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.VMTemplateVO;
-import com.cloud.storage.dao.VMTemplateDao;
-import com.cloud.user.Account;
-import com.cloud.user.AccountManager;
-import com.cloud.user.User;
-import com.cloud.utils.NumbersUtil;
-import com.cloud.utils.Pair;
-import com.cloud.utils.component.ManagerBase;
-import com.cloud.utils.db.DB;
-import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.utils.net.Ip;
-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.VirtualMachine;
-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;
-
-@Component
-@Local(value = { InternalLoadBalancerManager.class, InternalLoadBalancerService.class})
-public class InternalLoadBalancerManagerImpl extends ManagerBase implements
-InternalLoadBalancerManager, VirtualMachineGuru<DomainRouterVO> {
-    private static final Logger s_logger = Logger
-            .getLogger(InternalLoadBalancerManagerImpl.class);
-    private String _instance;
-    private String _mgmtHost;
-    private String _mgmtCidr;
-    int _internalLbVmRamSize;
-    int _internalLbVmCpuMHz;
-    private ServiceOfferingVO _internalLbVmOffering;
-    
-    @Inject VirtualMachineManager _itMgr;
-    @Inject DomainRouterDao _routerDao;
-    @Inject ConfigurationDao _configDao;
-    @Inject AgentManager _agentMgr;
-    @Inject DataCenterDao _dcDao;
-    @Inject VirtualRouterProviderDao _vrProviderDao;
-    @Inject ApplicationLoadBalancerRuleDao _lbDao;
-    @Inject NetworkModel _ntwkModel;
-    @Inject LoadBalancingRulesManager _lbMgr;
-    @Inject NicDao _nicDao;
-    @Inject AccountManager _accountMgr;
-    @Inject NetworkDao _networkDao;
-    @Inject NetworkManager _ntwkMgr;
-    @Inject ServiceOfferingDao _serviceOfferingDao;
-    @Inject PhysicalNetworkServiceProviderDao _physicalProviderDao;
-    @Inject NetworkOfferingDao _networkOfferingDao;
-    @Inject VMTemplateDao _templateDao;
-    @Inject ResourceManager _resourceMgr;
-
-    @Override
-    public DomainRouterVO findByName(String name) {
-        if (!VirtualMachineName.isValidRouterName(name)) {
-            return null;
-        }
-
-        return _routerDao.findById(VirtualMachineName.getRouterId(name));
-    }
-
-    @Override
-    public DomainRouterVO findById(long id) {
-        return _routerDao.findById(id);
-    }
-
-    @Override
-    public DomainRouterVO persist(DomainRouterVO vm) {
-        DomainRouterVO virtualRouter =  _routerDao.persist(vm);
-        return virtualRouter;
-    }
-
-    @Override
-    public boolean finalizeVirtualMachineProfile(VirtualMachineProfile<DomainRouterVO> profile,
-            DeployDestination dest, ReservationContext context) {
-
-        //1) Prepare boot loader elements related with Control network
-
-        StringBuilder buf = profile.getBootArgsBuilder();
-        buf.append(" template=domP");
-        buf.append(" name=").append(profile.getHostName());
-
-        if (Boolean.valueOf(_configDao.getValue("system.vm.random.password"))) {
-            buf.append(" vmpassword=").append(_configDao.getValue("system.vm.password"));
-        }
-        
-        NicProfile controlNic = null;
-      
-        for (NicProfile nic : profile.getNics()) {
-            int deviceId = nic.getDeviceId();
-            boolean ipv4 = false, ipv6 = false;
-            if (nic.getIp4Address() != null) {
-                ipv4 = true;
-                buf.append(" eth").append(deviceId).append("ip=").append(nic.getIp4Address());
-                buf.append(" eth").append(deviceId).append("mask=").append(nic.getNetmask());
-            }
-            if (nic.getIp6Address() != null) {
-                ipv6 = true;
-                buf.append(" eth").append(deviceId).append("ip6=").append(nic.getIp6Address());
-                buf.append(" eth").append(deviceId).append("ip6prelen=").append(NetUtils.getIp6CidrSize(nic.getIp6Cidr()));
-            }
-            
-            if (nic.isDefaultNic()) {
-                if (ipv4) {
-                    buf.append(" gateway=").append(nic.getGateway());
-                }
-                if (ipv6) {
-                    buf.append(" ip6gateway=").append(nic.getIp6Gateway());
-                }
-            }
-
-            if (nic.getTrafficType() == TrafficType.Management) {
-                buf.append(" localgw=").append(dest.getPod().getGateway());
-            } else if (nic.getTrafficType() == TrafficType.Control) {
-                controlNic = nic;
-                // Internal LB control command is sent over management server in VMware
-                if (dest.getHost().getHypervisorType() == HypervisorType.VMware) {
-                    if (s_logger.isInfoEnabled()) {
-                        s_logger.info("Check if we need to add management server explicit route to Internal LB. pod cidr: " 
-                                + dest.getPod().getCidrAddress() + "/" + dest.getPod().getCidrSize()
-                                + ", pod gateway: " + dest.getPod().getGateway() + ", management host: " + _mgmtHost);
-                    }
-
-                    if (s_logger.isInfoEnabled()) {
-                        s_logger.info("Add management server explicit route to Internal LB.");
-                    }
-                    
-               
-                    buf.append(" mgmtcidr=").append(_mgmtCidr);
-                    buf.append(" localgw=").append(dest.getPod().getGateway());
-                }
-            }
-        }
-
-        if (controlNic == null) {
-            throw new CloudRuntimeException("Didn't start a control port");
-        }
-
-        //FIXME - change if use other template for internal lb vm
-        String type = "vpcrouter";
-        buf.append(" type=" + type);
-
-        if (s_logger.isDebugEnabled()) {
-            s_logger.debug("Boot Args for " + profile + ": " + buf.toString());
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean finalizeDeployment(Commands cmds, VirtualMachineProfile<DomainRouterVO> profile, DeployDestination dest, ReservationContext context) throws ResourceUnavailableException {
-        DomainRouterVO internalLbVm = profile.getVirtualMachine();
-
-        List<NicProfile> nics = profile.getNics();
-        for (NicProfile nic : nics) {
-            if (nic.getTrafficType() == TrafficType.Control) {
-                internalLbVm.setPrivateIpAddress(nic.getIp4Address());
-                internalLbVm.setPrivateMacAddress(nic.getMacAddress());
-            }
-        }
-        _routerDao.update(internalLbVm.getId(), internalLbVm);
-
-        finalizeCommandsOnStart(cmds, profile);
-        return true;
-    }
-
-    @Override
-    public boolean finalizeStart(VirtualMachineProfile<DomainRouterVO> profile, long hostId, Commands cmds, ReservationContext context) {
-        DomainRouterVO internalLbVm = profile.getVirtualMachine();
-        
-        boolean result = true;
-
-        Answer answer = cmds.getAnswer("checkSsh");
-        if (answer != null && answer instanceof CheckSshAnswer) {
-            CheckSshAnswer sshAnswer = (CheckSshAnswer) answer;
-            if (sshAnswer == null || !sshAnswer.getResult()) {
-                s_logger.warn("Unable to ssh to the VM: " + sshAnswer.getDetails());
-                result = false;
-            }
-        } else {
-            result = false;
-        }
-        if (result == false) {
-            return result;
-        }
-        
-        //Get guest network info
-        List<Network> guestNetworks = new ArrayList<Network>();
-        List<? extends Nic> internalLbNics = _nicDao.listByVmId(profile.getId());
-        for (Nic routerNic : internalLbNics) {
-            Network network = _ntwkModel.getNetwork(routerNic.getNetworkId());
-            if (network.getTrafficType() == TrafficType.Guest) {
-                guestNetworks.add(network);
-            }
-        }
-        
-        answer = cmds.getAnswer("getDomRVersion");
-        if (answer != null && answer instanceof GetDomRVersionAnswer) {
-            GetDomRVersionAnswer versionAnswer = (GetDomRVersionAnswer)answer;
-            if (answer == null || !answer.getResult()) {
-                s_logger.warn("Unable to get the template/scripts version of router " + internalLbVm.getInstanceName() +
-                        " due to: " + versionAnswer.getDetails());
-                result = false;
-            } else {
-                internalLbVm.setTemplateVersion(versionAnswer.getTemplateVersion());
-                internalLbVm.setScriptsVersion(versionAnswer.getScriptsVersion());
-                internalLbVm = _routerDao.persist(internalLbVm, guestNetworks);
-            }
-        } else {
-            result = false;
-        }
-
-        return result;
-    }
-
-    @Override
-    public boolean finalizeCommandsOnStart(Commands cmds, VirtualMachineProfile<DomainRouterVO> profile) {
-        DomainRouterVO internalLbVm = profile.getVirtualMachine();
-        NicProfile controlNic = getNicProfileByTrafficType(profile, TrafficType.Control);
-
-        if (controlNic == null) {
-            s_logger.error("Control network doesn't exist for the internal LB vm " + internalLbVm);
-            return false;
-        }
-
-        finalizeSshAndVersionOnStart(cmds, profile, internalLbVm, controlNic);
-
-        // restart network if restartNetwork = false is not specified in profile parameters
-        boolean reprogramGuestNtwk = true;
-        if (profile.getParameter(Param.ReProgramGuestNetworks) != null 
-                && (Boolean) profile.getParameter(Param.ReProgramGuestNetworks) == false) {
-            reprogramGuestNtwk = false;
-        }
-
-        VirtualRouterProvider lbProvider = _vrProviderDao.findById(internalLbVm.getElementId());
-        if (lbProvider == null) {
-            throw new CloudRuntimeException("Cannot find related element " + VirtualRouterProviderType.InternalLbVm + " of vm: " + internalLbVm.getHostName());
-        }
-        
-        Provider provider = Network.Provider.getProvider(lbProvider.getType().toString());
-        if (provider == null) {
-            throw new CloudRuntimeException("Cannot find related provider of provider: " + lbProvider.getType().toString());
-        }
-
-        if (reprogramGuestNtwk) {
-            NicProfile guestNic = getNicProfileByTrafficType(profile, TrafficType.Guest);
-            finalizeLbRulesForIp(cmds, internalLbVm, provider, new Ip(guestNic.getIp4Address()), guestNic.getNetworkId());
-        }
-
-        return true;
-    }
-
-    @Override
-    public void finalizeStop(VirtualMachineProfile<DomainRouterVO> profile, StopAnswer answer) {
-    }
-
-    @Override
-    public void finalizeExpunge(DomainRouterVO vm) {
-    }
-
-    @Override
-    public Long convertToId(String vmName) {
-        if (!VirtualMachineName.isValidRouterName(vmName, _instance)) {
-            return null;
-        }
-
-        return VirtualMachineName.getRouterId(vmName);
-    }
-
-    @Override
-    public boolean plugNic(Network network, NicTO nic, VirtualMachineTO vm, ReservationContext context, DeployDestination dest) throws ConcurrentOperationException, ResourceUnavailableException,
-            InsufficientCapacityException {        
-        //not supported
-        throw new UnsupportedOperationException("Plug nic is not supported for vm of type " + vm.getType());
-    }
-
-    @Override
-    public boolean unplugNic(Network network, NicTO nic, VirtualMachineTO vm, ReservationContext context, DeployDestination dest) throws ConcurrentOperationException, ResourceUnavailableException {
-        //not supported
-        throw new UnsupportedOperationException("Unplug nic is not supported for vm of type " + vm.getType());
-    }
-
-    @Override
-    public void prepareStop(VirtualMachineProfile<DomainRouterVO> profile) {
-    }
-    
-    @Override
-    public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
-        final Map<String, String> configs = _configDao.getConfiguration("AgentManager", params);
-        _instance = configs.get("instance.name");
-        if (_instance == null) {
-            _instance = "DEFAULT";
-        }
-        
-        _mgmtHost = configs.get("host");
-        
-        _mgmtCidr = _configDao.getValue(Config.ManagementNetwork.key());
-        
-        _internalLbVmRamSize = NumbersUtil.parseInt(configs.get("router.ram.size"), VirtualNetworkApplianceManager.DEFAULT_ROUTER_VM_RAMSIZE);
-        _internalLbVmCpuMHz = NumbersUtil.parseInt(configs.get("router.cpu.mhz"), VirtualNetworkApplianceManager.DEFAULT_ROUTER_CPU_MHZ);
-        
-        boolean useLocalStorage = Boolean.parseBoolean(configs.get(Config.SystemVMUseLocalStorage.key()));
-        _internalLbVmOffering = new ServiceOfferingVO("System Offering For Software Router", 1, _internalLbVmRamSize, _internalLbVmCpuMHz, null,
-                null, true, null, useLocalStorage, true, null, true, VirtualMachine.Type.DomainRouter, true);
-        _internalLbVmOffering.setUniqueName(ServiceOffering.routerDefaultOffUniqueName);
-        _internalLbVmOffering = _serviceOfferingDao.persistSystemServiceOffering(_internalLbVmOffering);
-        
-        _itMgr.registerGuru(VirtualMachine.Type.InternalLoadBalancerVm, this);
-
-        if (s_logger.isInfoEnabled()) {
-            s_logger.info(getName()  +  " has been configured");
-        }
-        
-        return true;
-    }
-    
-    @Override
-    public String getName() {
-        return _name;
-    }
-    
-    protected NicProfile getNicProfileByTrafficType(VirtualMachineProfile<DomainRouterVO> profile, TrafficType trafficType) {
-        for (NicProfile nic : profile.getNics()) {
-            if (nic.getTrafficType() == trafficType && nic.getIp4Address() != null) {
-                return nic;
-            }
-        }
-        return null;
-     }
-    
-    protected void finalizeSshAndVersionOnStart(Commands cmds, VirtualMachineProfile<DomainRouterVO> profile, DomainRouterVO router, NicProfile controlNic) {
-        cmds.addCommand("checkSsh", new CheckSshCommand(profile.getInstanceName(), controlNic.getIp4Address(), 3922));
-
-        // Update internal lb vm template/scripts version
-        final GetDomRVersionCmd command = new GetDomRVersionCmd();
-        command.setAccessDetail(NetworkElementCommand.ROUTER_IP, controlNic.getIp4Address());
-        command.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
-        cmds.addCommand("getDomRVersion", command);
-    }
-    
-    
-    protected void finalizeLbRulesForIp(Commands cmds, DomainRouterVO internalLbVm, Provider provider, Ip sourceIp, long guestNtwkId) {
-        s_logger.debug("Resending load balancing rules as a part of start for " + internalLbVm);
-        List<ApplicationLoadBalancerRuleVO> lbs = _lbDao.listBySrcIpSrcNtwkId(sourceIp, guestNtwkId);
-        List<LoadBalancingRule> lbRules = new ArrayList<LoadBalancingRule>();
-        if (_ntwkModel.isProviderSupportServiceInNetwork(guestNtwkId, Service.Lb, provider)) {
-            // Re-apply load balancing rules
-            for (ApplicationLoadBalancerRuleVO lb : lbs) {
-                List<LbDestination> dstList = _lbMgr.getExistingDestinations(lb.getId());
-                List<LbStickinessPolicy> policyList = _lbMgr.getStickinessPolicies(lb.getId());
-                List<LbHealthCheckPolicy> hcPolicyList = _lbMgr.getHealthCheckPolicies(lb.getId());
-                LoadBalancingRule loadBalancing = new LoadBalancingRule(lb, dstList, policyList, hcPolicyList, sourceIp);
-                lbRules.add(loadBalancing);
-            }
-        }
-
-        s_logger.debug("Found " + lbRules.size() + " load balancing rule(s) to apply as a part of Intenrnal LB vm" + internalLbVm + " start.");
-        if (!lbRules.isEmpty()) {
-            createApplyLoadBalancingRulesCommands(lbRules, internalLbVm, cmds, guestNtwkId);
-        }
-    }
-    
-    private void createApplyLoadBalancingRulesCommands(List<LoadBalancingRule> rules, VirtualRouter internalLbVm, Commands cmds, long guestNetworkId) {
-
-        LoadBalancerTO[] lbs = new LoadBalancerTO[rules.size()];
-        int i = 0;
-        boolean inline = false;
-        for (LoadBalancingRule rule : rules) {
-            boolean revoked = (rule.getState().equals(FirewallRule.State.Revoke));
-            String protocol = rule.getProtocol();
-            String algorithm = rule.getAlgorithm();
-            String uuid = rule.getUuid();
-
-            String srcIp = rule.getSourceIp().addr();
-            int srcPort = rule.getSourcePortStart();
-            List<LbDestination> destinations = rule.getDestinations();
-            List<LbStickinessPolicy> stickinessPolicies = rule.getStickinessPolicies();
-            LoadBalancerTO lb = new LoadBalancerTO(uuid, srcIp, srcPort, protocol, algorithm, revoked, false, inline, destinations, stickinessPolicies);
-            lbs[i++] = lb;
-        }
-        
-        Network guestNetwork = _ntwkModel.getNetwork(guestNetworkId);
-        Nic guestNic = _nicDao.findByInstanceIdAndNetworkId(guestNetwork.getId(), internalLbVm.getId());
-        NicProfile guestNicProfile = new NicProfile(guestNic, guestNetwork, guestNic.getBroadcastUri(), guestNic.getIsolationUri(), 
-                _ntwkModel.getNetworkRate(guestNetwork.getId(), internalLbVm.getId()), 
-                _ntwkModel.isSecurityGroupSupportedInNetwork(guestNetwork), 
-                _ntwkModel.getNetworkTag(internalLbVm.getHypervisorType(), guestNetwork));
-
-        //FIXME - for ha proxy 
-        LoadBalancerConfigCommand cmd = new LoadBalancerConfigCommand(lbs, guestNic.getIp4Address(), 
-                guestNic.getIp4Address(), internalLbVm.getPrivateIpAddress(), 
-                _itMgr.toNicTO(guestNicProfile, internalLbVm.getHypervisorType()), internalLbVm.getVpcId());
-
-        cmd.lbStatsVisibility = _configDao.getValue(Config.NetworkLBHaproxyStatsVisbility.key());
-        cmd.lbStatsUri = _configDao.getValue(Config.NetworkLBHaproxyStatsUri.key());
-        cmd.lbStatsAuth = _configDao.getValue(Config.NetworkLBHaproxyStatsAuth.key());
-        cmd.lbStatsPort = _configDao.getValue(Config.NetworkLBHaproxyStatsPort.key());
-
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getInternalLbControlIp(internalLbVm.getId()));
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, guestNic.getIp4Address());
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, internalLbVm.getInstanceName());
-        DataCenterVO dcVo = _dcDao.findById(internalLbVm.getDataCenterId());
-        cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
-        cmds.addCommand(cmd);
-    }
-    
-    
-    protected String getInternalLbControlIp(long internalLbVmId) {
-        String controlIpAddress = null;
-        List<NicVO> nics = _nicDao.listByVmId(internalLbVmId);
-        for (NicVO nic : nics) {
-            Network ntwk = _ntwkModel.getNetwork(nic.getNetworkId());
-            if (ntwk.getTrafficType() == TrafficType.Control) {
-                controlIpAddress = nic.getIp4Address();
-            }
-        }
-        
-        if(controlIpAddress == null) {
-            s_logger.warn("Unable to find Internal LB control ip in its attached NICs!. Internal LB vm: " + internalLbVmId);
-            DomainRouterVO internalLbVm = _routerDao.findById(internalLbVmId);
-            return internalLbVm.getPrivateIpAddress();
-        }
-            
-        return controlIpAddress;
-    }
-
-    @Override
-    public boolean destroyInternalLbVm(long vmId, Account caller, Long callerUserId)
-            throws ResourceUnavailableException, ConcurrentOperationException {
-        if (s_logger.isDebugEnabled()) {
-            s_logger.debug("Attempting to destroy Internal LB vm " + vmId);
-        }
-
-        DomainRouterVO internalLbVm = _routerDao.findById(vmId);
-        if (internalLbVm == null) {
-            return true;
-        }
-
-        _accountMgr.checkAccess(caller, null, true, internalLbVm);
-
-        return _itMgr.expunge(internalLbVm, _accountMgr.getActiveUser(callerUserId), caller); 
-    }
-
-    
-    @Override
-    public VirtualRouter stopInternalLbVm(long vmId, boolean forced, Account caller, long callerUserId) throws ConcurrentOperationException,
-    ResourceUnavailableException {
-        DomainRouterVO internalLbVm = _routerDao.findById(vmId);
-        if (internalLbVm == null || internalLbVm.getRole() != Role.INTERNAL_LB_VM) {
-            throw new InvalidParameterValueException("Can't find internal lb vm by id");
-        }
-        
-        return stopInternalLbVm(internalLbVm, forced, caller, callerUserId);
-    }
-
-    protected VirtualRouter stopInternalLbVm(DomainRouterVO internalLbVm, boolean forced, Account caller, long callerUserId) throws ResourceUnavailableException, ConcurrentOperationException {
-        s_logger.debug("Stopping internal lb vm " + internalLbVm);
-        try {
-            if (_itMgr.advanceStop((DomainRouterVO) internalLbVm, forced, _accountMgr.getActiveUser(callerUserId), caller)) {
-                return _routerDao.findById(internalLbVm.getId());
-            } else {
-                return null;
-            }
-        } catch (OperationTimedoutException e) {
-            throw new CloudRuntimeException("Unable to stop " + internalLbVm, e);
-        }
-    }
-    
-    
-    @Override
-    public List<DomainRouterVO> deployInternalLbVm(Network guestNetwork, Ip requestedGuestIp, DeployDestination dest, 
-            Account owner, Map<Param, Object> params) throws InsufficientCapacityException,
-    ConcurrentOperationException, ResourceUnavailableException {
-
-        List<DomainRouterVO> internalLbVms = findOrDeployInternalLbVm(guestNetwork, requestedGuestIp, dest, owner, params);
-        
-        return startInternalLbVms(params, internalLbVms);
-    }
-    
-    protected List<DomainRouterVO> startInternalLbVms(Map<Param, Object> params, List<DomainRouterVO> internalLbVms) 
-            throws StorageUnavailableException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException {
-        List<DomainRouterVO> runningInternalLbVms = null;
-
-        if (internalLbVms != null) {
-            runningInternalLbVms = new ArrayList<DomainRouterVO>();
-        }
-
-        for (DomainRouterVO internalLbVm : internalLbVms) {
-            if (internalLbVm.getState() != VirtualMachine.State.Running) {
-                internalLbVm = startInternalLbVm(internalLbVm, _accountMgr.getSystemAccount(), User.UID_SYSTEM, params);
-            }
-            
-            if (internalLbVm != null) {
-                runningInternalLbVms.add(internalLbVm);
-            }
-        }
-        return runningInternalLbVms;
-    }
-    
-    
-    
-    @DB
-    protected List<DomainRouterVO> findOrDeployInternalLbVm(Network guestNetwork, Ip requestedGuestIp, DeployDestination dest, 
-            Account owner, Map<Param, Object> params) throws ConcurrentOperationException, 
-            InsufficientCapacityException, ResourceUnavailableException {
-
-        List<DomainRouterVO> internalLbs = new ArrayList<DomainRouterVO>();
-        Network lock = _networkDao.acquireInLockTable(guestNetwork.getId(), _ntwkMgr.getNetworkLockTimeout());
-        if (lock == null) {
-            throw new ConcurrentOperationException("Unable to lock network " + guestNetwork.getId());
-        }
-        
-        if (s_logger.isDebugEnabled()) {
-            s_logger.debug("Lock is acquired for network id " + lock.getId() + " as a part of internal lb startup in " + dest);
-        }
-        
-        // Check if providers are supported in the physical networks
-        VirtualRouterProviderType type = VirtualRouterProviderType.InternalLbVm;
-            Long physicalNetworkId = _ntwkModel.getPhysicalNetworkId(guestNetwork);
-        PhysicalNetworkServiceProvider provider = _physicalProviderDao.findByServiceProvider(physicalNetworkId, type.toString());
-        if (provider == null) {
-            throw new CloudRuntimeException("Cannot find service provider " + type.toString() + " in physical network " + physicalNetworkId);
-        }
-        VirtualRouterProvider internalLbProvider = _vrProviderDao.findByNspIdAndType(provider.getId(), type);
-        if (internalLbProvider == null) {
-            throw new CloudRuntimeException("Cannot find provider " + type.toString() + " as service provider " + provider.getId());
-        }
-        
-        try {
-            assert guestNetwork.getState() == Network.State.Implemented || guestNetwork.getState() == Network.State.Setup ||
-                    guestNetwork.getState() == Network.State.Implementing : "Network is not yet fully implemented: "
-                    + guestNetwork;
-            assert guestNetwork.getTrafficType() == TrafficType.Guest;
-
-            Long offeringId = _networkOfferingDao.findById(guestNetwork.getNetworkOfferingId()).getServiceOfferingId();
-            if (offeringId == null) {
-                offeringId = _internalLbVmOffering.getId();
-            }
-
-            // 3) deploy internal lb vm
-            Pair<DeploymentPlan, List<DomainRouterVO>> planAndInternalLbVms = getDeploymentPlanAndInternalLbVms(dest, guestNetwork.getId(), requestedGuestIp);
-            internalLbs = planAndInternalLbVms.second();
-            DeploymentPlan plan = planAndInternalLbVms.first();
-            
-            if (internalLbs.size() > 0) {
-                s_logger.debug("Found " + internalLbs.size() + " internal lb vms for the requested IP " + requestedGuestIp.addr());
-                return internalLbs;
-            }
-
-            List<Pair<NetworkVO, NicProfile>> networks = createInternalLbVmNetworks(guestNetwork, plan, requestedGuestIp);
-            //don't start the internal lb as we are holding the network lock that needs to be released at the end of router allocation
-            DomainRouterVO internalLbVm = deployInternalLbVm(owner, dest, plan, params, internalLbProvider, offeringId, guestNetwork.getVpcId(),
-                networks, false);
-            if (internalLbVm != null) {
-                internalLbs.add(internalLbVm);
-            }
-        } finally {
-            if (lock != null) {
-                _networkDao.releaseFromLockTable(lock.getId());
-                if (s_logger.isDebugEnabled()) {
-                    s_logger.debug("Lock is released for network id " + lock.getId() + " as a part of internal lb vm startup in " + dest);
-                }
-            }
-        }
-        return internalLbs;
-    }
-    
-    protected List<Pair<NetworkVO, NicProfile>> createInternalLbVmNetworks(Network guestNetwork, DeploymentPlan plan, Ip guestIp) throws ConcurrentOperationException,
-            InsufficientAddressCapacityException {
-
-        //Form networks
-        List<Pair<NetworkVO, NicProfile>> networks = new ArrayList<Pair<NetworkVO, NicProfile>>(3);
-        
-        //1) Guest network
-        if (guestNetwork != null) {
-            s_logger.debug("Adding nic for Internal LB in Guest network " + guestNetwork);
-            NicProfile guestNic = new NicProfile();
-            if (guestIp != null) {
-                guestNic.setIp4Address(guestIp.addr());  
-            } else {
-                guestNic.setIp4Address(_ntwkMgr.acquireGuestIpAddress(guestNetwork, null));
-            }
-            guestNic.setGateway(guestNetwork.getGateway());
-            guestNic.setBroadcastUri(guestNetwork.getBroadcastUri());
-            guestNic.setBroadcastType(guestNetwork.getBroadcastDomainType());
-            guestNic.setIsolationUri(guestNetwork.getBroadcastUri());
-            guestNic.setMode(guestNetwork.getMode());
-            String gatewayCidr = guestNetwork.getCidr();
-            guestNic.setNetmask(NetUtils.getCidrNetmask(gatewayCidr));
-            networks.add(new Pair<NetworkVO, NicProfile>((NetworkVO) guestNetwork, guestNic));
-        }
-
-        //2) Control network
-        s_logger.debug("Adding nic for Internal LB vm in Control network ");
-        List<? extends NetworkOffering> offerings = _ntwkModel.getSystemAccountNetworkOfferings(NetworkOffering.SystemControlNetwork);
-        NetworkOffering controlOffering = offerings.get(0);
-        NetworkVO controlConfig = _ntwkMgr.setupNetwork(_accountMgr.getSystemAccount(), controlOffering, plan, null, null, false).get(0);
-        networks.add(new Pair<NetworkVO, NicProfile>(controlConfig, null));
-
-        return networks;
-    }
-    
-    
-    protected Pair<DeploymentPlan, List<DomainRouterVO>> getDeploymentPlanAndInternalLbVms(DeployDestination dest, long guestNetworkId, Ip requestedGuestIp) {
-        long dcId = dest.getDataCenter().getId();
-        DeploymentPlan plan = new DataCenterDeployment(dcId);
-        List<DomainRouterVO> internalLbVms = findInternalLbVms(guestNetworkId, requestedGuestIp);
-
-        return new Pair<DeploymentPlan, List<DomainRouterVO>>(plan, internalLbVms);
-    
-    }
-
-    @Override
-    public List<DomainRouterVO> findInternalLbVms(long guestNetworkId, Ip requestedGuestIp) {
-        List<DomainRouterVO> internalLbVms = _routerDao.listByNetworkAndRole(guestNetworkId, Role.INTERNAL_LB_VM); 
-        if (requestedGuestIp != null) {
-            Iterator<DomainRouterVO> it = internalLbVms.iterator();
-            while (it.hasNext()) {
-                DomainRouterVO vm = it.next();
-                Nic nic = _nicDao.findByInstanceIdAndNetworkId(guestNetworkId, vm.getId());
-                if (!nic.getIp4Address().equalsIgnoreCase(requestedGuestIp.addr())) {
-                    it.remove();
-                }
-            }
-        }
-        return internalLbVms;
-    }
-    
-    
-    protected DomainRouterVO deployInternalLbVm(Account owner, DeployDestination dest, DeploymentPlan plan, Map<Param, Object> params,
-            VirtualRouterProvider internalLbProvider, long svcOffId, Long vpcId,
-            List<Pair<NetworkVO, NicProfile>> networks, boolean startVm) throws ConcurrentOperationException,
-            InsufficientAddressCapacityException, InsufficientServerCapacityException, InsufficientCapacityException,
-            StorageUnavailableException, ResourceUnavailableException {
-        
-        long id = _routerDao.getNextInSequence(Long.class, "id");
-        if (s_logger.isDebugEnabled()) {
-            s_logger.debug("Creating the internal lb vm " + id + " in datacenter "  + dest.getDataCenter());
-        }
-
-        ServiceOfferingVO routerOffering = _serviceOfferingDao.findById(svcOffId);
-
-        // Internal lb is the network element, we don't know the hypervisor type yet.
-        // Try to allocate the internal lb twice using diff hypervisors, and when failed both times, throw the exception up
-        List<HypervisorType> hypervisors = getHypervisors(dest, plan, null);
-
-        int allocateRetry = 0;
-        int startRetry = 0;
-        DomainRouterVO internalLbVm = null;
-        for (Iterator<HypervisorType> iter = hypervisors.iterator(); iter.hasNext();) {
-            HypervisorType hType = iter.next();
-            try {
-                s_logger.debug("Allocating the Internal lb with the hypervisor type " + hType);
-                VMTemplateVO template = _templateDao.findRoutingTemplate(hType);
-
-                if (template == null) {
-                    s_logger.debug(hType + " won't support system vm, skip it");
-                    continue;
-                }
-
-                internalLbVm = new DomainRouterVO(id, routerOffering.getId(), internalLbProvider.getId(), 
-                VirtualMachineName.getRouterName(id, _instance), template.getId(), template.getHypervisorType(),
-                template.getGuestOSId(), owner.getDomainId(), owner.getId(), false, 0, false, 
-                RedundantState.UNKNOWN, false, false, vpcId);
-                internalLbVm.setRole(Role.INTERNAL_LB_VM);
-                internalLbVm = _itMgr.allocate(internalLbVm, template, routerOffering, networks, plan, null, owner);
-            } catch (InsufficientCapacityException ex) {
-                if (allocateRetry < 2 && iter.hasNext()) {
-                    s_logger.debug("Failed to allocate the Internal lb vm with hypervisor type " + hType + ", retrying one more time");
-                    continue;
-                } else {
-                    throw ex;
-                }
-            } finally {
-                allocateRetry++;
-            }
-
-            if (startVm) {
-                try {
-                    internalLbVm = startInternalLbVm(internalLbVm, _accountMgr.getSystemAccount(), User.UID_SYSTEM, params);
-                    break;
-                } catch (InsufficientCapacityException ex) {
-                    if (startRetry < 2 && iter.hasNext()) {
-                        s_logger.debug("Failed to start the Internal lb vm  " + internalLbVm + " with hypervisor type " + hType + ", " +
-                                "destroying it and recreating one more time");
-                        // destroy the internal lb vm
-                        destroyInternalLbVm(internalLbVm.getId(), _accountMgr.getSystemAccount(), User.UID_SYSTEM);
-                        continue;
-                    } else {
-                        throw ex;
-                    }
-                } finally {
-                    startRetry++;
-                }
-            } else {
-                //return stopped internal lb vm
-                return internalLbVm;
-            }
-        }
-        return internalLbVm;
-    }
-    
-    
-
-    protected DomainRouterVO startInternalLbVm(DomainRouterVO internalLbVm, Account caller, long callerUserId, Map<Param, Object> params) 
-            throws StorageUnavailableException, InsufficientCapacityException,
-            ConcurrentOperationException, ResourceUnavailableException {
-        s_logger.debug("Starting Internal LB VM " + internalLbVm);
-        if (_itMgr.start(internalLbVm, params, _accountMgr.getUserIncludingRemoved(callerUserId), caller, null) != null) {
-            if (internalLbVm.isStopPending()) {
-                s_logger.info("Clear the stop pending flag of Internal LB VM " + internalLbVm.getHostName() + " after start router successfully!");
-                internalLbVm.setStopPending(false);
-                internalLbVm = _routerDao.persist(internalLbVm);
-            }
-            return _routerDao.findById(internalLbVm.getId());
-        } else {
-            return null;
-        }
-    }
-    
-    
-    protected List<HypervisorType> getHypervisors(DeployDestination dest, DeploymentPlan plan, 
-            List<HypervisorType> supportedHypervisors) throws InsufficientServerCapacityException {
-        List<HypervisorType> hypervisors = new ArrayList<HypervisorType>();
-
-        HypervisorType defaults = _resourceMgr.getDefaultHypervisor(dest.getDataCenter().getId());
-        if (defaults != HypervisorType.None) {
-            hypervisors.add(defaults);
-        } else {
-            //if there is no default hypervisor, get it from the cluster
-            hypervisors = _resourceMgr.getSupportedHypervisorTypes(dest.getDataCenter().getId(), true,
-                plan.getPodId());
-        }
-
-        //keep only elements defined in supported hypervisors
-        StringBuilder hTypesStr = new StringBuilder();
-        if (supportedHypervisors != null && !supportedHypervisors.isEmpty()) {
-            hypervisors.retainAll(supportedHypervisors);
-            for (HypervisorType hType : supportedHypervisors) {
-                hTypesStr.append(hType).append(" ");
-            }
-        }
-
-        if (hypervisors.isEmpty()) {
-            throw new InsufficientServerCapacityException("Unable to create internal lb vm, " +
-                    "there are no clusters in the zone ", DataCenter.class, dest.getDataCenter().getId());
-        }
-        return hypervisors;
-    }
-    
-    @Override
-    public boolean applyLoadBalancingRules(Network network, final List<LoadBalancingRule> rules, List<? extends VirtualRouter> internalLbVms) throws ResourceUnavailableException {
-        if (rules == null || rules.isEmpty()) {
-            s_logger.debug("No lb rules to be applied for network " + network);
-            return true;
-        }
-        
-        //FIXME - add validation for the internal lb vm state here
-        return sendLBRules(internalLbVms.get(0), rules, network.getId());
-    }
-    
-    protected boolean sendLBRules(VirtualRouter internalLbVm, List<LoadBalancingRule> rules, long guestNetworkId) throws ResourceUnavailableException {
-        Commands cmds = new Commands(OnError.Continue);
-        createApplyLoadBalancingRulesCommands(rules, internalLbVm, cmds, guestNetworkId);
-        return sendCommandsToInternalLbVm(internalLbVm, cmds);
-    }
-    
-    
-    protected boolean sendCommandsToInternalLbVm(final VirtualRouter internalLbVm, Commands cmds) throws AgentUnavailableException {
-        Answer[] answers = null;
-        try {
-            answers = _agentMgr.send(internalLbVm.getHostId(), cmds);
-        } catch (OperationTimedoutException e) {
-            s_logger.warn("Timed Out", e);
-            throw new AgentUnavailableException("Unable to send commands to virtual router ", internalLbVm.getHostId(), e);
-        }
-
-        if (answers == null) {
-            return false;
-        }
-
-        if (answers.length != cmds.size()) {
-            return false;
-        }
-
-        // FIXME: Have to return state for individual command in the future
-        boolean result = true;
-        if (answers.length > 0) {
-            for (Answer answer : answers) {
-                if (!answer.getResult()) {
-                    result = false;
-                    break;
-                }
-            }
-        }
-        return result;
-    }
-    
-    
-    @Override
-    public VirtualRouter startInternalLbVm(long internalLbVmId, Account caller, long callerUserId) 
-            throws StorageUnavailableException, InsufficientCapacityException,
-            ConcurrentOperationException, ResourceUnavailableException {
-        
-        DomainRouterVO internalLbVm = _routerDao.findById(internalLbVmId);
-        if (internalLbVm == null || internalLbVm.getRole() != Role.INTERNAL_LB_VM) {
-            throw new InvalidParameterValueException("Can't find internal lb vm by id specified");
-        }
-        
-        return startInternalLbVm(internalLbVm, caller, callerUserId, null);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a3321ce6/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManager.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManager.java b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManager.java
new file mode 100644
index 0000000..351e021
--- /dev/null
+++ b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManager.java
@@ -0,0 +1,86 @@
+// 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 org.apache.cloudstack.network.lb;
+
+import java.util.List;
+import java.util.Map;
+
+import com.cloud.deploy.DeployDestination;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.Network;
+import com.cloud.network.lb.LoadBalancingRule;
+import com.cloud.network.router.VirtualRouter;
+import com.cloud.user.Account;
+import com.cloud.utils.component.Manager;
+import com.cloud.utils.net.Ip;
+import com.cloud.vm.VirtualMachineProfile.Param;
+
+public interface InternalLoadBalancerVMManager extends Manager, InternalLoadBalancerVMService{
+    /**
+     * Destroys Internal LB vm instance
+     * @param vmId
+     * @param caller
+     * @param callerUserId
+     * @return 
+     * @throws ResourceUnavailableException
+     * @throws ConcurrentOperationException
+     */
+    boolean destroyInternalLbVm(long vmId, Account caller, Long callerUserId) 
+            throws ResourceUnavailableException, ConcurrentOperationException;
+
+
+    /**
+     * Deploys internal lb vm
+     * @param guestNetwork
+     * @param requestedGuestIp
+     * @param dest
+     * @param owner
+     * @param params
+     * @return
+     * @throws InsufficientCapacityException
+     * @throws ConcurrentOperationException
+     * @throws ResourceUnavailableException
+     */
+    List<? extends VirtualRouter> deployInternalLbVm(Network guestNetwork, Ip requestedGuestIp, DeployDestination dest, Account owner,
+            Map<Param, Object> params) throws InsufficientCapacityException,
+            ConcurrentOperationException, ResourceUnavailableException;
+
+
+
+    /**
+     * 
+     * @param network
+     * @param rules
+     * @param internalLbVms
+     * @return
+     * @throws ResourceUnavailableException
+     */
+    boolean applyLoadBalancingRules(Network network, List<LoadBalancingRule> rules, List<? extends VirtualRouter> internalLbVms)
+            throws ResourceUnavailableException;
+
+
+    /**
+     * Returns existing Internal Load Balancer elements based on guestNetworkId (requried) and requestedIp (optional)
+     * @param guestNetworkId
+     * @param requestedGuestIp
+     * @return
+     */
+    List<? extends VirtualRouter> findInternalLbVms(long guestNetworkId, Ip requestedGuestIp);
+
+}


Mime
View raw message