From 86bd86d76ff9e105b25d43458ce05cf24d0d4baa Mon Sep 17 00:00:00 2001 From: ghanshyam Date: Tue, 20 Dec 2016 16:24:31 +0900 Subject: [PATCH] Fix vmware_nsx tempest plugin Id518a6d87d0949737cd1c50cb6a83149b85e5f85 removes the class variable from tempest - 'default_params_with_timeout_values' This was kept in tempest only to be used for baremetal tests. Each Temepst plugin should either have their own config options for build timeout etc or use the default one. Currently this commit makes use of timeout and other values from config which are stable. Change-Id: I8d010afe20db890636433a17193029a123a0a136 --- .../services/l2_gateway_connection_client.py | 4 +++- .../services/lbaas/health_monitors_client.py | 4 +++- .../services/lbaas/l7policies_client.py | 3 ++- vmware_nsx_tempest/services/lbaas/l7rules_client.py | 4 +++- .../services/lbaas/listeners_client.py | 4 +++- .../services/lbaas/load_balancers_client.py | 3 ++- vmware_nsx_tempest/services/lbaas/members_client.py | 3 ++- vmware_nsx_tempest/services/lbaas/pools_client.py | 3 ++- .../services/load_balancer_v1_client.py | 2 +- vmware_nsx_tempest/services/network_client_base.py | 12 +++++++++++- .../services/qos/bandwidth_limit_rules_client.py | 3 ++- .../services/qos/dscp_marking_rules_client.py | 3 ++- vmware_nsx_tempest/services/qos/policies_client.py | 3 ++- vmware_nsx_tempest/services/qos/rule_types_client.py | 3 ++- vmware_nsx_tempest/services/taas_client.py | 3 ++- vmware_nsx_tempest/services/tags_client.py | 4 +++- vmware_nsx_tempest/tests/nsxv/api/test_v1_lbaas.py | 3 ++- 17 files changed, 47 insertions(+), 17 deletions(-) diff --git a/vmware_nsx_tempest/services/l2_gateway_connection_client.py b/vmware_nsx_tempest/services/l2_gateway_connection_client.py index 22f9bc75ed..c1d23e5af8 100644 --- a/vmware_nsx_tempest/services/l2_gateway_connection_client.py +++ b/vmware_nsx_tempest/services/l2_gateway_connection_client.py @@ -12,6 +12,8 @@ from tempest.lib.services.network import base +from vmware_nsx_tempest.services import network_client_base as base_client + class L2GatewayConnectionClient(base.BaseNetworkClient): resource = 'l2_gateway_connection' @@ -56,7 +58,7 @@ def get_client(client_mgr): manager = getattr(client_mgr, 'manager', client_mgr) net_client = getattr(manager, 'networks_client') try: - _params = manager.default_params_with_timeout_values.copy() + _params = base_client.default_params_with_timeout_values.copy() except Exception: _params = {} client = L2GatewayConnectionClient(net_client.auth_provider, diff --git a/vmware_nsx_tempest/services/lbaas/health_monitors_client.py b/vmware_nsx_tempest/services/lbaas/health_monitors_client.py index 88772fafb1..aa231bb75c 100644 --- a/vmware_nsx_tempest/services/lbaas/health_monitors_client.py +++ b/vmware_nsx_tempest/services/lbaas/health_monitors_client.py @@ -14,6 +14,8 @@ from tempest.lib.services.network import base +from vmware_nsx_tempest.services import network_client_base as base_client + class HealthMonitorsClient(base.BaseNetworkClient): resource = 'healthmonitor' @@ -59,7 +61,7 @@ def get_client(client_mgr): manager = getattr(client_mgr, 'manager', client_mgr) net_client = getattr(manager, 'networks_client') try: - _params = manager.default_params_with_timeout_values.copy() + _params = base_client.default_params_with_timeout_values.copy() except Exception: _params = {} client = HealthMonitorsClient(net_client.auth_provider, diff --git a/vmware_nsx_tempest/services/lbaas/l7policies_client.py b/vmware_nsx_tempest/services/lbaas/l7policies_client.py index 078500dd0c..03fccb3f32 100644 --- a/vmware_nsx_tempest/services/lbaas/l7policies_client.py +++ b/vmware_nsx_tempest/services/lbaas/l7policies_client.py @@ -11,6 +11,7 @@ # under the License. from tempest.lib.services.network import base +from vmware_nsx_tempest.services import network_client_base as base_client class L7PoliciesClient(base.BaseNetworkClient): @@ -47,7 +48,7 @@ def get_client(client_mgr): manager = getattr(client_mgr, 'manager', client_mgr) net_client = getattr(manager, 'networks_client') try: - _params = manager.default_params_with_timeout_values.copy() + _params = base_client.default_params_with_timeout_values.copy() except Exception: _params = {} client = L7PoliciesClient(net_client.auth_provider, diff --git a/vmware_nsx_tempest/services/lbaas/l7rules_client.py b/vmware_nsx_tempest/services/lbaas/l7rules_client.py index d40767c23d..4a76abb585 100644 --- a/vmware_nsx_tempest/services/lbaas/l7rules_client.py +++ b/vmware_nsx_tempest/services/lbaas/l7rules_client.py @@ -12,6 +12,8 @@ from tempest.lib.services.network import base +from vmware_nsx_tempest.services import network_client_base as base_client + class L7RulesClient(base.BaseNetworkClient): resource = 'rule' @@ -47,7 +49,7 @@ def get_client(client_mgr): manager = getattr(client_mgr, 'manager', client_mgr) net_client = getattr(manager, 'networks_client') try: - _params = manager.default_params_with_timeout_values.copy() + _params = base_client.default_params_with_timeout_values.copy() except Exception: _params = {} client = L7RulesClient(net_client.auth_provider, diff --git a/vmware_nsx_tempest/services/lbaas/listeners_client.py b/vmware_nsx_tempest/services/lbaas/listeners_client.py index 8fbeb05b0c..46cdd0fda0 100644 --- a/vmware_nsx_tempest/services/lbaas/listeners_client.py +++ b/vmware_nsx_tempest/services/lbaas/listeners_client.py @@ -14,6 +14,8 @@ from tempest.lib.services.network import base +from vmware_nsx_tempest.services import network_client_base as base_client + class ListenersClient(base.BaseNetworkClient): resource = 'listener' @@ -58,7 +60,7 @@ def get_client(client_mgr): manager = getattr(client_mgr, 'manager', client_mgr) net_client = getattr(manager, 'networks_client') try: - _params = manager.default_params_with_timeout_values.copy() + _params = base_client.default_params_with_timeout_values.copy() except Exception: _params = {} client = ListenersClient(net_client.auth_provider, diff --git a/vmware_nsx_tempest/services/lbaas/load_balancers_client.py b/vmware_nsx_tempest/services/lbaas/load_balancers_client.py index dd5cff7a72..4f882ce6e6 100644 --- a/vmware_nsx_tempest/services/lbaas/load_balancers_client.py +++ b/vmware_nsx_tempest/services/lbaas/load_balancers_client.py @@ -18,6 +18,7 @@ from tempest.lib import exceptions from tempest.lib.services.network import base from vmware_nsx_tempest._i18n import _ +from vmware_nsx_tempest.services import network_client_base as base_client LB_NOTFOUND = "loadbalancer {lb_id} not found" @@ -129,7 +130,7 @@ def get_client(client_mgr): manager = getattr(client_mgr, 'manager', client_mgr) net_client = getattr(manager, 'networks_client') try: - _params = manager.default_params_with_timeout_values.copy() + _params = base_client.default_params_with_timeout_values.copy() except Exception: _params = {} client = LoadBalancersClient(net_client.auth_provider, diff --git a/vmware_nsx_tempest/services/lbaas/members_client.py b/vmware_nsx_tempest/services/lbaas/members_client.py index ae803df006..4c61d056d3 100644 --- a/vmware_nsx_tempest/services/lbaas/members_client.py +++ b/vmware_nsx_tempest/services/lbaas/members_client.py @@ -13,6 +13,7 @@ # under the License. from tempest.lib.services.network import base +from vmware_nsx_tempest.services import network_client_base as base_client class MembersClient(base.BaseNetworkClient): @@ -58,7 +59,7 @@ def get_client(client_mgr): manager = getattr(client_mgr, 'manager', client_mgr) net_client = getattr(manager, 'networks_client') try: - _params = manager.default_params_with_timeout_values.copy() + _params = base_client.default_params_with_timeout_values.copy() except Exception: _params = {} client = MembersClient(net_client.auth_provider, diff --git a/vmware_nsx_tempest/services/lbaas/pools_client.py b/vmware_nsx_tempest/services/lbaas/pools_client.py index 5464efc0c5..6a83eab7d5 100644 --- a/vmware_nsx_tempest/services/lbaas/pools_client.py +++ b/vmware_nsx_tempest/services/lbaas/pools_client.py @@ -13,6 +13,7 @@ # under the License. from tempest.lib.services.network import base +from vmware_nsx_tempest.services import network_client_base as base_client class PoolsClient(base.BaseNetworkClient): @@ -58,7 +59,7 @@ def get_client(client_mgr): manager = getattr(client_mgr, 'manager', client_mgr) net_client = getattr(manager, 'networks_client') try: - _params = manager.default_params_with_timeout_values.copy() + _params = base_client.default_params_with_timeout_values.copy() except Exception: _params = {} client = PoolsClient(net_client.auth_provider, diff --git a/vmware_nsx_tempest/services/load_balancer_v1_client.py b/vmware_nsx_tempest/services/load_balancer_v1_client.py index 734d9691f3..89e8724332 100644 --- a/vmware_nsx_tempest/services/load_balancer_v1_client.py +++ b/vmware_nsx_tempest/services/load_balancer_v1_client.py @@ -309,7 +309,7 @@ def get_client(client_mgr): manager = getattr(client_mgr, 'manager', client_mgr) net_client = getattr(manager, 'networks_client') try: - _params = manager.default_params_with_timeout_values.copy() + _params = base.default_params_with_timeout_values.copy() except Exception: _params = {} client = LoadBalancerV1Client(net_client.auth_provider, diff --git a/vmware_nsx_tempest/services/network_client_base.py b/vmware_nsx_tempest/services/network_client_base.py index 1b13dccc26..77a9f3a46f 100644 --- a/vmware_nsx_tempest/services/network_client_base.py +++ b/vmware_nsx_tempest/services/network_client_base.py @@ -9,9 +9,11 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - +from tempest import config from tempest.lib.services.network import base +CONF = config.CONF + # netowrk/json/base.py does not include thoese method in network_client class BaseNetworkClient(base.BaseNetworkClient): @@ -40,3 +42,11 @@ default_params_2 = { 'endpoint_type': 'publicURL', 'build_timeout': 300, 'build_interval': 1} + +default_params_3 = config.service_client_config() + +default_params_with_timeout_values = { + 'build_interval': CONF.network.build_interval, + 'build_timeout': CONF.network.build_timeout +} +default_params_with_timeout_values.update(default_params_3) diff --git a/vmware_nsx_tempest/services/qos/bandwidth_limit_rules_client.py b/vmware_nsx_tempest/services/qos/bandwidth_limit_rules_client.py index ba4379539b..60800339b5 100644 --- a/vmware_nsx_tempest/services/qos/bandwidth_limit_rules_client.py +++ b/vmware_nsx_tempest/services/qos/bandwidth_limit_rules_client.py @@ -11,6 +11,7 @@ # under the License. from tempest.lib.services.network import base +from vmware_nsx_tempest.services import network_client_base as base_client class BandwidthLimitRulesClient(base.BaseNetworkClient): @@ -54,7 +55,7 @@ def get_client(client_mgr, manager = getattr(client_mgr, 'manager', client_mgr) net_client = getattr(manager, 'networks_client') try: - _params = manager.default_params_with_timeout_values.copy() + _params = base_client.default_params_with_timeout_values.copy() except Exception: _params = {} client = BandwidthLimitRulesClient(net_client.auth_provider, diff --git a/vmware_nsx_tempest/services/qos/dscp_marking_rules_client.py b/vmware_nsx_tempest/services/qos/dscp_marking_rules_client.py index 7d663a28fa..cb40814d29 100644 --- a/vmware_nsx_tempest/services/qos/dscp_marking_rules_client.py +++ b/vmware_nsx_tempest/services/qos/dscp_marking_rules_client.py @@ -11,6 +11,7 @@ # under the License. from tempest.lib.services.network import base +from vmware_nsx_tempest.services import network_client_base as base_client class DscpMarkingRulesClient(base.BaseNetworkClient): @@ -54,7 +55,7 @@ def get_client(client_mgr, manager = getattr(client_mgr, 'manager', client_mgr) net_client = getattr(manager, 'networks_client') try: - _params = manager.default_params_with_timeout_values.copy() + _params = base_client.default_params_with_timeout_values.copy() except Exception: _params = {} client = DscpMarkingRulesClient(net_client.auth_provider, diff --git a/vmware_nsx_tempest/services/qos/policies_client.py b/vmware_nsx_tempest/services/qos/policies_client.py index dd92b9e639..63af0b5825 100644 --- a/vmware_nsx_tempest/services/qos/policies_client.py +++ b/vmware_nsx_tempest/services/qos/policies_client.py @@ -11,6 +11,7 @@ # under the License. from tempest.lib.services.network import base +from vmware_nsx_tempest.services import network_client_base as base_client class PoliciesClient(base.BaseNetworkClient): @@ -62,7 +63,7 @@ def get_client(client_mgr, manager = getattr(client_mgr, 'manager', client_mgr) net_client = getattr(manager, 'networks_client') try: - _params = manager.default_params_with_timeout_values.copy() + _params = base_client.default_params_with_timeout_values.copy() except Exception: _params = {} client = PoliciesClient(net_client.auth_provider, diff --git a/vmware_nsx_tempest/services/qos/rule_types_client.py b/vmware_nsx_tempest/services/qos/rule_types_client.py index b89a6554bd..6000a25449 100644 --- a/vmware_nsx_tempest/services/qos/rule_types_client.py +++ b/vmware_nsx_tempest/services/qos/rule_types_client.py @@ -11,6 +11,7 @@ # under the License. from tempest.lib.services.network import base +from vmware_nsx_tempest.services import network_client_base as base_client class RuleTypesClient(base.BaseNetworkClient): @@ -36,7 +37,7 @@ def get_client(client_mgr, manager = getattr(client_mgr, 'manager', client_mgr) net_client = getattr(manager, 'networks_client') try: - _params = manager.default_params_with_timeout_values.copy() + _params = base_client.default_params_with_timeout_values.copy() except Exception: _params = {} client = RuleTypesClient(net_client.auth_provider, diff --git a/vmware_nsx_tempest/services/taas_client.py b/vmware_nsx_tempest/services/taas_client.py index 29b97b6090..900ab2836a 100644 --- a/vmware_nsx_tempest/services/taas_client.py +++ b/vmware_nsx_tempest/services/taas_client.py @@ -20,6 +20,7 @@ from tempest.lib.services.network import base from vmware_nsx_tempest._i18n import _LI from vmware_nsx_tempest._i18n import _LW +from vmware_nsx_tempest.services import network_client_base as base_client LOG = log.getLogger(__name__) @@ -95,7 +96,7 @@ def get_client(client_mgr): try: manager = getattr(client_mgr, "manager", client_mgr) net_client = getattr(manager, "networks_client") - _params = manager.default_params_with_timeout_values.copy() + _params = base_client.default_params_with_timeout_values.copy() except AttributeError as attribute_err: LOG.warning(_LW("Failed to locate the attribute, Error: %(err_msg)s") % {"err_msg": attribute_err.__str__()}) diff --git a/vmware_nsx_tempest/services/tags_client.py b/vmware_nsx_tempest/services/tags_client.py index 030f76636f..d671199eeb 100644 --- a/vmware_nsx_tempest/services/tags_client.py +++ b/vmware_nsx_tempest/services/tags_client.py @@ -17,6 +17,8 @@ from oslo_serialization import jsonutils from tempest.lib.services.network import base +from vmware_nsx_tempest.services import network_client_base as base_client + class BaseTagsClient(base.BaseNetworkClient): """Why base client for tags_client: @@ -122,7 +124,7 @@ def get_client(client_mgr, manager = getattr(client_mgr, 'manager', client_mgr) net_client = getattr(manager, 'networks_client') try: - _params = manager.default_params_with_timeout_values.copy() + _params = base_client.default_params_with_timeout_values.copy() except Exception: _params = {} client = TagsClient(net_client.auth_provider, diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_v1_lbaas.py b/vmware_nsx_tempest/tests/nsxv/api/test_v1_lbaas.py index 284dfb1cc6..aee2ce9d49 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_v1_lbaas.py +++ b/vmware_nsx_tempest/tests/nsxv/api/test_v1_lbaas.py @@ -25,6 +25,7 @@ from tempest import config from tempest import test from vmware_nsx_tempest.services import load_balancer_v1_client as LBV1C +from vmware_nsx_tempest.services import network_client_base as base_client CONF = config.CONF @@ -60,7 +61,7 @@ class LoadBalancerTestJSON(base.BaseNetworkTest): @classmethod def resource_setup(cls): super(LoadBalancerTestJSON, cls).resource_setup() - _params = cls.manager.default_params_with_timeout_values.copy() + _params = base_client.default_params_with_timeout_values.copy() for p in _params.keys(): if p in ['service', 'region', 'endpoint_type']: _params.pop(p)