Skip to content

Commit

Permalink
T6272: Changed interface existence verification in pppoe/ipoe to Warning
Browse files Browse the repository at this point in the history
Throwing Warning message instead of Error if interface which is
used in pppoe/ipoe does not exist.

(cherry picked from commit af7277c)
  • Loading branch information
aapostoliuk authored and mergify[bot] committed Apr 29, 2024
1 parent c1507d6 commit 1b64d05
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/conf_mode/service_ipoe-server.py
Original file line number Diff line number Diff line change
Expand Up @@ -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!')
Expand Down
2 changes: 1 addition & 1 deletion src/conf_mode/service_pppoe-server.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 1b64d05

Please sign in to comment.