Updated Branches: refs/heads/master bf6ed9312 -> d5ac10d7b
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d5ac10d7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d5ac10d7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d5ac10d7 Branch: refs/heads/master Commit: d5ac10d7b2f3a232c379a35b3dbe37d60f7640cc Parents: fd8607d bf6ed93 Author: Pranav Saxena <[email protected]> Authored: Mon Jan 7 22:31:51 2013 +0530 Committer: Pranav Saxena <[email protected]> Committed: Mon Jan 7 22:31:51 2013 +0530 ---------------------------------------------------------------------- api/src/com/cloud/agent/api/to/FirewallRuleTO.java | 1 + api/src/com/cloud/agent/api/to/LoadBalancerTO.java | 12 +- .../com/cloud/agent/api/to/StaticNatRuleTO.java | 5 + api/src/com/cloud/network/Network.java | 1 + api/src/com/cloud/network/element/IpDeployer.java | 3 + .../network/element/IpDeployingRequester.java | 28 ++ .../element/LoadBalancingServiceProvider.java | 3 +- .../element/PortForwardingServiceProvider.java | 4 +- .../element/RemoteAccessVPNServiceProvider.java | 4 +- .../network/element/SourceNatServiceProvider.java | 5 +- .../network/element/StaticNatServiceProvider.java | 4 +- api/src/com/cloud/offering/NetworkOffering.java | 1 + client/tomcatconf/commands.properties.in | 5 - .../hypervisor/vmware/resource/VmwareResource.java | 49 ++-- .../network/lb/ElasticLoadBalancerManagerImpl.java | 2 +- .../cloud/api/response/F5LoadBalancerResponse.java | 7 - .../element/F5ExternalLoadBalancerElement.java | 16 +- .../cloud/network/resource/F5BigIpResource.java | 94 ++--- .../element/JuniperSRXExternalFirewallElement.java | 21 +- .../cloud/network/resource/JuniperSrxResource.java | 239 ++++++++++- .../response/NetscalerLoadBalancerResponse.java | 7 - .../cloud/network/element/NetscalerElement.java | 33 +- .../network/juniper/firewall-filter-term-add.xml | 43 ++ .../juniper/firewall-filter-term-getone.xml | 32 ++ scripts/network/juniper/template-entry.xml | 21 + server/src/com/cloud/api/ApiResponseHelper.java | 5 + .../cloud/api/commands/AddTrafficMonitorCmd.java | 3 +- .../cloud/api/commands/ListTrafficMonitorsCmd.java | 3 +- server/src/com/cloud/configuration/Config.java | 1 + .../configuration/ConfigurationManagerImpl.java | 23 +- .../network/ExternalFirewallDeviceManager.java | 9 + .../network/ExternalFirewallDeviceManagerImpl.java | 185 +++++++-- .../ExternalLoadBalancerDeviceManagerImpl.java | 320 +++++++++------ .../network/ExternalLoadBalancerDeviceVO.java | 18 +- .../cloud/network/InlineLoadBalancerNicMapVO.java | 10 +- server/src/com/cloud/network/NetworkManager.java | 11 + .../src/com/cloud/network/NetworkManagerImpl.java | 220 +++++++---- .../com/cloud/network/dao/FirewallRulesDao.java | 4 +- .../cloud/network/dao/FirewallRulesDaoImpl.java | 15 + server/src/com/cloud/network/dao/NetworkDao.java | 1 + .../src/com/cloud/network/dao/NetworkDaoImpl.java | 9 + .../network/lb/LoadBalancingRulesManagerImpl.java | 16 +- .../router/VirtualNetworkApplianceManagerImpl.java | 98 ++++- .../src/com/cloud/offerings/NetworkOfferingVO.java | 11 +- .../com/cloud/server/ConfigurationServerImpl.java | 2 +- .../src/com/cloud/storage/StorageManagerImpl.java | 18 +- .../com/cloud/network/MockNetworkManagerImpl.java | 35 ++ .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 33 ++ .../test/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 6 + setup/db/create-schema.sql | 4 +- setup/db/db/schema-40to410.sql | 9 + tools/cli/cloudmonkey/cloudmonkey.py | 69 ++-- 52 files changed, 1296 insertions(+), 482 deletions(-) ----------------------------------------------------------------------
