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/25 10:22:09 UTC
[2/4] git commit: updated refs/heads/4.9 to 770397c
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 <mu...@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/e1202a0b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e1202a0b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e1202a0b
Branch: refs/heads/4.9
Commit: e1202a0b06d687438203af4917badef3b3618e21
Parents: fae9034
Author: Murali Reddy <mu...@gmail.com>
Authored: Mon Oct 24 15:15:35 2016 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Tue Oct 25 13:31:35 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/e1202a0b/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 33a5d3f..1a86175 100644
--- a/test/integration/smoke/test_privategw_acl.py
+++ b/test/integration/smoke/test_privategw_acl.py
@@ -867,5 +867,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