vyos.util: T3763: Optimized the check_port_availability function

`print` was removed or replaced to `ValueError`, where possible.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/conf_mode/interfaces-wireguard.py b/src/conf_mode/interfaces-wireguard.py
index ad3ddcba2..68181465e 100755
--- a/src/conf_mode/interfaces-wireguard.py
+++ b/src/conf_mode/interfaces-wireguard.py
@@ -74,9 +74,12 @@ def verify(wireguard):
     if 'peer' not in wireguard:
         raise ConfigError('At least one Wireguard peer is required!')
 
-    if 'port' in wireguard and check_port_availability(
-            '0.0.0.0', int(wireguard['port']), 'udp') is not True:
-        raise ConfigError('The port cannot be used for the interface')
+    listen_port = int(wireguard['port'])
+    if 'port' in wireguard and check_port_availability('0.0.0.0', listen_port,
+                                                       'udp') is not True:
+        raise ConfigError(
+            f'The UDP port {listen_port} is busy or unavailable and cannot be used for the interface'
+        )
 
     # run checks on individual configured WireGuard peer
     for tmp in wireguard['peer']: