Merge branch 'master' into ui-vpc-redesign
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1c2ee353 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1c2ee353 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1c2ee353 Branch: refs/heads/ui-vpc-redesign Commit: 1c2ee353456b9eee6ae61f594953fbd80684b93b Parents: ce78024 edb2f3d Author: Brian Federle <[email protected]> Authored: Tue May 14 13:55:09 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Tue May 14 13:55:09 2013 -0700 ---------------------------------------------------------------------- .../command/admin/vpc/CreatePrivateGatewayCmd.java | 2 +- client/tomcatconf/commands.properties.in | 6 +- debian/changelog | 6 + docs/en-US/build-rpm.xml | 2 +- docs/en-US/gslb.xml | 35 +- docs/en-US/host-add-xenserver-kvm-ovm.xml | 4 +- .../com/cloud/network/vpc/dao/VpcGatewayDao.java | 5 + .../cloud/network/vpc/dao/VpcGatewayDaoImpl.java | 9 + packaging/centos63/cloud.spec | 4 + .../lb/InternalLoadBalancerVMManagerImpl.java | 9 +- .../internallbvmmgr/InternalLBVMServiceTest.java | 35 +- .../internallbvmmgr/LbChildTestConfiguration.java | 8 + .../src/com/cloud/network/NetworkServiceImpl.java | 7 +- .../cloud/network/vpc/NetworkACLServiceImpl.java | 2 +- server/src/com/cloud/network/vpc/VpcManager.java | 2 + .../src/com/cloud/network/vpc/VpcManagerImpl.java | 37 +- server/test/com/cloud/vpc/MockVpcManagerImpl.java | 5 + test/integration/component/test_asa1000v_fw.py | 2 +- test/integration/component/test_eip_elb.py | 4 +- .../component/test_high_availability.py | 1080 +++ .../component/test_host_high_availability.py | 814 +++ .../component/test_multiple_ip_ranges.py | 125 +- .../component/test_netscaler_configs.py | 3024 ++++++++ test/integration/component/test_netscaler_lb.py | 2964 ++++++++ .../component/test_netscaler_lb_algo.py | 2031 ++++++ .../component/test_netscaler_lb_sticky.py | 1032 +++ .../integration/component/test_netscaler_nw_off.py | 2370 ++++++ .../integration/component/test_network_offering.py | 4 +- .../integration/component/test_redundant_router.py | 5581 +++++++++++++++ test/integration/component/test_regions.py | 1 - .../integration/component/test_regions_accounts.py | 2 +- test/integration/component/test_security_groups.py | 4 +- test/integration/component/test_shared_networks.py | 2986 ++++++++ test/integration/component/test_stopped_vm.py | 2036 ++++++ test/integration/component/test_tags.py | 2325 ++++++ test/integration/component/test_vpc.py | 2724 +++++++ .../component/test_vpc_host_maintenance.py | 891 +++ test/integration/component/test_vpc_network.py | 2587 +++++++ .../component/test_vpc_network_lbrules.py | 1025 +++ .../component/test_vpc_network_pfrules.py | 876 +++ .../component/test_vpc_network_staticnatrule.py | 710 ++ test/integration/component/test_vpc_offerings.py | 1201 ++++ test/integration/component/test_vpc_routers.py | 1398 ++++ .../component/test_vpc_vm_life_cycle.py | 3603 ++++++++++ .../component/test_vpc_vms_deployment.py | 2458 +++++++ test/integration/component/test_vpn_users.py | 22 +- test/integration/smoke/test_deploy_vm.py | 153 + test/integration/smoke/test_global_settings.py | 7 +- test/integration/smoke/test_guest_vlan_range.py | 15 - tools/marvin/marvin/sandbox/advanced/sandbox.cfg | 209 - ui/scripts/vpc.js | 142 +- 51 files changed, 44240 insertions(+), 344 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c2ee353/ui/scripts/vpc.js ----------------------------------------------------------------------
