Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: bfederle@apache.org
To: commits@cloudstack.apache.org
Date: Mon, 07 Oct 2013 18:30:47 -0000
Message-Id: <9787f0cda1a3494baa787f37aa9a66b9@git.apache.org>
In-Reply-To: <29a32d812e6f4b29a60c3ac9e7f0dd1c@git.apache.org>
References: <29a32d812e6f4b29a60c3ac9e7f0dd1c@git.apache.org>
Subject: [22/27] git commit: updated refs/heads/ui-restyle to 205f22b

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/fbf057a3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fbf057a3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fbf057a3

Branch: refs/heads/ui-restyle
Commit: fbf057a3236dcce96c0f08b419963831e411c243
Parents: cf4a612
Author: Girish Shilamkar <girish@clogeny.com>
Authored: Sun Oct 6 18:01:43 2013 -0400
Committer: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
Committed: Mon Oct 7 21:41:06 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/fbf057a3/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"])