Pull request of changes in the "cloud-server" module

server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml

@@ -175,14 +175,45 @@
 
     <bean id="uploadMonitorImpl" class="com.cloud.storage.upload.UploadMonitorImpl" />
     <bean id="usageServiceImpl" class="com.cloud.usage.UsageServiceImpl" />
+
     <bean id="virtualNetworkApplianceManagerImpl"
         class="com.cloud.network.router.VirtualNetworkApplianceManagerImpl" />
+
     <bean id="vpcManagerImpl" class="com.cloud.network.vpc.VpcManagerImpl" >
         <property name="vpcElements" value="#{vpcProvidersRegistry.registered}"></property>
     </bean>
+
     <bean id="vpcVirtualNetworkApplianceManagerImpl"
         class="com.cloud.network.router.VpcVirtualNetworkApplianceManagerImpl" />
 
+    <bean id="virtualNetworkApplianceFactory"
+        class="com.cloud.network.rules.VirtualNetworkApplianceFactory" />
+
+    <bean id="topologyContext" class="org.apache.cloudstack.network.topology.NetworkTopologyContext" init-method="init" />
+
+    <bean id="basicNetworkTopology" class="org.apache.cloudstack.network.topology.BasicNetworkTopology" />
+    <bean id="advancedNetworkTopology" class="org.apache.cloudstack.network.topology.AdvancedNetworkTopology" />
+
+    <bean id="basicNetworkVisitor" class="org.apache.cloudstack.network.topology.BasicNetworkVisitor" />
+    <bean id="advancedNetworkVisitor" class="org.apache.cloudstack.network.topology.AdvancedNetworkVisitor" />
+
+    <bean id="commandSetupHelper"
+        class="com.cloud.network.router.CommandSetupHelper" />
+
+    <bean id="routerControlHelper"
+        class="com.cloud.network.router.RouterControlHelper" />
+
+    <bean id="networkHelper"
+        class="com.cloud.network.router.NetworkHelperImpl" />
+
+    <bean id="vpcNetworkHelper"
+        class="com.cloud.network.router.VpcNetworkHelperImpl" />
+
+    <bean id="nicProfileHelper"
+        class="com.cloud.network.router.NicProfileHelperImpl" />
+
+    <bean id="routerDeploymentDefinitionBuilder"
+        class="org.cloud.network.router.deployment.RouterDeploymentDefinitionBuilder" />
 
     <bean id="ApiAsyncJobDispatcher" class="com.cloud.api.ApiAsyncJobDispatcher">
         <property name="name" value="ApiAsyncJobDispatcher" />

server/src/com/cloud/network/router/NetworkHelper.java

@@ -0,0 +1,81 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.network.router;
+
+import java.util.List;
+import java.util.Map;
+
+import org.cloud.network.router.deployment.RouterDeploymentDefinition;
+
+import com.cloud.agent.api.to.NicTO;
+import com.cloud.agent.manager.Commands;
+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.ResourceUnavailableException;
+import com.cloud.exception.StorageUnavailableException;
+import com.cloud.user.Account;
+import com.cloud.user.User;
+import com.cloud.vm.DomainRouterVO;
+import com.cloud.vm.VirtualMachineProfile.Param;
+
+public interface NetworkHelper {
+
+    public abstract boolean sendCommandsToRouter(VirtualRouter router,
+            Commands cmds) throws AgentUnavailableException;
+
+    public abstract void handleSingleWorkingRedundantRouter(
+            List<? extends VirtualRouter> connectedRouters,
+            List<? extends VirtualRouter> disconnectedRouters, String reason)
+                    throws ResourceUnavailableException;
+
+    public abstract int getRealPriority(DomainRouterVO router);
+
+    public abstract NicTO getNicTO(VirtualRouter router, Long networkId,
+            String broadcastUri);
+
+    public abstract VirtualRouter destroyRouter(long routerId, Account caller,
+            Long callerUserId) throws ResourceUnavailableException,
+            ConcurrentOperationException;
+
+    /**
+     * Checks if the router is at the required version. Compares MS version and router version.
+     *
+     * @param router
+     * @return
+     */
+    public abstract boolean checkRouterVersion(VirtualRouter router);
+
+    public abstract List<DomainRouterVO> startRouters(
+            RouterDeploymentDefinition routerDeploymentDefinition)
+                    throws StorageUnavailableException, InsufficientCapacityException,
+                    ConcurrentOperationException, ResourceUnavailableException;
+
+    public abstract DomainRouterVO startVirtualRouter(DomainRouterVO router,
+            User user, Account caller, Map<Param, Object> params)
+                    throws StorageUnavailableException, InsufficientCapacityException,
+                    ConcurrentOperationException, ResourceUnavailableException;
+
+    public abstract DomainRouterVO deployRouter(
+            RouterDeploymentDefinition routerDeploymentDefinition,
+            boolean startRouter)
+                    throws InsufficientAddressCapacityException,
+                    InsufficientServerCapacityException, InsufficientCapacityException,
+                    StorageUnavailableException, ResourceUnavailableException;
+}