Fix VsrUpstreamOptions and VsrConfigmap tests

Author: Dean-Coakley

tests/suite/test_v_s_route_upstream_options.py

@@ -67,7 +67,7 @@ def test_nginx_config_upstreams_defaults(self, kube_apis, ingress_controller_pre
         assert "proxy_read_timeout 60s;" in config
         assert "proxy_send_timeout 60s;" in config
 
-        assert "max_fails=1 fail_timeout=10s;" in config
+        assert "max_fails=1 fail_timeout=10s max_conns=0;" in config
 
         assert "keepalive" not in config
         assert 'proxy_set_header Connection "";' not in config
@@ -77,7 +77,7 @@ def test_nginx_config_upstreams_defaults(self, kube_apis, ingress_controller_pre
           "fail-timeout": "13s", "connect-timeout": "55s", "read-timeout": "1s", "send-timeout": "1h",
           "keepalive": 54},
          ["least_conn;", "max_fails=8 ",
-          "fail_timeout=13s;", "proxy_connect_timeout 55s;", "proxy_read_timeout 1s;", "proxy_send_timeout 1h;",
+          "fail_timeout=13s ", "max_conns=0;", "proxy_connect_timeout 55s;", "proxy_read_timeout 1s;", "proxy_send_timeout 1h;",
           "keepalive 54;", 'proxy_set_header Connection "";']),
         ({"lb-method": "ip_hash", "connect-timeout": "75", "read-timeout": "15", "send-timeout": "1h"},
          ["ip_hash;", "proxy_connect_timeout 75;", "proxy_read_timeout 15;", "proxy_send_timeout 1h;"]),
