Repository: cloudstack Updated Branches: refs/heads/master d360edede -> 5d9e6161b
CLOUDSTACK-9511: fix test_privategw_acl.py to handle multiple physical network fix to ensure only physical network with guest traffic is picked up for creating a private network for vpc private gateway Signed-off-by: Murali Reddy <muralimmre...@gmail.com> This closes #1724 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5d9e6161 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5d9e6161 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5d9e6161 Branch: refs/heads/master Commit: 5d9e6161b61a65237c46cfad802b9d57852b1689 Parents: d360ede Author: Murali Reddy <muralimmre...@gmail.com> Authored: Mon Oct 24 15:15:35 2016 +0530 Committer: Murali Reddy <muralimmre...@gmail.com> Committed: Tue Oct 25 14:13:22 2016 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_privategw_acl.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d9e6161/test/integration/smoke/test_privategw_acl.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_privategw_acl.py b/test/integration/smoke/test_privategw_acl.py index 15f499e..03a99d1 100644 --- a/test/integration/smoke/test_privategw_acl.py +++ b/test/integration/smoke/test_privategw_acl.py @@ -876,5 +876,12 @@ class TestPrivateGwACL(cloudstackTestCase): if not physical_networks: return None for physical_network in physical_networks: - if physical_network.vlan: - return physical_network + if not physical_network.removed and physical_network.vlan: + traffic_type_list = self.dbclient.execute( + "select traffic_type from physical_network_traffic_types where physical_network_id=\ + (select id from physical_network where uuid='%s');" % physical_network.id + ) + for traffic_type in traffic_type_list: + if "Guest" in str(traffic_type[0]): + return physical_network + return None
