summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraapostoliuk <a.apostoliuk@vyos.io>2024-04-29 17:55:54 +0300
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-04-29 15:34:39 +0000
commit1b64d0522cbd45bf919f15bccd5721773940aef3 (patch)
tree24e486bb064d8fbcfb127b1f72ba4a1c6575ccb4
parentc1507d684cc9e0aaabf45bf9d5ef39d741b96c81 (diff)
downloadvyos-1x-1b64d0522cbd45bf919f15bccd5721773940aef3.tar.gz
vyos-1x-1b64d0522cbd45bf919f15bccd5721773940aef3.zip
T6272: Changed interface existence verification in pppoe/ipoe to Warning
Throwing Warning message instead of Error if interface which is used in pppoe/ipoe does not exist. (cherry picked from commit af7277c7d525c22749bc236ad2096bec5c08d998)
-rwxr-xr-xsrc/conf_mode/service_ipoe-server.py2
-rwxr-xr-xsrc/conf_mode/service_pppoe-server.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/service_ipoe-server.py b/src/conf_mode/service_ipoe-server.py
index 11e950782..28b7fb03c 100755
--- a/src/conf_mode/service_ipoe-server.py
+++ b/src/conf_mode/service_ipoe-server.py
@@ -66,7 +66,7 @@ def verify(ipoe):
raise ConfigError('No IPoE interface configured')
for interface, iface_config in ipoe['interface'].items():
- verify_interface_exists(interface)
+ verify_interface_exists(interface, warning_only=True)
if 'client_subnet' in iface_config and 'vlan' in iface_config:
raise ConfigError('Option "client-subnet" and "vlan" are mutually exclusive, '
'use "client-ip-pool" instead!')
diff --git a/src/conf_mode/service_pppoe-server.py b/src/conf_mode/service_pppoe-server.py
index b9d174933..328487985 100755
--- a/src/conf_mode/service_pppoe-server.py
+++ b/src/conf_mode/service_pppoe-server.py
@@ -105,7 +105,7 @@ def verify(pppoe):
# Check is interface exists in the system
for interface in pppoe['interface']:
- verify_interface_exists(interface)
+ verify_interface_exists(interface, warning_only=True)
return None