x/vmware-nsxlib
Code Issues Proposed changes

Merge "Support response status codes for LB HM"

Browse Source
This commit is contained in:
Zuul 2019-01-15 18:43:52 +00:00 committed by Gerrit Code Review
commit 4d510cc632
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vmware_nsxlib/tests/unit/v3/test_utils.py
View File

@ -235,7 +235,7 @@ class TestNsxV3Utils(nsxlib_testcase.NsxClientTestCase):
extra_args = ['fall_count', 'interval', 'monitor_port', extra_args = ['fall_count', 'interval', 'monitor_port',
'request_body', 'request_method', 'request_url', 'request_body', 'request_method', 'request_url',
'request_version', 'response_body', 'request_version', 'response_body',
'response_status', 'rise_count', 'timeout'] 'response_status_codes', 'rise_count', 'timeout']
body = {'display_name': 'httpmonitor1', body = {'display_name': 'httpmonitor1',
'description': 'my http monitor'} 'description': 'my http monitor'}
expected = {'display_name': 'httpmonitor1', expected = {'display_name': 'httpmonitor1',

2
vmware_nsxlib/v3/__init__.py
View File

@ -154,6 +154,8 @@ class NsxLib(lib.NsxLibBase):
# Features available since 2.3 # Features available since 2.3
if (feature == nsx_constants.FEATURE_ROUTER_ALLOCATION_PROFILE): if (feature == nsx_constants.FEATURE_ROUTER_ALLOCATION_PROFILE):
return True return True
if (feature == nsx_constants.FEATURE_LB_HM_RESPONSE_CODES):
return True
if (version.LooseVersion(self.get_version()) >= if (version.LooseVersion(self.get_version()) >=
version.LooseVersion(nsx_constants.NSX_VERSION_2_2_0)): version.LooseVersion(nsx_constants.NSX_VERSION_2_2_0)):

6
vmware_nsxlib/v3/load_balancer.py
View File

@ -246,7 +246,7 @@ class Monitor(LoadBalancerBase):
extra_args = ['fall_count', 'interval', 'monitor_port', extra_args = ['fall_count', 'interval', 'monitor_port',
'request_body', 'request_method', 'request_url', 'request_body', 'request_method', 'request_url',
'request_version', 'response_body', 'request_version', 'response_body',
'response_status', 'rise_count', 'timeout'] 'response_status_codes', 'rise_count', 'timeout']
return utils.build_extra_args(body, extra_args, **kwargs) return utils.build_extra_args(body, extra_args, **kwargs)
elif resource_type == MonitorTypes.HTTPS: elif resource_type == MonitorTypes.HTTPS:
body['resource_type'] = resource_type body['resource_type'] = resource_type
@ -254,8 +254,8 @@ class Monitor(LoadBalancerBase):
'client_certificate_id', 'fall_count', 'interval', 'client_certificate_id', 'fall_count', 'interval',
'monitor_port', 'protocols', 'request_body', 'monitor_port', 'protocols', 'request_body',
'request_method', 'request_url', 'request_version', 'request_method', 'request_url', 'request_version',
'response_body', 'response_status', 'rise_count', 'response_body', 'response_status_codes',
'server_auth', 'server_auth_ca_ids', 'rise_count', 'server_auth', 'server_auth_ca_ids',
'server_auth_crl_ids', 'timeout'] 'server_auth_crl_ids', 'timeout']
return utils.build_extra_args(body, extra_args, **kwargs) return utils.build_extra_args(body, extra_args, **kwargs)
elif resource_type == MonitorTypes.ICMP: elif resource_type == MonitorTypes.ICMP:

1
vmware_nsxlib/v3/nsx_constants.py
View File

@ -147,6 +147,7 @@ FEATURE_DYNAMIC_CRITERIA = 'Dynamic criteria'
FEATURE_EXCLUDE_PORT_BY_TAG = 'Exclude Port by Tag' FEATURE_EXCLUDE_PORT_BY_TAG = 'Exclude Port by Tag'
FEATURE_ROUTER_FIREWALL = 'Router Firewall' FEATURE_ROUTER_FIREWALL = 'Router Firewall'
FEATURE_LOAD_BALANCER = 'Load Balancer' FEATURE_LOAD_BALANCER = 'Load Balancer'
FEATURE_LB_HM_RESPONSE_CODES = 'Load Balancer HM response codes'
FEATURE_DHCP_RELAY = 'DHCP Relay' FEATURE_DHCP_RELAY = 'DHCP Relay'
FEATURE_VLAN_ROUTER_INTERFACE = 'VLAN Router Interface' FEATURE_VLAN_ROUTER_INTERFACE = 'VLAN Router Interface'
FEATURE_RATE_LIMIT = 'Requests Rate Limit' FEATURE_RATE_LIMIT = 'Requests Rate Limit'