Merge branch '4.9'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ccd1734d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ccd1734d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ccd1734d Branch: refs/heads/master Commit: ccd1734dc4802f04413f5c5d9766ef77630ac0fb Parents: c9e14c9 9b9b49e Author: Rohit Yadav <[email protected]> Authored: Fri Oct 21 10:15:29 2016 +0530 Committer: Rohit Yadav <[email protected]> Committed: Fri Oct 21 10:15:29 2016 +0530 ---------------------------------------------------------------------- .../debian/config/opt/cloud/bin/merge.py | 13 ++- .../smoke/test_deploy_vgpu_enabled_vm.py | 6 +- test/integration/smoke/test_internal_lb.py | 15 +-- test/integration/smoke/test_network.py | 5 +- test/integration/smoke/test_network_acl.py | 2 +- .../smoke/test_non_contigiousvlan.py | 15 ++- test/integration/smoke/test_password_server.py | 47 +++++---- test/integration/smoke/test_primary_storage.py | 3 + test/integration/smoke/test_privategw_acl.py | 105 ++++++++++++------- test/integration/smoke/test_router_dhcphosts.py | 47 +++++---- .../test_routers_iptables_default_policy.py | 80 +++++++++----- .../smoke/test_routers_network_ops.py | 84 +++++++++++++-- test/integration/smoke/test_snapshots.py | 82 ++++++++++++--- test/integration/smoke/test_vm_snapshots.py | 35 ++----- test/integration/smoke/test_vpc_redundant.py | 66 ++++++++++-- test/integration/smoke/test_vpc_router_nics.py | 4 +- test/integration/smoke/test_vpc_vpn.py | 28 +++-- tools/marvin/marvin/lib/base.py | 56 +++++----- tools/marvin/marvin/lib/common.py | 2 + 19 files changed, 479 insertions(+), 216 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ccd1734d/test/integration/smoke/test_deploy_vgpu_enabled_vm.py ----------------------------------------------------------------------
