apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-4262: Wait twice network.gc for vpcvr shutdown

Browse Source 
Wait a little bit longer for the VpcVr to shutdown on network shutdown.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 4ed5033a59c7aa5fe95f865c5fcbdba21c03616e)
This commit is contained in:
Prasanna Santhanam 2013-08-14 12:46:07 +05:30
parent 211f519421
commit 042f998db4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/integration/component/test_vpc_network.py
View File

@ -2340,8 +2340,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
@attr(tags=["advanced", "intervlan"]) @attr(tags=["advanced", "intervlan"])
def test_01_wait_network_gc(self): def test_01_wait_network_gc(self):
""" Test stop all the Vms that are part of the a Network """ Test network gc after shutdown of vms in the network
(Wait for network GC).Start 1 Vm from the network.
""" """
# Validate the following # Validate the following
@ -2358,7 +2357,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
self.debug("Waiting for network garbage collection thread to run") self.debug("Waiting for network garbage collection thread to run")
# Wait for the network garbage collection thread to run # Wait for the network garbage collection thread to run
wait_for_cleanup(self.apiclient, wait_for_cleanup(self.apiclient,
["network.gc.interval", "network.gc.wait"]) ["network.gc.interval", "network.gc.wait"]*2)
self.debug("Check if the VPC router is in stopped state?") self.debug("Check if the VPC router is in stopped state?")
routers = Router.list( routers = Router.list(
self.apiclient, self.apiclient,
@ -2376,13 +2375,13 @@ class TestVPCNetworkGc(cloudstackTestCase):
self.assertEqual( self.assertEqual(
router.state, router.state,
"Stopped", "Stopped",
"Router state should be stopped after netwrok.gc.interval" "Router state should be stopped after network gc"
) )
return return
@attr(tags=["advanced", "intervlan"]) @attr(tags=["advanced", "intervlan"])
def test_02_start_vm_network_gc(self): def test_02_start_vm_network_gc(self):
""" Test network rules after starting an instance in VPC """ Test network rules after starting a VpcVr that was shutdown after network.gc
""" """
# Validate the following # Validate the following