cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject [5/5] git commit: updated refs/heads/4.5 to 5f99917
Date Mon, 17 Nov 2014 09:46:37 GMT
CLOUDSTACK-7912: Remove hardcoded netscaler info and read it from config file

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

Branch: refs/heads/4.5
Commit: 5f99917991a59f8ecd6d8b0e17b497fe210e636e
Parents: 19781e0
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Fri Nov 14 19:53:25 2014 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Mon Nov 17 15:14:27 2014 +0530

----------------------------------------------------------------------
 .../component/test_lb_secondary_ip.py           |   12 +-
 test/integration/component/test_netscaler_lb.py | 3011 +++++++++---------
 .../component/test_netscaler_lb_algo.py         | 2180 +++++++------
 .../component/test_netscaler_lb_sticky.py       | 1013 +++---
 .../component/test_persistent_networks.py       |   30 +-
 tools/marvin/marvin/lib/common.py               |   18 +
 6 files changed, 3251 insertions(+), 3013 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5f999179/test/integration/component/test_lb_secondary_ip.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_lb_secondary_ip.py b/test/integration/component/test_lb_secondary_ip.py
index 23ff1ee..b4f6ed0 100644
--- a/test/integration/component/test_lb_secondary_ip.py
+++ b/test/integration/component/test_lb_secondary_ip.py
@@ -49,7 +49,8 @@ from marvin.lib.common import (get_domain,
                                get_template,
                                verifyNetworkState,
                                wait_for_cleanup,
-                               add_netscaler
+                               add_netscaler,
+                               GetNetscalerInfoFromConfig
                                )
 
 from marvin.lib.utils import (validateList,
@@ -1775,11 +1776,18 @@ class TestExternalLoadBalancer(cloudstackTestCase):
         cls.testdata["virtual_machine"]["template"] = template.id
         cls._cleanup = []
 
+        response = GetNetscalerInfoFromConfig(
+            cls.config
+        )
+        assert response[0] is not None, response[1]
+        cls.testdata["netscaler"] = response[0]
+        cls.testdata["netscaler"]["lbdevicededicated"] = False
+
         try:
             cls.netscaler = add_netscaler(
                 cls.api_client,
                 cls.zone.id,
-                cls.testdata["netscaler_VPX"])
+                cls.testdata["netscaler"])
             cls._cleanup.append(cls.netscaler)
         except Exception as e:
             raise unittest.SkipTest("Failed to add netscaler device: %s" % e)


Mime
View raw message