vyos-1x.git/src, branch mergify/bp/circinus/pr-3889

Merge pull request #3877 from vyos/mergify/bp/circinus/pr-3868

2024-07-26T10:52:29+00:00

T6605: restore configd error formatting to be consistent with CLI (backport #3868)

vxlan: T6505: Support VXLAN VLAN-VNI range mapping in CLI (#3756)

2024-07-26T09:36:35+00:00

(cherry picked from commit 115e99630a317cab62c6f99e0461f6ce2c1edaf3)

system_option: T5552: Apply IPv4 and IPv6 options after reapplying sysctls by TuneD (#3863)

2024-07-25T16:07:28+00:00

(cherry picked from commit 7b82e4005724683c6311fab22358746f2cca4c1b) Co-authored-by: Nataliia Solomko

T6605: restore configd error formatting to be consistent with CLI (#3868)

2024-07-25T13:40:57+00:00

(cherry picked from commit 645f24908c9b338adc56ecc83f8c44d0b0206550)

vrf: T6602: verify supplied VRF name on all interface types (#3870)

2024-07-25T02:48:39+00:00

Only some (e.g. ethernet or wireguard) interfaces validate if the supplied VRF actually exists. If this is not validated, one can pass an invalid VRF to the system which generates an OSError exception. To reproduce set interfaces vxlan vxlan1 vni 1000 set interfaces vxlan vxlan1 remote 1.2.3.4 set interfaces vxlan vxlan1 vrf smoketest results in OSError: [Errno 255] failed to run command: ip link set dev vxlan1 master smoketest_mgmt This commit adds the missing verify_vrf() call to the missing interface types and an appropriate smoketest for all interfaces supporting VRF assignment. (cherry picked from commit dd0ebffa33728e452ac6e11737c2283f0e390359) Co-authored-by: Christian Breunig

op_mode: T6596: pppoe operation command failed

2024-07-24T08:51:50+00:00

(cherry picked from commit 79407cd5bbec3194a9b6542418229b33eab05121)

wireless: T6597: improve hostapd startup and corresponding smoketests

2024-07-22T19:57:10+00:00

This was found during smoketesting as thoase started to repeadingly fail in the last weeks File "/usr/libexec/vyos/tests/smoke/cli/test_interfaces_wireless.py", line 534, in test_wireless_security_station_address self.assertTrue(process_named_running('hostapd')) AssertionError: None is not true Digging into this revealed that this is NOT related to the smoketest coding but to hostapd/systemd instead. With a configured WIFI interface and calling: "sudo systemctl reload-or-restart hostapd@wlan1" multiple times in a short period caused systemd to report: "Jul 18 16:15:32 systemd[1]: hostapd@wlan1.service: Deactivated successfully." According to the internal systemd logic used in our version this is explained by: /* If there's a stop job queued before we enter the DEAD state, we shouldn't act on Restart=, in order to not * undo what has already been enqueued. */ if (unit_stop_pending(UNIT(s))) allow_restart = false; if (s->result == SERVICE_SUCCESS) s->result = f; if (s->result == SERVICE_SUCCESS) { unit_log_success(UNIT(s)); end_state = SERVICE_DEAD;` Where unit_log_success() generates the log message in question. Improve the restart login in the wireless interface script and an upgrade to hostapd solved the issue. (cherry picked from commit a67f49d99eda00998c425f9a663e138dbd0f7755)

wireless: T6320: add 802.11ax at 6GHz

2024-07-22T19:54:55+00:00

Authored-By: Alain Lamar (cherry picked from commit d5e988ba2d0fa0189feff22374c9b46eb49e2e79)

openvpn: T3834: verify() is not allowed to change anything on the system

2024-07-22T17:20:11+00:00

Commit e3c71af1466 ("remove secrets file if the tunnel is deleted and fix opmode commands") added a code path into verify() which removed files on the system if TOTP was not defined. This commit moves the code path to the appropriate generate() function. (cherry picked from commit 40c835992db9217f48e54dbbf15a7fbf1dcba482)

T6599: ipsec: fix incorect default behavior for dead-peer-detection

2024-07-22T10:28:04+00:00

(cherry picked from commit 23a3419d512139650cfe3dc76759b370b0c0c3d6)