Merge "[Fullstack] Wait for SG to be applied by L2 agent" into stable/queens
This commit is contained in:
commit
e8b937aca0
|
@ -62,15 +62,22 @@ class BaseSecurityGroupsSameNetworkTest(base.BaseFullStackTestCase):
|
|||
|
||||
def assert_connection(self, *args, **kwargs):
|
||||
netcat = net_helpers.NetcatTester(*args, **kwargs)
|
||||
|
||||
def test_connectivity():
|
||||
try:
|
||||
return netcat.test_connectivity()
|
||||
except RuntimeError:
|
||||
return False
|
||||
|
||||
try:
|
||||
self.assertTrue(netcat.test_connectivity())
|
||||
common_utils.wait_until_true(test_connectivity)
|
||||
finally:
|
||||
netcat.stop_processes()
|
||||
|
||||
def assert_no_connection(self, *args, **kwargs):
|
||||
netcat = net_helpers.NetcatTester(*args, **kwargs)
|
||||
try:
|
||||
self.assertRaises(RuntimeError, netcat.test_connectivity)
|
||||
common_utils.wait_until_true(netcat.test_no_connectivity)
|
||||
finally:
|
||||
netcat.stop_processes()
|
||||
|
||||
|
@ -170,9 +177,9 @@ class TestSecurityGroupsSameNetwork(BaseSecurityGroupsSameNetworkTest):
|
|||
self.assert_connection(
|
||||
vms[2].namespace, vms[0].namespace, vms[0].ip, 3333,
|
||||
net_helpers.NetcatTester.TCP)
|
||||
net_helpers.assert_ping(vms[0].namespace, vms[1].ip)
|
||||
net_helpers.assert_ping(vms[0].namespace, vms[2].ip)
|
||||
net_helpers.assert_ping(vms[1].namespace, vms[2].ip)
|
||||
vms[0].block_until_ping(vms[1].ip)
|
||||
vms[0].block_until_ping(vms[2].ip)
|
||||
vms[1].block_until_ping(vms[2].ip)
|
||||
|
||||
# Apply security groups to the ports
|
||||
for port, sg in zip(ports, index_to_sg):
|
||||
|
@ -199,9 +206,9 @@ class TestSecurityGroupsSameNetwork(BaseSecurityGroupsSameNetworkTest):
|
|||
net_helpers.NetcatTester.TCP)
|
||||
|
||||
# 3. check if traffic not explicitly allowed (eg. ICMP) is blocked
|
||||
net_helpers.assert_no_ping(vms[0].namespace, vms[1].ip)
|
||||
net_helpers.assert_no_ping(vms[0].namespace, vms[2].ip)
|
||||
net_helpers.assert_no_ping(vms[1].namespace, vms[2].ip)
|
||||
vms[0].block_until_no_ping(vms[1].ip)
|
||||
vms[0].block_until_no_ping(vms[2].ip)
|
||||
vms[1].block_until_no_ping(vms[2].ip)
|
||||
|
||||
# 4. check if a security group update takes effect
|
||||
self.assert_no_connection(
|
||||
|
|
Loading…
Reference in New Issue