Merge branch 'master-6-17-stable' of https://git-wip-us.apache.org/repos/asf/cloudstack into master-6-17-stable
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e43dd6e0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e43dd6e0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e43dd6e0 Branch: refs/heads/master-6-17-stable Commit: e43dd6e0cf7a79be603e94d9af84c54e524940ee Parents: 869083f 93712c2 Author: Sateesh Chodapuneedi <[email protected]> Authored: Sat Jun 29 01:03:57 2013 +0530 Committer: Sateesh Chodapuneedi <[email protected]> Committed: Sat Jun 29 01:03:57 2013 +0530 ---------------------------------------------------------------------- test/integration/component/test_accounts.py | 21 +- .../component/test_affinity_groups.py | 1547 +++++++ test/integration/component/test_baremetal.py | 122 + test/integration/component/test_blocker_bugs.py | 303 -- .../component/test_explicit_dedication.py | 3 - .../component/test_implicit_planner.py | 3 - .../component/test_netscaler_configs.py | 2 +- test/integration/component/test_netscaler_lb.py | 4 +- .../component/test_netscaler_nw_off.py | 5 +- .../component/test_recurring_snapshots.py | 405 ++ .../component/test_redundant_router.py | 4096 +----------------- .../component/test_redundant_router_cleanups.py | 675 +++ ...test_redundant_router_deployment_planning.py | 1006 +++++ .../test_redundant_router_network_rules.py | 1416 ++++++ .../component/test_redundant_router_services.py | 375 ++ .../component/test_redundant_router_upgrades.py | 486 +++ .../component/test_shared_networks.py | 1 + test/integration/component/test_snapshot_gc.py | 474 ++ .../component/test_snapshot_limits.py | 384 ++ test/integration/component/test_snapshots.py | 2171 +++------- .../component/test_storage_motion.py | 3 - test/integration/component/test_volumes.py | 68 +- test/integration/component/test_vpc.py | 44 +- test/integration/component/test_vpc_network.py | 80 +- .../component/test_vpc_network_lbrules.py | 3 - .../component/test_vpc_network_pfrules.py | 3 - .../component/test_vpc_network_staticnatrule.py | 3 - .../integration/component/test_vpc_offerings.py | 52 +- test/integration/smoke/test_network.py | 2 +- test/integration/smoke/test_nic.py | 3 - test/integration/smoke/test_resource_detail.py | 3 - test/integration/smoke/test_routers.py | 80 +- test/integration/smoke/test_scale_vm.py | 3 - test/integration/smoke/test_snapshots.py | 345 ++ test/integration/smoke/test_ssvm.py | 42 +- test/integration/smoke/test_vm_life_cycle.py | 38 +- test/integration/smoke/test_volumes.py | 1 - tools/marvin/marvin/configGenerator.py | 13 +- tools/marvin/marvin/deployDataCenter.py | 16 +- tools/marvin/marvin/integration/lib/base.py | 38 +- ui/scripts/autoscaler.js | 2 +- 41 files changed, 8097 insertions(+), 6244 deletions(-) ----------------------------------------------------------------------
