cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sw...@apache.org
Subject git commit: updated refs/heads/4.2 to 808b960
Date Fri, 11 Oct 2013 07:08:31 GMT
Updated Branches:
  refs/heads/4.2 eb8c0a7e1 -> 808b96070


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 <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit abdb84bb05abc9f2bd102bca1c1b34865f34d771)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/808b9607
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/808b9607
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/808b9607

Branch: refs/heads/4.2
Commit: 808b96070e17976f8ae7424b437713f329be7ac4
Parents: eb8c0a7
Author: Girish Shilamkar <girish@clogeny.com>
Authored: Sun Oct 6 18:01:43 2013 -0400
Committer: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
Committed: Fri Oct 11 12:38:11 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/808b9607/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 970a625..1d0b2d2 100644
--- a/test/integration/component/test_vpc_network.py
+++ b/test/integration/component/test_vpc_network.py
@@ -2354,26 +2354,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"])


Mime
View raw message