CLOUDSTACK-4487: No need to delete offerings or wait on offering cleanup Signed-off-by: Prasanna Santhanam <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bc5b6ae0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bc5b6ae0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bc5b6ae0 Branch: refs/heads/4.2 Commit: bc5b6ae0e41a04ab2c892ce53199c1d7f1d0902c Parents: 5f77493 Author: Sowmya Krishnan <[email protected]> Authored: Sun Aug 25 22:13:23 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Mon Aug 26 10:35:59 2013 +0530 ---------------------------------------------------------------------- .../component/test_netscaler_configs.py | 13 +--- test/integration/component/test_netscaler_lb.py | 33 ---------- .../component/test_netscaler_lb_algo.py | 66 -------------------- .../component/test_netscaler_lb_sticky.py | 11 ---- .../component/test_netscaler_nw_off.py | 11 ---- 5 files changed, 1 insertion(+), 133 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc5b6ae0/test/integration/component/test_netscaler_configs.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_netscaler_configs.py b/test/integration/component/test_netscaler_configs.py index 2ae6429..df4e707 100644 --- a/test/integration/component/test_netscaler_configs.py +++ b/test/integration/component/test_netscaler_configs.py @@ -62,7 +62,7 @@ class Services: "protocol": 'TCP', }, "netscaler": { - "ipaddress": '10.147.60.26', + "ipaddress": '10.147.60.26', "username": 'nsroot', "password": 'nsroot', "networkdevicetype": 'NetscalerVPXLoadBalancer', @@ -2183,17 +2183,6 @@ class TestGuestNetworkShutDown(cloudstackTestCase): try: #Cleanup resources used cleanup_resources(cls.api_client, cls._cleanup) - interval = list_configurations( - cls.api_client, - name='network.gc.interval' - ) - wait = list_configurations( - cls.api_client, - name='network.gc.wait' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) + int(wait[0].value)) - cls.network_offering.delete(cls.api_client) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc5b6ae0/test/integration/component/test_netscaler_lb.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_netscaler_lb.py b/test/integration/component/test_netscaler_lb.py index 901e8a7..8375f25 100644 --- a/test/integration/component/test_netscaler_lb.py +++ b/test/integration/component/test_netscaler_lb.py @@ -2012,17 +2012,6 @@ class TestLoadBalancingRule(cloudstackTestCase): try: #Cleanup resources used cleanup_resources(cls.api_client, cls._cleanup) - interval = list_configurations( - cls.api_client, - name='network.gc.interval' - ) - wait = list_configurations( - cls.api_client, - name='network.gc.wait' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) + int(wait[0].value)) - cls.network_offering.delete(cls.api_client) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return @@ -2229,17 +2218,6 @@ class TestDeleteCreateLBRule(cloudstackTestCase): try: #Cleanup resources used cleanup_resources(cls.api_client, cls._cleanup) - interval = list_configurations( - cls.api_client, - name='network.gc.interval' - ) - wait = list_configurations( - cls.api_client, - name='network.gc.wait' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) + int(wait[0].value)) - cls.network_offering.delete(cls.api_client) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return @@ -2399,17 +2377,6 @@ class TestVmWithLb(cloudstackTestCase): try: #Cleanup resources used cleanup_resources(cls.api_client, cls._cleanup) - interval = list_configurations( - cls.api_client, - name='network.gc.interval' - ) - wait = list_configurations( - cls.api_client, - name='network.gc.wait' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) + int(wait[0].value)) - cls.network_offering.delete(cls.api_client) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc5b6ae0/test/integration/component/test_netscaler_lb_algo.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_netscaler_lb_algo.py b/test/integration/component/test_netscaler_lb_algo.py index 8033228..24c1837 100644 --- a/test/integration/component/test_netscaler_lb_algo.py +++ b/test/integration/component/test_netscaler_lb_algo.py @@ -842,17 +842,6 @@ class TestLbAlgoRrLc(cloudstackTestCase): try: # Cleanup resources used cleanup_resources(cls.api_client, cls._cleanup) - interval = list_configurations( - cls.api_client, - name='network.gc.interval' - ) - wait = list_configurations( - cls.api_client, - name='network.gc.wait' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) + int(wait[0].value)) - cls.network_offering.delete(cls.api_client) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return @@ -1058,17 +1047,6 @@ class TestLbAlgoLcRr(cloudstackTestCase): try: # Cleanup resources used cleanup_resources(cls.api_client, cls._cleanup) - interval = list_configurations( - cls.api_client, - name='network.gc.interval' - ) - wait = list_configurations( - cls.api_client, - name='network.gc.wait' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) + int(wait[0].value)) - cls.network_offering.delete(cls.api_client) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return @@ -1272,17 +1250,6 @@ class TestLbAlgoRrSb(cloudstackTestCase): try: # Cleanup resources used cleanup_resources(cls.api_client, cls._cleanup) - interval = list_configurations( - cls.api_client, - name='network.gc.interval' - ) - wait = list_configurations( - cls.api_client, - name='network.gc.wait' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) + int(wait[0].value)) - cls.network_offering.delete(cls.api_client) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return @@ -1489,17 +1456,6 @@ class TestLbAlgoSbRr(cloudstackTestCase): try: # Cleanup resources used cleanup_resources(cls.api_client, cls._cleanup) - interval = list_configurations( - cls.api_client, - name='network.gc.interval' - ) - wait = list_configurations( - cls.api_client, - name='network.gc.wait' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) + int(wait[0].value)) - cls.network_offering.delete(cls.api_client) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return @@ -1708,17 +1664,6 @@ class TestLbAlgoSbLc(cloudstackTestCase): try: # Cleanup resources used cleanup_resources(cls.api_client, cls._cleanup) - interval = list_configurations( - cls.api_client, - name='network.gc.interval' - ) - wait = list_configurations( - cls.api_client, - name='network.gc.wait' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) + int(wait[0].value)) - cls.network_offering.delete(cls.api_client) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return @@ -1925,17 +1870,6 @@ class TestLbAlgoLcSb(cloudstackTestCase): try: # Cleanup resources used cleanup_resources(cls.api_client, cls._cleanup) - interval = list_configurations( - cls.api_client, - name='network.gc.interval' - ) - wait = list_configurations( - cls.api_client, - name='network.gc.wait' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) + int(wait[0].value)) - cls.network_offering.delete(cls.api_client) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc5b6ae0/test/integration/component/test_netscaler_lb_sticky.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_netscaler_lb_sticky.py b/test/integration/component/test_netscaler_lb_sticky.py index a3a18ec..7ec85a1 100644 --- a/test/integration/component/test_netscaler_lb_sticky.py +++ b/test/integration/component/test_netscaler_lb_sticky.py @@ -190,17 +190,6 @@ class TestLbStickyPolicy(cloudstackTestCase): try: #Cleanup resources used cleanup_resources(cls.api_client, cls._cleanup) - interval = list_configurations( - cls.api_client, - name='network.gc.interval' - ) - wait = list_configurations( - cls.api_client, - name='network.gc.wait' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) + int(wait[0].value)) - cls.network_offering.delete(cls.api_client) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc5b6ae0/test/integration/component/test_netscaler_nw_off.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_netscaler_nw_off.py b/test/integration/component/test_netscaler_nw_off.py index 84616e1..5742f09 100644 --- a/test/integration/component/test_netscaler_nw_off.py +++ b/test/integration/component/test_netscaler_nw_off.py @@ -618,17 +618,6 @@ class TestNetScalerSharedMode(cloudstackTestCase): try: #Cleanup resources used cleanup_resources(cls.api_client, cls._cleanup) - interval = list_configurations( - cls.api_client, - name='network.gc.interval' - ) - wait = list_configurations( - cls.api_client, - name='network.gc.wait' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) + int(wait[0].value)) - cleanup_resources(cls.api_client, cls.cleanup_devices) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return
