Repository: cloudstack Updated Branches: refs/heads/baremetal-systemvm c1aa35fc0 -> 23482b142
Merge branch 'vpc-refactor-clean-for-PR' of https://github.com/schubergphilis/cloudstack Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/771d0523 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/771d0523 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/771d0523 Branch: refs/heads/baremetal-systemvm Commit: 771d05238160764b4eb222d80696a3dce1422fa6 Parents: e4a8bbc 1e87d7b Author: Daan Hoogland <d...@onecht.net> Authored: Tue Oct 14 20:14:50 2014 +0200 Committer: Daan Hoogland <d...@onecht.net> Committed: Tue Oct 14 20:14:50 2014 +0200 ---------------------------------------------------------------------- .../com/cloud/network/element/OvsElement.java | 139 +- .../spring-server-core-managers-context.xml | 33 +- .../network/element/VirtualRouterElement.java | 423 +-- .../element/VpcVirtualRouterElement.java | 162 +- .../network/router/CommandSetupHelper.java | 1029 +++++++ .../com/cloud/network/router/NetworkHelper.java | 81 + .../cloud/network/router/NetworkHelperImpl.java | 757 +++++ .../cloud/network/router/NicProfileHelper.java | 31 + .../network/router/NicProfileHelperImpl.java | 110 + .../network/router/RouterControlHelper.java | 70 + .../router/VirtualNetworkApplianceManager.java | 66 +- .../VirtualNetworkApplianceManagerImpl.java | 2738 +++--------------- .../network/router/VpcNetworkHelperImpl.java | 154 + .../VpcVirtualNetworkApplianceManager.java | 63 +- .../VpcVirtualNetworkApplianceManagerImpl.java | 972 +------ .../cloud/network/rules/AdvancedVpnRules.java | 60 + .../com/cloud/network/rules/BasicVpnRules.java | 48 + .../com/cloud/network/rules/DhcpEntryRules.java | 80 + .../com/cloud/network/rules/DhcpPvlanRules.java | 67 + .../cloud/network/rules/DhcpSubNetRules.java | 174 ++ .../com/cloud/network/rules/FirewallRules.java | 94 + .../cloud/network/rules/IpAssociationRules.java | 48 + .../cloud/network/rules/LoadBalancingRules.java | 79 + .../cloud/network/rules/NetworkAclsRules.java | 54 + .../cloud/network/rules/NicPlugInOutRules.java | 218 ++ .../network/rules/PasswordToRouterRules.java | 66 + .../network/rules/PrivateGatewayRules.java | 150 + .../com/cloud/network/rules/RuleApplier.java | 45 + .../cloud/network/rules/RuleApplierWrapper.java | 32 + .../network/rules/SshKeyToRouterRules.java | 89 + .../com/cloud/network/rules/StaticNatRules.java | 46 + .../cloud/network/rules/StaticRoutesRules.java | 47 + .../cloud/network/rules/UserdataPwdRules.java | 80 + .../network/rules/UserdataToRouterRules.java | 69 + .../rules/VirtualNetworkApplianceFactory.java | 177 ++ .../network/rules/VpcIpAssociationRules.java | 92 + .../com/cloud/network/vpc/VpcManagerImpl.java | 23 +- .../topology/AdvancedNetworkTopology.java | 231 ++ .../topology/AdvancedNetworkVisitor.java | 215 ++ .../network/topology/BasicNetworkTopology.java | 440 +++ .../network/topology/BasicNetworkVisitor.java | 319 ++ .../network/topology/NetworkTopology.java | 90 + .../topology/NetworkTopologyContext.java | 52 + .../topology/NetworkTopologyVisitor.java | 63 + .../deployment/RouterDeploymentDefinition.java | 457 +++ .../RouterDeploymentDefinitionBuilder.java | 217 ++ .../VpcRouterDeploymentDefinition.java | 182 ++ .../element/VirtualRouterElementTest.java | 10 +- .../network/router/NetworkHelperImplTest.java | 156 + .../network/router/RouterControlHelperTest.java | 105 + .../VirtualNetworkApplianceManagerImplTest.java | 283 +- .../MockVpcVirtualNetworkApplianceManager.java | 229 +- .../RouterDeploymentDefinitionTest.java | 941 ++++++ .../RouterDeploymentDefinitionTestBase.java | 134 + .../VpcRouterDeploymentDefinitionTest.java | 230 ++ 55 files changed, 9072 insertions(+), 3948 deletions(-) ----------------------------------------------------------------------
