WIP fixes for CI build

Author: sarthurdev

smoketest/scripts/cli/test_load-balancing_wan.py

@@ -103,6 +103,7 @@ def test_table_routes(self):
         cmd_in_netns(ns3, 'ip link set dev eth0 up')
 
         # Set load-balancing configuration
+        self.cli_set(base_path + ['wan', 'hook', '/bin/true'])
         self.cli_set(base_path + ['wan', 'interface-health', iface1, 'failure-count', '2'])
         self.cli_set(base_path + ['wan', 'interface-health', iface1, 'nexthop', '203.0.113.1'])
         self.cli_set(base_path + ['wan', 'interface-health', iface1, 'success-count', '1'])

src/helpers/vyos-load-balancer.py

@@ -40,6 +40,9 @@
 def health_check(ifname, conf, state, test_defaults):
     # Run health tests for interface
 
+    if get_ipv4_address(ifname) is None:
+        return False
+
     if 'test' not in conf:
         resp_time = test_defaults['resp-time']
         target = conf['nexthop']
@@ -78,7 +81,7 @@ def on_state_change(lb, ifname, state):
     if 'hook' in lb:
         script_path = os.path.join('/config/scripts/', lb['hook'])
         state_str = 'ACTIVE' if state else 'FAILED'
-        run(script_path, env=[f'WLB_INTERFACE_NAME={ifname}', f'WLB_INTERFACE_STATE={state_str}'])
+        run(script_path, env={'WLB_INTERFACE_NAME': ifname, 'WLB_INTERFACE_STATE': state_str})
 
     print(f'INFO: State change: {ifname} -> {state}')
 
@@ -168,13 +171,14 @@ def get_config():
         index = 1
         for ifname, health_conf in lb['interface_health'].items():
             table_num = lb['mark_offset'] + index
+            addr = get_ipv4_address(ifname)
             lb['health_state'][ifname] = {
-                'if_addr': get_ipv4_address(ifname),
+                'if_addr': addr,
                 'failure_count': 0,
                 'success_count': 0,
                 'last_success': 0,
                 'last_failure': 0,
-                'state': True,
+                'state': addr is not None,
                 'state_changed': False,
                 'table_number': table_num,
                 'mark': hex(table_num)
@@ -196,7 +200,7 @@ def get_config():
         run('ip route flush cache')
 
         if 'flush_connections' in lb:
-            run('conntrack -F')
+            run('conntrack --delete')
             run('conntrack -F expect')
 
         with open(wlb_status_file, 'w') as f:
@@ -274,7 +278,7 @@ def handle_sigterm(signum, frame):
             run('ip route flush cache')
 
             if 'flush_connections' in lb:
-                run('conntrack -F')
+                run('conntrack --delete')
                 run('conntrack -F expect')
 
             with open(wlb_status_file, 'w') as f: