You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2013/10/07 18:10:02 UTC
git commit: updated refs/heads/4.2-forward to abdb84b
Updated Branches:
refs/heads/4.2-forward 76c85d0ce -> abdb84bb0
CLOUDSTACK-4262: Fix TestVPCNetworkGc.test_01_wait_network_gc
As per the test plan, after waiting for network gc
LB rules should be cleared. Added that check instead of router
being in stopped state.
Signed-off-by: venkataswamybabu budumuru <ve...@citrix.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/abdb84bb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/abdb84bb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/abdb84bb
Branch: refs/heads/4.2-forward
Commit: abdb84bb05abc9f2bd102bca1c1b34865f34d771
Parents: 76c85d0
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Sun Oct 6 18:01:43 2013 -0400
Committer: venkataswamybabu budumuru <ve...@citrix.com>
Committed: Mon Oct 7 21:39:12 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_vpc_network.py | 30 +++++++--------------
1 file changed, 10 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/abdb84bb/test/integration/component/test_vpc_network.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network.py b/test/integration/component/test_vpc_network.py
index 420c05a..ffd41a2 100644
--- a/test/integration/component/test_vpc_network.py
+++ b/test/integration/component/test_vpc_network.py
@@ -2382,26 +2382,16 @@ class TestVPCNetworkGc(cloudstackTestCase):
self.debug("Waiting for network garbage collection thread to run")
# Wait for the network garbage collection thread to run
wait_for_cleanup(self.apiclient,
- ["network.gc.interval", "network.gc.wait"]*2)
- self.debug("Check if the VPC router is in stopped state?")
- routers = Router.list(
- self.apiclient,
- account=self.account.name,
- domainid=self.account.domainid,
- listall=True
- )
- self.assertEqual(
- isinstance(routers, list),
- True,
- "List routers shall return a valid response"
- )
- router = routers[0]
- # TODO: Add some more assertions
- self.assertEqual(
- router.state,
- "Stopped",
- "Router state should be stopped after network gc"
- )
+ ["network.gc.interval", "network.gc.wait"])
+
+ #Bug???: Network Acls are not cleared
+ netacls = NetworkACL.list(self.apiclient, networkid=self.network_1.id)
+ self.debug("List of NetACLS %s" % netacls)
+ self.assertEqual(netacls, None, "Netacls were not cleared after network GC thread is run")
+
+ lbrules = LoadBalancerRule.list(self.apiclient, networkid=self.network_1.id)
+ self.debug("List of LB Rules %s" % lbrules)
+ self.assertEqual(lbrules, None, "LBrules were not cleared after network GC thread is run")
return
@attr(tags=["advanced", "intervlan"])