Extract general behavior to Router and Vpc delegates

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 f28426e1a2a1274d19b1bf1d2e5b94c8e3e5ab23
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
@@ -186,6 +186,10 @@
         class="com.cloud.network.rules.VirtualNetworkApplianceFactory" />
     <bean id="routerControlHelper"
         class="com.cloud.network.router.RouterControlHelper" />
+    <bean id="networkGeneralHelper"
+        class="com.cloud.network.router.NetworkGeneralHelper" />
+    <bean id="vpcVirtualNetworkHelper"
+        class="com.cloud.network.router.VpcVirtualNetworkHelperImpl" />
 
 
     <bean id="ApiAsyncJobDispatcher" class="com.cloud.api.ApiAsyncJobDispatcher">

diff --git a/server/src/com/cloud/network/router/NetworkGeneralHelper.java b/server/src/com/cloud/network/router/NetworkGeneralHelper.java
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
diff --git a/server/src/com/cloud/network/router/VirtualNwStatus.java b/server/src/com/cloud/network/router/VirtualNwStatus.java
@@ -0,0 +1,10 @@
+package com.cloud.network.router;
+
+import com.cloud.user.Account;
+
+public class VirtualNwStatus {
+
+    public static String instance = "";
+
+    public static Account account = null;
+}
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
@@ -39,6 +39,22 @@
 public interface VpcVirtualNetworkApplianceManager extends VirtualNetworkApplianceManager, VpcVirtualNetworkApplianceService {
 
     /**
+     *
+     * @param vpc
+     * @param dest
+     * @param owner
+     * @param params
+     * @param isRedundant
+     * @return
+     * @throws InsufficientCapacityException
+     * @throws ConcurrentOperationException
+     * @throws ResourceUnavailableException
+     */
+    List<DomainRouterVO> deployVirtualRouterInVpc(Vpc vpc, DeployDestination dest, Account owner, Map<Param, Object> params, boolean isRedundant) throws InsufficientCapacityException,
+    ConcurrentOperationException, ResourceUnavailableException;
+
+    /**
+     *
      * @param vpc
      * @param dest
      * @param owner
@@ -49,7 +65,7 @@ public interface VpcVirtualNetworkApplianceManager extends VirtualNetworkApplian
      * @throws ResourceUnavailableException
      */
     List<DomainRouterVO> deployVirtualRouterInVpc(Vpc vpc, DeployDestination dest, Account owner, Map<Param, Object> params) throws InsufficientCapacityException,
-        ConcurrentOperationException, ResourceUnavailableException;
+    ConcurrentOperationException, ResourceUnavailableException;
 
     /**
      *

diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -51,7 +51,6 @@
 import com.cloud.agent.api.routing.Site2SiteVpnCfgCommand;
 import com.cloud.agent.api.to.IpAddressTO;
 import com.cloud.agent.api.to.NetworkACLTO;
-import com.cloud.agent.api.to.NicTO;
 import com.cloud.agent.manager.Commands;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.DataCenterVO;
@@ -172,19 +171,29 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
     @Inject
     EntityManager _entityMgr;
 
+    @Inject
+    protected NetworkGeneralHelper nwHelper;
+    @Inject
+    protected VpcVirtualNetworkHelper vpcHelper;
+
     @Override
     public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
         _itMgr.registerGuru(VirtualMachine.Type.DomainRouter, this);
         return super.configure(name, params);
     }
 
     @Override
-    public List<DomainRouterVO> deployVirtualRouterInVpc(Vpc vpc, DeployDestination dest, Account owner, Map<Param, Object> params) throws InsufficientCapacityException,
+    public List<DomainRouterVO> deployVirtualRouterInVpc(Vpc vpc, DeployDestination dest, Account owner,
+            Map<Param, Object> params) throws InsufficientCapacityException,
     ConcurrentOperationException, ResourceUnavailableException {
+        return this.deployVirtualRouterInVpc(vpc, dest, owner, params, false);
+    }
 
-        List<DomainRouterVO> routers = findOrDeployVirtualRouterInVpc(vpc, dest, owner, params);
-
-        return startRouters(params, routers);
+    @Override
+    public List<DomainRouterVO> deployVirtualRouterInVpc(Vpc vpc, DeployDestination dest, Account owner,
+            Map<Param, Object> params, final boolean isRedundant) throws InsufficientCapacityException,
+    ConcurrentOperationException, ResourceUnavailableException {
+        return this.vpcHelper.deployVirtualRouterInVpc(vpc, dest, owner, params, isRedundant);
     }
 
     @DB
@@ -334,7 +343,7 @@ protected DomainRouterVO deployVpcRouter(Account owner, DeployDestination dest,
 
         LinkedHashMap<Network, List<? extends NicProfile>> networks = createVpcRouterNetworks(owner, isRedundant, plan, new Pair<Boolean, PublicIp>(true, sourceNatIp),vpcId);
         DomainRouterVO router =
-                super.deployRouter(owner, dest, plan, params, isRedundant, vrProvider, svcOffId, vpcId, networks, true, _vpcMgr.getSupportedVpcHypervisors());
+                nwHelper.deployRouter(owner, dest, plan, params, isRedundant, vrProvider, svcOffId, vpcId, networks, true, _vpcMgr.getSupportedVpcHypervisors());
 
         return router;
     }
@@ -478,12 +487,6 @@ private void createVpcAssociatePublicIPCommands(final VirtualRouter router, fina
         }
     }
 
-    protected NicTO getNicTO(final VirtualRouter router, Long networkId, String broadcastUri) {
-        NicProfile nicProfile = _networkModel.getNicProfile(router, networkId, broadcastUri);
-
-        return _itMgr.toNicTO(nicProfile, router.getHypervisorType());
-    }
-
     @Override
     public boolean associatePublicIP(Network network, final List<? extends PublicIpAddress> ipAddress, List<? extends VirtualRouter> routers)
             throws ResourceUnavailableException {
@@ -677,7 +680,7 @@ private void createNetworkACLsCommands(List<? extends NetworkACLItem> rules, Vir
             }
         }
 
-        SetNetworkACLCommand cmd = new SetNetworkACLCommand(rulesTO, getNicTO(router, guestNetworkId, null));
+        SetNetworkACLCommand cmd = new SetNetworkACLCommand(rulesTO, nwHelper.getNicTO(router, guestNetworkId, null));
         cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId()));
         cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, getRouterIpInNetwork(guestNetworkId, router.getId()));
         cmd.setAccessDetail(NetworkElementCommand.GUEST_VLAN_TAG, guestVlan);
@@ -752,7 +755,7 @@ public boolean finalizeCommandsOnStart(Commands cmds, VirtualMachineProfile prof
                     }
                 }
                 PlugNicCommand plugNicCmd =
-                        new PlugNicCommand(getNicTO(router, publicNic.getNetworkId(), publicNic.getBroadcastUri().toString()), router.getInstanceName(), router.getType());
+                        new PlugNicCommand(nwHelper.getNicTO(router, publicNic.getNetworkId(), publicNic.getBroadcastUri().toString()), router.getInstanceName(), router.getType());
                 cmds.addCommand(plugNicCmd);
                 VpcVO vpc = _vpcDao.findById(router.getVpcId());
                 NetworkUsageCommand netUsageCmd =
@@ -778,7 +781,7 @@ public boolean finalizeCommandsOnStart(Commands cmds, VirtualMachineProfile prof
             for (Pair<Nic, Network> nicNtwk : guestNics) {
                 Nic guestNic = nicNtwk.first();
                 //plug guest nic
-                PlugNicCommand plugNicCmd = new PlugNicCommand(getNicTO(router, guestNic.getNetworkId(), null), router.getInstanceName(), router.getType());
+                PlugNicCommand plugNicCmd = new PlugNicCommand(nwHelper.getNicTO(router, guestNic.getNetworkId(), null), router.getInstanceName(), router.getType());
                 cmds.addCommand(plugNicCmd);
                 if (!_networkModel.isPrivateGateway(guestNic.getNetworkId())) {
                     //set guest network
@@ -920,7 +923,7 @@ public boolean setupPrivateGateway(PrivateGateway gateway, VirtualRouter router)
             Network network = _networkModel.getNetwork(gateway.getNetworkId());
             NicProfile requested = createPrivateNicProfileForGateway(gateway);
 
-            if (!checkRouterVersion(router)) {
+            if (!nwHelper.checkRouterVersion(router)) {
                 s_logger.warn("Router requires upgrade. Unable to send command to router: " + router.getId());
                 return false;
             }

diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkHelper.java b/server/src/com/cloud/network/router/VpcVirtualNetworkHelper.java
@@ -0,0 +1,27 @@
+package com.cloud.network.router;
+
+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.vpc.Vpc;
+import com.cloud.network.vpc.VpcGateway;
+import com.cloud.user.Account;
+import com.cloud.vm.DomainRouterVO;
+import com.cloud.vm.NicProfile;
+import com.cloud.vm.VirtualMachineProfile.Param;
+
+public interface VpcVirtualNetworkHelper {
+
+    List<DomainRouterVO> deployVirtualRouterInVpc(Vpc vpc,
+            DeployDestination dest, Account owner, Map<Param, Object> params, boolean isRedundant)
+            throws InsufficientCapacityException, ConcurrentOperationException,
+            ResourceUnavailableException;
+
+    NicProfile createPrivateNicProfileForGateway(VpcGateway privateGateway);
+
+    List<DomainRouterVO> getVpcRouters(long vpcId);
+}