Fix dependency problem. Extract and unify router deployment stuff

Conflicts: server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
asfgit · Oct 14, 2014 · Jul 3, 2014 · Jul 10, 2014 · Jul 11, 2014 · Jul 13, 2014
commit 24b230d11bd35b0a9f1fb7a5e49ba745f61ac483
diff --git a/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml b/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
@@ -190,6 +190,8 @@
         class="com.cloud.network.router.NetworkGeneralHelper" />
     <bean id="vpcVirtualNetworkHelper"
         class="com.cloud.network.router.VpcVirtualNetworkHelperImpl" />
+    <bean id="routerDeploymentManager"
+        class="com.cloud.network.router.RouterDeploymentManager" />
 
 
     <bean id="ApiAsyncJobDispatcher" class="com.cloud.api.ApiAsyncJobDispatcher">

diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@ -69,6 +69,7 @@
 import com.cloud.network.lb.LoadBalancingRule;
 import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy;
 import com.cloud.network.lb.LoadBalancingRulesManager;
+import com.cloud.network.router.RouterDeploymentDefinition;
 import com.cloud.network.router.VirtualRouter;
 import com.cloud.network.router.VirtualRouter.Role;
 import com.cloud.network.router.VpcVirtualNetworkApplianceManager;
@@ -196,9 +197,11 @@ public boolean implement(final Network network, final NetworkOffering offering,
         Map<VirtualMachineProfile.Param, Object> params = new HashMap<VirtualMachineProfile.Param, Object>(1);
         params.put(VirtualMachineProfile.Param.ReProgramGuestNetworks, true);
 
-        List<DomainRouterVO> routers = _routerMgr.deployVirtualRouterInGuestNetwork(network, dest,
-                _accountMgr.getAccount(network.getAccountId()), params,
-                offering.getRedundantRouter());
+        RouterDeploymentDefinition routerDeploymentDefinition =
+                new RouterDeploymentDefinition(network, dest,_accountMgr.getAccount(network.getAccountId()),
+                        params, offering.getRedundantRouter());
+        List<DomainRouterVO> routers = _routerMgr.deployVirtualRouter(routerDeploymentDefinition);
+
         int routerCounts = 1;
         if (offering.getRedundantRouter()) {
             routerCounts = 2;
@@ -230,11 +233,12 @@ public boolean prepare(final Network network, final NicProfile nic, final Virtua
             return false;
         }
 
-        @SuppressWarnings("unchecked")
-        VirtualMachineProfile uservm = vm;
+        RouterDeploymentDefinition routerDeploymentDefinition =
+                new RouterDeploymentDefinition(network, dest,_accountMgr.getAccount(network.getAccountId()),
+                        vm.getParameters(), offering.getRedundantRouter());
         List<DomainRouterVO> routers =
-                _routerMgr.deployVirtualRouterInGuestNetwork(network, dest, _accountMgr.getAccount(network.getAccountId()), uservm.getParameters(),
-                        offering.getRedundantRouter());
+                _routerMgr.deployVirtualRouter(routerDeploymentDefinition);
+
         if (routers == null || routers.size() == 0) {
             throw new ResourceUnavailableException("Can't find at least one running router!", DataCenter.class, network.getDataCenterId());
         }

diff --git a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
@@ -47,6 +47,7 @@
 import com.cloud.network.dao.IPAddressDao;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.Site2SiteVpnGatewayDao;
+import com.cloud.network.router.RouterDeploymentDefinition;
 import com.cloud.network.router.VirtualRouter;
 import com.cloud.network.router.VirtualRouter.Role;
 import com.cloud.network.router.VpcVirtualNetworkApplianceManager;
@@ -131,7 +132,9 @@ public boolean implementVpc(Vpc vpc, DeployDestination dest, ReservationContext
         Map<VirtualMachineProfile.Param, Object> params = new HashMap<VirtualMachineProfile.Param, Object>(1);
         params.put(VirtualMachineProfile.Param.ReProgramGuestNetworks, true);
 
-        _vpcRouterMgr.deployVirtualRouterInVpc(vpc, dest, _accountMgr.getAccount(vpc.getAccountId()), params);
+        RouterDeploymentDefinition routerDeploymentDefinition =
+                new RouterDeploymentDefinition(vpc, dest, _accountMgr.getAccount(vpc.getAccountId()), params, false);
+        _vpcRouterMgr.deployVirtualRouter(routerDeploymentDefinition);
 
         return true;
     }
@@ -168,7 +171,9 @@ public boolean implement(Network network, NetworkOffering offering, DeployDestin
         Map<VirtualMachineProfile.Param, Object> params = new HashMap<VirtualMachineProfile.Param, Object>(1);
         params.put(VirtualMachineProfile.Param.ReProgramGuestNetworks, true);
 
-        List<DomainRouterVO> routers = _vpcRouterMgr.deployVirtualRouterInVpc(vpc, dest, _accountMgr.getAccount(vpc.getAccountId()), params);
+        RouterDeploymentDefinition routerDeploymentDefinition =
+                new RouterDeploymentDefinition(vpc, dest, _accountMgr.getAccount(vpc.getAccountId()), params, false);
+        List<DomainRouterVO> routers = _vpcRouterMgr.deployVirtualRouter(routerDeploymentDefinition);
         if ((routers == null) || (routers.size() == 0)) {
             throw new ResourceUnavailableException("Can't find at least one running router!", DataCenter.class, network.getDataCenterId());
         }
@@ -213,7 +218,9 @@ public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm
         if (vm.getType() == VirtualMachine.Type.User) {
             Map<VirtualMachineProfile.Param, Object> params = new HashMap<VirtualMachineProfile.Param, Object>(1);
             params.put(VirtualMachineProfile.Param.ReProgramGuestNetworks, true);
-            List<DomainRouterVO> routers = _vpcRouterMgr.deployVirtualRouterInVpc(vpc, dest, _accountMgr.getAccount(vpc.getAccountId()), params);
+            RouterDeploymentDefinition routerDeploymentDefinition =
+                    new RouterDeploymentDefinition(vpc, dest, _accountMgr.getAccount(vpc.getAccountId()), params, false);
+            List<DomainRouterVO> routers = _vpcRouterMgr.deployVirtualRouter(routerDeploymentDefinition);
             if ((routers == null) || (routers.size() == 0)) {
                 throw new ResourceUnavailableException("Can't find at least one running router!", DataCenter.class, network.getDataCenterId());
             }

diff --git a/server/src/com/cloud/network/router/NetworkGeneralHelper.java b/server/src/com/cloud/network/router/NetworkGeneralHelper.java
@@ -393,21 +393,21 @@ public DomainRouterVO startVirtualRouter(DomainRouterVO router, User user, Accou
 
 
 //    @Override
-    public DomainRouterVO deployRouter(Account owner,
-            DeployDestination dest, DeploymentPlan plan,
-            Map<Param, Object> params, boolean isRedundant,
-            VirtualRouterProvider vrProvider, long svcOffId, Long vpcId,
+    public DomainRouterVO deployRouter(final RouterDeploymentDefinition routerDeploymentDefinition,
+            VirtualRouterProvider vrProvider, long svcOffId,
             LinkedHashMap<Network, List<? extends NicProfile>> networks,
             boolean startRouter, List<HypervisorType> supportedHypervisors)
             throws InsufficientAddressCapacityException,
             InsufficientServerCapacityException, InsufficientCapacityException,
             StorageUnavailableException, ResourceUnavailableException {
 
         final ServiceOfferingVO routerOffering = _serviceOfferingDao.findById(svcOffId);
+        final DeployDestination dest = routerDeploymentDefinition.getDest();
+        final Account owner = routerDeploymentDefinition.getOwner();
 
         // Router is the network element, we don't know the hypervisor type yet.
         // Try to allocate the domR twice using diff hypervisors, and when failed both times, throw the exception up
-        final List<HypervisorType> hypervisors = getHypervisors(dest, plan, supportedHypervisors);
+        final List<HypervisorType> hypervisors = getHypervisors(routerDeploymentDefinition, supportedHypervisors);
 
         int allocateRetry = 0;
         int startRetry = 0;
@@ -449,19 +449,18 @@ public DomainRouterVO deployRouter(Account owner,
 
                 boolean offerHA = routerOffering.getOfferHA();
                 /* We don't provide HA to redundant router VMs, admin should own it all, and redundant router themselves are HA */
-                if (isRedundant) {
+                if (routerDeploymentDefinition.isRedundant()) {
                     offerHA = false;
                 }
 
-                router =
-                        new DomainRouterVO(id, routerOffering.getId(), vrProvider.getId(),
-                                VirtualMachineName.getRouterName(id, VirtualNwStatus.instance), template.getId(), template.getHypervisorType(),
-                                template.getGuestOSId(), owner.getDomainId(), owner.getId(), isRedundant, 0, false, RedundantState.UNKNOWN,
-                                offerHA, false, vpcId);
+                router = new DomainRouterVO(id, routerOffering.getId(), vrProvider.getId(),
+                        VirtualMachineName.getRouterName(id, VirtualNwStatus.instance), template.getId(), template.getHypervisorType(),
+                        template.getGuestOSId(), owner.getDomainId(), owner.getId(), routerDeploymentDefinition.isRedundant(), 0,
+                        false, RedundantState.UNKNOWN, offerHA, false, routerDeploymentDefinition.getVpc().getId());
                 router.setDynamicallyScalable(template.isDynamicallyScalable());
                 router.setRole(Role.VIRTUAL_ROUTER);
                 router = _routerDao.persist(router);
-                _itMgr.allocate(router.getInstanceName(), template, routerOffering, networks, plan, null);
+                _itMgr.allocate(router.getInstanceName(), template, routerOffering, networks, routerDeploymentDefinition.getPlan(), null);
                 router = _routerDao.findById(router.getId());
             } catch (final InsufficientCapacityException ex) {
                 if (allocateRetry < 2 && iter.hasNext()) {
@@ -476,7 +475,7 @@ public DomainRouterVO deployRouter(Account owner,
 
             if (startRouter) {
                 try {
-                    router = startVirtualRouter(router, _accountMgr.getSystemUser(), _accountMgr.getSystemAccount(), params);
+                    router = startVirtualRouter(router, _accountMgr.getSystemUser(), _accountMgr.getSystemAccount(), routerDeploymentDefinition.getParams());
                     break;
                 } catch (final InsufficientCapacityException ex) {
                     if (startRetry < 2 && iter.hasNext()) {
@@ -499,8 +498,9 @@ public DomainRouterVO deployRouter(Account owner,
         return router;
     }
 
-    protected List<HypervisorType> getHypervisors(final DeployDestination dest, final DeploymentPlan plan, final List<HypervisorType> supportedHypervisors)
+    protected List<HypervisorType> getHypervisors(final RouterDeploymentDefinition routerDeploymentDefinition, final List<HypervisorType> supportedHypervisors)
             throws InsufficientServerCapacityException {
+        final DeployDestination dest = routerDeploymentDefinition.getDest();
         List<HypervisorType> hypervisors = new ArrayList<HypervisorType>();
 
         if (dest.getCluster() != null) {
@@ -515,7 +515,7 @@ protected List<HypervisorType> getHypervisors(final DeployDestination dest, fina
                 hypervisors.add(defaults);
             } else {
                 //if there is no default hypervisor, get it from the cluster
-                hypervisors = _resourceMgr.getSupportedHypervisorTypes(dest.getDataCenter().getId(), true, plan.getPodId());
+                hypervisors = _resourceMgr.getSupportedHypervisorTypes(dest.getDataCenter().getId(), true, routerDeploymentDefinition.getPodId());
             }
         }
 
@@ -530,9 +530,9 @@ protected List<HypervisorType> getHypervisors(final DeployDestination dest, fina
 
         if (hypervisors.isEmpty()) {
             final String errMsg = (hTypesStr.capacity() > 0) ? "supporting hypervisors " + hTypesStr.toString() : "";
-            if (plan.getPodId() != null) {
+            if (routerDeploymentDefinition.getPodId() != null) {
                 throw new InsufficientServerCapacityException("Unable to create virtual router, " + "there are no clusters in the pod " + errMsg, Pod.class,
-                        plan.getPodId());
+                        routerDeploymentDefinition.getPodId());
             }
             throw new InsufficientServerCapacityException("Unable to create virtual router, " + "there are no clusters in the zone " + errMsg, DataCenter.class,
                     dest.getDataCenter().getId());
@@ -564,16 +564,19 @@ protected HypervisorType getClusterToStartDomainRouterForOvm(final long podId) {
         }
 
         final String errMsg =
-                "Cannot find an available cluster in Pod " + podId + " to start domain router for Ovm. \n Ovm won't support any system vm including domain router, " +
-                        "please make sure you have a cluster with hypervisor type of any of xenserver/KVM/Vmware in the same pod" +
-                        " with Ovm cluster. And there is at least one host in UP status in that cluster.";
+                new StringBuilder("Cannot find an available cluster in Pod ")
+                .append(podId)
+                .append(" to start domain router for Ovm. \n Ovm won't support any system vm including domain router, ")
+                .append("please make sure you have a cluster with hypervisor type of any of xenserver/KVM/Vmware in the same pod")
+                .append(" with Ovm cluster. And there is at least one host in UP status in that cluster.")
+                .toString();
         throw new CloudRuntimeException(errMsg);
     }
 
 
 //    @Override
     public LinkedHashMap<Network, List<? extends NicProfile>> createRouterNetworks(
-            Account owner, boolean isRedundant, DeploymentPlan plan,
+            final RouterDeploymentDefinition routerDeploymentDefinition,
             Network guestNetwork, Pair<Boolean, PublicIp> publicNetwork)
             throws ConcurrentOperationException,
             InsufficientAddressCapacityException {
@@ -595,7 +598,7 @@ public LinkedHashMap<Network, List<? extends NicProfile>> createRouterNetworks(
             if (!setupPublicNetwork) {
                 final Nic placeholder = _networkModel
                         .getPlaceholderNicForRouter(guestNetwork,
-                                plan.getPodId());
+                                routerDeploymentDefinition.getPodId());
                 if (guestNetwork.getCidr() != null) {
                     if (placeholder != null
                             && placeholder.getIp4Address() != null) {
@@ -651,7 +654,7 @@ public LinkedHashMap<Network, List<? extends NicProfile>> createRouterNetworks(
             final NicProfile gatewayNic = new NicProfile(defaultNetworkStartIp,
                     defaultNetworkStartIpv6);
             if (setupPublicNetwork) {
-                if (isRedundant) {
+                if (routerDeploymentDefinition.isRedundant()) {
                     gatewayNic.setIp4Address(_ipAddrMgr.acquireGuestIpAddress(
                             guestNetwork, null));
                 } else {
@@ -679,7 +682,7 @@ public LinkedHashMap<Network, List<? extends NicProfile>> createRouterNetworks(
                 .getSystemAccountNetworkOfferings(NetworkOffering.SystemControlNetwork);
         NetworkOffering controlOffering = offerings.get(0);
         Network controlConfig = _networkMgr.setupNetwork(VirtualNwStatus.account,
-                controlOffering, plan, null, null, false).get(0);
+                controlOffering, routerDeploymentDefinition.getPlan(), null, null, false).get(0);
         networks.put(controlConfig, new ArrayList<NicProfile>());
         // 3) Public network
         if (setupPublicNetwork) {
@@ -716,8 +719,8 @@ public LinkedHashMap<Network, List<? extends NicProfile>> createRouterNetworks(
                     .getSystemAccountNetworkOfferings(
                             NetworkOffering.SystemPublicNetwork).get(0);
             final List<? extends Network> publicNetworks = _networkMgr
-                    .setupNetwork(VirtualNwStatus.account, publicOffering, plan, null,
-                            null, false);
+                    .setupNetwork(VirtualNwStatus.account, publicOffering, routerDeploymentDefinition.getPlan(),
+                            null, null, false);
             final String publicIp = defaultNic.getIp4Address();
             // We want to use the identical MAC address for RvR on public
             // interface if possible

diff --git a/server/src/com/cloud/network/router/RouterDeploymentDefinition.java b/server/src/com/cloud/network/router/RouterDeploymentDefinition.java
@@ -0,0 +1,93 @@
+package com.cloud.network.router;
+
+import java.util.Map;
+
+import com.cloud.deploy.DeployDestination;
+import com.cloud.deploy.DeploymentPlan;
+import com.cloud.network.Network;
+import com.cloud.network.vpc.Vpc;
+import com.cloud.user.Account;
+import com.cloud.vm.VirtualMachineProfile.Param;
+
+public class RouterDeploymentDefinition {
+
+    protected Vpc vpc;
+    protected Network guestNetwork;
+    protected DeployDestination dest;
+    protected Account owner;
+    protected Map<Param, Object> params;
+    protected boolean isRedundant;
+    protected DeploymentPlan plan;
+
+    public RouterDeploymentDefinition(Vpc vpc, DeployDestination dest,
+            Account owner, Map<Param, Object> params,
+            boolean isRedundant) {
+
+        this.vpc = vpc;
+        this.dest = dest;
+        this.owner = owner;
+        this.params = params;
+        this.isRedundant = isRedundant;
+    }
+
+    public RouterDeploymentDefinition(Network guestNetwork, DeployDestination dest,
+            Account owner, Map<Param, Object> params, boolean isRedundant) {
+
+        this.guestNetwork = guestNetwork;
+        this.dest = dest;
+        this.owner = owner;
+        this.params = params;
+        this.isRedundant = isRedundant;
+    }
+
+    public Vpc getVpc() {
+        return vpc;
+    }
+    public void setVpc(Vpc vpc) {
+        this.vpc = vpc;
+    }
+    public Network getGuestNetwork() {
+        return guestNetwork;
+    }
+    public void setGuestNetwork(Network guestNetwork) {
+        this.guestNetwork = guestNetwork;
+    }
+    public DeployDestination getDest() {
+        return dest;
+    }
+    public void setDest(DeployDestination dest) {
+        this.dest = dest;
+    }
+    public Account getOwner() {
+        return owner;
+    }
+    public void setOwner(Account owner) {
+        this.owner = owner;
+    }
+    public Map<Param, Object> getParams() {
+        return params;
+    }
+    public void setParams(Map<Param, Object> params) {
+        this.params = params;
+    }
+    public boolean isRedundant() {
+        return isRedundant;
+    }
+    public void setRedundant(boolean isRedundant) {
+        this.isRedundant = isRedundant;
+    }
+    public DeploymentPlan getPlan() {
+        return plan;
+    }
+    public void setPlan(DeploymentPlan plan) {
+        this.plan = plan;
+    }
+
+    public boolean isVpcRouter() {
+        return this.vpc != null;
+    }
+    public Long getPodId() {
+        return this.plan.getPodId();
+    }
+
+}