@@ -131,11 +131,11 @@ def test_when_option_in_v_s_r_only(self, kube_apis,
 
     @pytest.mark.parametrize('config_map_file, expected_strings, unexpected_strings', [
         (f"{TEST_DATA}/virtual-server-route-upstream-options/configmap-with-keys.yaml",
-         ["max_fails=3 ", "fail_timeout=33s;",
+         ["max_fails=3 ", "fail_timeout=33s ", "max_conns=0;",
           "proxy_connect_timeout 44s;", "proxy_read_timeout 22s;", "proxy_send_timeout 55s;",
           "keepalive 1024;", 'proxy_set_header Connection "";'],
          ["ip_hash;", "least_conn;", "random ", "hash", "least_time ",
-          "max_fails=1 ", "fail_timeout=10s;",
+          "max_fails=1 ", "fail_timeout=10s ", "max_conns=1s;",
           "proxy_connect_timeout 60s;", "proxy_read_timeout 60s;", "proxy_send_timeout 60s;"]),
     ])
     def test_when_option_in_config_map_only(self, kube_apis,
@@ -186,10 +186,10 @@ def test_when_option_in_config_map_only(self, kube_apis,
           "fail-timeout": "1m", "connect-timeout": "1m", "read-timeout": "77s", "send-timeout": "23s",
           "keepalive": 48},
          ["least_conn;", "max_fails=12 ",
-          "fail_timeout=1m;", "proxy_connect_timeout 1m;", "proxy_read_timeout 77s;", "proxy_send_timeout 23s;",
+          "fail_timeout=1m ", "max_conns=0;", "proxy_connect_timeout 1m;", "proxy_read_timeout 77s;", "proxy_send_timeout 23s;",
           "keepalive 48;", 'proxy_set_header Connection "";'],
          ["ip_hash;", "random ", "hash", "least_time ", "max_fails=1 ",
-          "fail_timeout=10s;", "proxy_connect_timeout 44s;", "proxy_read_timeout 22s;", "proxy_send_timeout 55s;",
+          "fail_timeout=10s ", "max_conns=1s;", "proxy_connect_timeout 44s;", "proxy_read_timeout 22s;", "proxy_send_timeout 55s;",
           "keepalive 1024;"])
     ])
     def test_v_s_r_overrides_config_map(self, kube_apis,

tests/suite/test_virtual_server_configmap_keys.py

@@ -40,7 +40,7 @@ def assert_keys_without_validation(config, expected_values):
     assert f"real_ip_header {expected_values['real-ip-header']};" in config
     assert f"{expected_values['location-snippets']}" in config
     assert f"{expected_values['server-snippets']}" in config
-    assert f"fail_timeout={expected_values['fail-timeout']};" in config
+    assert f"fail_timeout={expected_values['fail-timeout']}" in config
     assert f"proxy_send_timeout {expected_values['proxy-send-timeout']};" in config
 
 

tests/suite/test_virtual_server_upstream_options.py

@@ -71,7 +71,7 @@ def test_nginx_config_defaults(self, kube_apis, ingress_controller_prerequisites
         assert "proxy_read_timeout 60s;" in config
         assert "proxy_send_timeout 60s;" in config
 
-        assert "max_fails=1 fail_timeout=10s;" in config
+        assert "max_fails=1 fail_timeout=10s max_conns=0;" in config
 
         assert "keepalive" not in config
         assert 'proxy_set_header Connection "";' not in config
@@ -81,7 +81,7 @@ def test_nginx_config_defaults(self, kube_apis, ingress_controller_prerequisites
           "fail-timeout": "13s", "connect-timeout": "55s", "read-timeout": "1s", "send-timeout": "1h",
           "keepalive": 54},
          ["least_conn;", "max_fails=8 ",
-          "fail_timeout=13s;", "proxy_connect_timeout 55s;", "proxy_read_timeout 1s;", "proxy_send_timeout 1h;",
+          "fail_timeout=13s ", "max_conns=0;", "proxy_connect_timeout 55s;", "proxy_read_timeout 1s;", "proxy_send_timeout 1h;",
           "keepalive 54;", 'proxy_set_header Connection "";']),
         ({"lb-method": "ip_hash", "connect-timeout": "75", "read-timeout": "15", "send-timeout": "1h"},
          ["ip_hash;", "proxy_connect_timeout 75;", "proxy_read_timeout 15;", "proxy_send_timeout 1h;"]),
@@ -121,11 +121,11 @@ def test_when_option_in_v_s_only(self, kube_apis, ingress_controller_prerequisit
 
     @pytest.mark.parametrize('config_map_file, expected_strings, unexpected_strings', [
         (f"{TEST_DATA}/virtual-server-upstream-options/configmap-with-keys.yaml",
-         ["max_fails=3 ", "fail_timeout=33s;",
+         ["max_fails=3 ", "fail_timeout=33s ", "max_conns=0;",
           "proxy_connect_timeout 44s;", "proxy_read_timeout 22s;", "proxy_send_timeout 55s;",
           "keepalive 1024;", 'proxy_set_header Connection "";'],
          ["ip_hash;", "least_conn;", "random ", "hash", "least_time ",
-          "max_fails=1 ", "fail_timeout=10s;",
+          "max_fails=1 ", "fail_timeout=10s ", "max_conns=1s;",
           "proxy_connect_timeout 60s;", "proxy_read_timeout 60s;", "proxy_send_timeout 60s;"]),
     ])
     def test_when_option_in_config_map_only(self, kube_apis, ingress_controller_prerequisites,
@@ -166,10 +166,10 @@ def test_when_option_in_config_map_only(self, kube_apis, ingress_controller_prer
           "fail-timeout": "1m", "connect-timeout": "1m", "read-timeout": "77s", "send-timeout": "23s",
           "keepalive": 48},
          ["least_conn;", "max_fails=12 ",
-          "fail_timeout=1m;", "proxy_connect_timeout 1m;", "proxy_read_timeout 77s;", "proxy_send_timeout 23s;",
+          "fail_timeout=1m ", "max_conns=0;", "proxy_connect_timeout 1m;", "proxy_read_timeout 77s;", "proxy_send_timeout 23s;",
           "keepalive 48;", 'proxy_set_header Connection "";'],
          ["ip_hash;", "random ", "hash", "least_time ", "max_fails=1 ",
-          "fail_timeout=10s;", "proxy_connect_timeout 44s;", "proxy_read_timeout 22s;", "proxy_send_timeout 55s;",
+          "fail_timeout=10s ", "max_conns=33s;", "proxy_connect_timeout 44s;", "proxy_read_timeout 22s;", "proxy_send_timeout 55s;",
           "keepalive 1024;"])
     ])
     def test_v_s_overrides_config_map(self, kube_apis, ingress_controller_prerequisites,