You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/07/05 15:23:26 UTC
git commit: updated refs/heads/master-6-17-stable to cb939ee
Updated Branches:
refs/heads/master-6-17-stable 5dbc1d2ff -> cb939eee9
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 <ts...@apache.org>
(cherry picked from commit 915f7b9c12fb816ff87558e2b95599e74b8e9462)
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cb939eee
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cb939eee
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cb939eee
Branch: refs/heads/master-6-17-stable
Commit: cb939eee9b39cb48dfd302b70961e39253d35076
Parents: 5dbc1d2
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Jul 5 18:49:31 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Jul 5 18:52:20 2013 +0530
----------------------------------------------------------------------
test/integration/smoke/test_routers.py | 93 -----------------------------
1 file changed, 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cb939eee/test/integration/smoke/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py
index 6fa08e0..49c4969 100644
--- a/test/integration/smoke/test_routers.py
+++ b/test/integration/smoke/test_routers.py
@@ -789,96 +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)
- # 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