Updated Branches: refs/heads/master 2d6301970 -> d11681fb0
Network GC test moved to regression suite The network GC test is a long running test as it waits for network.gc.wait + network.gc.interval * 2 to verify that the network cleanups happen corectly. This test is also part of the regression suite and is redundant in the smoke. The test run takes 30m longer because of this test included in smoke. Signed-off-by: Prasanna Santhanam <t...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d11681fb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d11681fb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d11681fb Branch: refs/heads/master Commit: d11681fb05e5df72e0490229cd1ffc2bcfe85d44 Parents: 2d63019 Author: Prasanna Santhanam <t...@apache.org> Authored: Fri Jul 5 18:49:31 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Fri Jul 5 18:52:47 2013 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_routers.py | 94 ----------------------------- 1 file changed, 94 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d11681fb/test/integration/smoke/test_routers.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py index 22de29b..49c4969 100644 --- a/test/integration/smoke/test_routers.py +++ b/test/integration/smoke/test_routers.py @@ -789,97 +789,3 @@ class TestRouterServices(cloudstackTestCase): "Check list router response for router public IP" ) return - - @attr(configuration = "network.gc") - @attr(tags = ["advanced", "advancedns", "smoke"]) - def test_10_network_gc(self): - """Test network GC - """ - - # Validate the following - # 1. stop All User VMs in the account - # 2. wait for network.gc.interval time" - # 3. After network.gc.interval, router should be stopped - # 4. ListRouters should return the router in Stopped state - - list_vms = list_virtual_machines( - self.apiclient, - account=self.account.name, - domainid=self.account.domainid - ) - self.assertEqual( - isinstance(list_vms, list), - True, - "Check list response returns a valid list" - ) - self.assertNotEqual( - len(list_vms), - 0, - "Check length of list VM response" - ) - - for vm in list_vms: - self.debug("Stopping the VM with ID: %s" % vm.id) - # Stop all virtual machines associated with that account - cmd = stopVirtualMachine.stopVirtualMachineCmd() - cmd.id = vm.id - self.apiclient.stopVirtualMachine(cmd) - - # Get network.gc.interval config value - config = list_configurations( - self.apiclient, - name='network.gc.interval' - ) - self.assertEqual( - isinstance(config, list), - True, - "Check list response returns a valid list" - ) - gcinterval = config[0] - - # Get network.gc.wait config value - config = list_configurations( - self.apiclient, - name='network.gc.wait' - ) - self.assertEqual( - isinstance(config, list), - True, - "Check list response returns a valid list" - ) - gcwait = config[0] - - total_wait = int(gcinterval.value) + int(gcwait.value) - self.debug("Waiting %s seconds for network cleanup" % str(total_wait * 2)) - # Wait for wait_time * 2 time to cleanup all the resources - time.sleep(total_wait * 2) - - timeout = self.services["timeout"] - while True: - #Check status of network router - list_router_response = list_routers( - self.apiclient, - account=self.account.name, - domainid=self.account.domainid - ) - if isinstance(list_router_response, list): - break - elif timeout == 0: - raise Exception("List router call failed!") - time.sleep(5) - timeout = timeout -1 - - self.assertEqual( - isinstance(list_router_response, list), - True, - "Check list response returns a valid list" - ) - router = list_router_response[0] - - self.debug("Router state after network.gc.interval: %s" % router.state) - self.assertEqual( - router.state, - 'Stopped', - "Check state of the router after stopping all VMs associated" - ) - return
