cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject [2/2] git commit: updated refs/heads/master to e768d70
Date Tue, 17 Feb 2015 13:03:41 GMT
CLOUDSTACK-8261: test_haproxy.py - Remove the code checking AppCookle and LbCookie Stickiness
policies

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>


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

Branch: refs/heads/master
Commit: e768d702cb4edbf544805de6bb79854c5c55289a
Parents: 8bfda97
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Tue Feb 17 03:22:35 2015 -0800
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Tue Feb 17 18:33:24 2015 +0530

----------------------------------------------------------------------
 test/integration/component/test_haproxy.py | 41 ++++++++++++-------------
 1 file changed, 19 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e768d702/test/integration/component/test_haproxy.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_haproxy.py b/test/integration/component/test_haproxy.py
index 73257e6..6a64fc1 100644
--- a/test/integration/component/test_haproxy.py
+++ b/test/integration/component/test_haproxy.py
@@ -357,7 +357,8 @@ class TestHAProxyStickyness(cloudstackTestCase):
                 self.virtual_machine,
                 self.virtual_machine_2])
 
-        methods = ["SourceBased", "AppCookie", "LBCookie"]
+        #TODO: Add code to check the AppCookie and LbCookie Stickiness policies
+        methods = ["SourceBased"]
         for method in methods:
             self.debug("Creating stickiness policy for the LB rule: %s" %
                        lb_rule.id)
@@ -390,10 +391,9 @@ class TestHAProxyStickyness(cloudstackTestCase):
 
         lb_methods = ["roundrobin", "leastconn", "source"]
 
-        configs = {"SourceBased": {"tablesize": '100k'},
-                   "AppCookie": {"request-learn": "true"},
-                   "LBCookie": {"nocache": "true"}}
+        configs = {"SourceBased": {"tablesize": '100k'}}
 
+        #TODO: Add code to check the AppCookie and LbCookie Stickiness policies
         for lb_method in lb_methods:
             self.debug("Creating a load balancing rule on IP %s and algo %s" %
                        (self.public_ip.ipaddress.ipaddress, lb_method))
@@ -491,9 +491,8 @@ class TestHAProxyStickyness(cloudstackTestCase):
 
         lb_methods = ["roundrobin", "leastconn", "source"]
 
-        configs = {"SourceBased": {"tablesize": '100k'},
-                   "AppCookie": {"request-learn": "true"},
-                   "LBCookie": {"nocache": "true"}}
+        #TODO: Add code to check the AppCookie and LbCookie Stickiness policies
+        configs = {"SourceBased": {"tablesize": '100k'}}
         for lb_method in lb_methods:
             for method, params in configs.items():
                 self.debug("Creating load balancing rule on IP %s & algo %s" %
@@ -562,9 +561,8 @@ class TestHAProxyStickyness(cloudstackTestCase):
         # 4. No errors should be shown in the logs and alerts
 
         lb_methods = ["roundrobin", "leastconn", "source"]
-        configs = {"SourceBased": {"tablesize": '100k'},
-                   "AppCookie": {"request-learn": "true"},
-                   "LBCookie": {"nocache": "true"}}
+        #TODO: Add code to check the AppCookie and LbCookie Stickiness policies
+        configs = {"SourceBased": {"tablesize": '100k'}}
         for lb_method in lb_methods:
             for method, params in configs.items():
                 self.debug("Creating load balancing rule on IP %s & algo %s" %
@@ -628,9 +626,8 @@ class TestHAProxyStickyness(cloudstackTestCase):
 
         lb_methods = ["roundrobin", "leastconn", "source"]
 
-        configs = {"SourceBased": {"tablesize": '100k'},
-                   "AppCookie": {"request-learn": "true"},
-                   "LBCookie": {"nocache": "true"}}
+        #TODO: Add code to check the AppCookie and LbCookie Stickiness policies
+        configs = {"SourceBased": {"tablesize": '100k'}}
 
         for lb_method in lb_methods:
             for method, params in configs.items():
@@ -699,14 +696,14 @@ class TestHAProxyStickyness(cloudstackTestCase):
                 self.virtual_machine,
                 self.virtual_machine_2])
 
-        policies = self.configure_Stickiness_Policy(lb_rule, method="LbCookie")
+        policies = self.configure_Stickiness_Policy(lb_rule, method="SourceBased")
         policy = policies.stickinesspolicy[0]
 
         self.debug("Policy: %s" % str(policy))
         self.debug("Validating the stickiness policy")
         self.validate_Stickiness_Policy(
             lb_rule,
-            "LbCookie",
+            "SourceBased",
             self.public_ip.ipaddress.ipaddress)
 
         # removing account from cleanup list as we're deleting account
@@ -751,7 +748,7 @@ class TestHAProxyStickyness(cloudstackTestCase):
         self.debug("Stopping the router: %s" % router.name)
         Router.stop(self.apiclient, id=router.id)
 
-        policies = self.configure_Stickiness_Policy(lb_rule, method="LbCookie")
+        policies = self.configure_Stickiness_Policy(lb_rule, method="SourceBased")
         policy = policies.stickinesspolicy[0]
 
         self.debug("Starting the router: %s" % router.name)
@@ -761,7 +758,7 @@ class TestHAProxyStickyness(cloudstackTestCase):
         self.debug("Validating the stickiness policy")
         self.validate_Stickiness_Policy(
             lb_rule,
-            "LbCookie",
+            "SourceBased",
             self.public_ip.ipaddress.ipaddress)
         return
 
@@ -788,14 +785,14 @@ class TestHAProxyStickyness(cloudstackTestCase):
                    self.account.name)
         router = self.get_router(self.account)
 
-        policies = self.configure_Stickiness_Policy(lb_rule, method="LbCookie")
+        policies = self.configure_Stickiness_Policy(lb_rule, method="SourceBased")
         policy = policies.stickinesspolicy[0]
 
         self.debug("Policy: %s" % str(policy))
         self.debug("Validating the stickiness policy")
         self.validate_Stickiness_Policy(
             lb_rule,
-            "LbCookie",
+            "SourceBased",
             self.public_ip.ipaddress.ipaddress)
 
         self.debug("Destroying the router: %s" % router.name)
@@ -823,14 +820,14 @@ class TestHAProxyStickyness(cloudstackTestCase):
                 self.virtual_machine,
                 self.virtual_machine_2])
 
-        policies = self.configure_Stickiness_Policy(lb_rule, method="LbCookie")
+        policies = self.configure_Stickiness_Policy(lb_rule, method="SourceBased")
         policy = policies.stickinesspolicy[0]
 
         self.debug("Policy: %s" % str(policy))
         self.debug("Validating the stickiness policy")
         self.validate_Stickiness_Policy(
             lb_rule,
-            "LbCookie",
+            "SourceBased",
             self.public_ip.ipaddress.ipaddress)
 
         self.debug("Enabling VPN on Public Ip: %s" %
@@ -840,7 +837,7 @@ class TestHAProxyStickyness(cloudstackTestCase):
         self.debug("Validating the stickiness policy after enabling VPN")
         self.validate_Stickiness_Policy(
             lb_rule,
-            "LbCookie",
+            "SourceBased",
             self.public_ip.ipaddress.ipaddress)
         return
 


Mime
View raw message