You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/10/21 04:47:35 UTC
[18/18] git commit: updated refs/heads/4.9 to 9b9b49e
Merge branch '4.8' into 4.9
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9b9b49e1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9b9b49e1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9b9b49e1
Branch: refs/heads/4.9
Commit: 9b9b49e10bcc8ff8cd40d623619a4962ab161509
Parents: 2ebf949 a664e03
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri Oct 21 10:14:16 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Oct 21 10:14:16 2016 +0530
----------------------------------------------------------------------
.../debian/config/opt/cloud/bin/merge.py | 13 ++-
.../smoke/test_deploy_vgpu_enabled_vm.py | 5 +-
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, 478 insertions(+), 216 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b9b49e1/systemvm/patches/debian/config/opt/cloud/bin/merge.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b9b49e1/test/integration/smoke/test_privategw_acl.py
----------------------------------------------------------------------
diff --cc test/integration/smoke/test_privategw_acl.py
index a1c5e85,33a5d3f..15f499e
--- a/test/integration/smoke/test_privategw_acl.py
+++ b/test/integration/smoke/test_privategw_acl.py
@@@ -242,12 -242,8 +243,12 @@@ class TestPrivateGwACL(cloudstackTestCa
qresultset = self.dbclient.execute(
"select vnet from op_dc_vnet_alloc where physical_network_id=\
- (select id from physical_network where uuid='%s' ) and taken is NULL;" % physical_networks[0].id
+ (select id from physical_network where uuid='%s' ) and taken is NULL and reservation_id is NULL and account_id is NULL ORDER BY id DESC;" % physical_network.id
)
+ self.assertEqual(validateList(qresultset)[0],
+ PASS,
+ "Invalid sql query response"
+ )
vlans = qresultset
vlan_1 = int(vlans[0][0])
@@@ -318,12 -314,8 +319,12 @@@
qresultset = self.dbclient.execute(
"select vnet from op_dc_vnet_alloc where physical_network_id=\
- (select id from physical_network where uuid='%s' ) and taken is NULL;" % physical_networks[0].id
+ (select id from physical_network where uuid='%s' ) and taken is NULL and reservation_id is NULL and account_id is NULL ORDER BY id DESC;" % physical_network.id
)
+ self.assertEqual(validateList(qresultset)[0],
+ PASS,
+ "Invalid sql query response"
+ )
vlans = qresultset
vlan_1 = int(vlans[0][0])
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b9b49e1/tools/marvin/marvin/lib/base.py
----------------------------------------------------------------------