Merge pull request #4605 from MattKobayashi/T7625

T7625: load-balancing: prune limit key if not configured

Author: sever-sever

smoketest/scripts/cli/test_load-balancing_wan.py

@@ -164,7 +164,7 @@ def test_check_chains(self):
         mangle_prerouting = """table ip vyos_wanloadbalance {
 	chain wlb_mangle_prerouting {
 		type filter hook prerouting priority mangle; policy accept;
-		iifname "veth3" ip saddr 198.51.100.0/24 ct state new limit rate 5/second burst 5 packets counter numgen random mod 11 vmap { 0 : jump wlb_mangle_isp_veth1, 1-10 : jump wlb_mangle_isp_veth2 }
+		iifname "veth3" ip saddr 198.51.100.0/24 ct state new counter numgen random mod 11 vmap { 0 : jump wlb_mangle_isp_veth1, 1-10 : jump wlb_mangle_isp_veth2 }
 		iifname "veth3" ip saddr 198.51.100.0/24 counter meta mark set ct mark
 	}
 }"""
@@ -234,6 +234,27 @@ def test_check_chains(self):
         tmp = cmd('sudo nft -s list chain ip vyos_wanloadbalance wlb_nat_postrouting')
         self.assertEqual(tmp, nat_wanloadbalance)
 
+        # Set limit configuration
+        mangle_prerouting_limit = """table ip vyos_wanloadbalance {
+	chain wlb_mangle_prerouting {
+		type filter hook prerouting priority mangle; policy accept;
+		iifname "veth3" ip saddr 198.51.100.0/24 ct state new limit rate 10/second burst 10 packets counter numgen random mod 11 vmap { 0 : jump wlb_mangle_isp_veth1, 1-10 : jump wlb_mangle_isp_veth2 }
+		iifname "veth3" ip saddr 198.51.100.0/24 counter meta mark set ct mark
+	}
+}"""
+
+        self.cli_set(base_path + ['wan', 'rule', '10', 'limit', 'rate', '10'])
+        self.cli_set(base_path + ['wan', 'rule', '10', 'limit', 'burst', '10'])
+
+        # Commit changes
+        self.cli_commit()
+
+        time.sleep(5)
+
+        # Check prerouting mangle chain
+        tmp = cmd('sudo nft -s list chain ip vyos_wanloadbalance wlb_mangle_prerouting')
+        self.assertEqual(tmp, mangle_prerouting_limit)
+
         # Delete veth interfaces and netns
         for iface in [iface1, iface2, iface3]:
             call(f'sudo ip link del dev {iface}')

src/helpers/vyos-load-balancer.py

@@ -160,6 +160,11 @@ def get_config():
     lb = conf.get_config_dict(base, key_mangling=('-', '_'),
                             get_first_key=True, with_recursive_defaults=True)
 
+    # prune limit key if not set by user
+    for rule in lb.get('rule', []):
+        if lb.from_defaults(['rule', rule, 'limit']):
+            del lb['rule'][rule]['limit']
+
     lb['test_defaults'] = get_defaults(base + ['interface-health', 'A', 'test', 'B'], get_first_key=True)
 
     return lb