diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-03-09 12:01:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-09 12:01:25 +0100 |
| commit | 80f51ba0bb9df97f1fe1df5b6f7ff3345f62dca9 (patch) | |
| tree | 0eb873740f7afcf898af33255547373cf56be57b | |
| parent | e1ea2f826ce7b9e8bfe6be4d3814a456e04963f1 (diff) | |
| parent | 3b27442674e086a873f8ed7df4169363ad8c5c51 (diff) | |
| download | vyos-1x-80f51ba0bb9df97f1fe1df5b6f7ff3345f62dca9.tar.gz vyos-1x-80f51ba0bb9df97f1fe1df5b6f7ff3345f62dca9.zip | |
Merge pull request #1879 from sever-sever/T5063
T5063: IPoE-server ethX vlan must not be used with client-subnet
| -rwxr-xr-x | src/conf_mode/service_ipoe-server.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/conf_mode/service_ipoe-server.py b/src/conf_mode/service_ipoe-server.py index e9afd6a55..9cdfa08ef 100755 --- a/src/conf_mode/service_ipoe-server.py +++ b/src/conf_mode/service_ipoe-server.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2018-2022 VyOS maintainers and contributors +# Copyright (C) 2018-2023 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -53,8 +53,11 @@ def verify(ipoe): if 'interface' not in ipoe: raise ConfigError('No IPoE interface configured') - for interface in ipoe['interface']: + for interface, iface_config in ipoe['interface'].items(): verify_interface_exists(interface) + if 'client_subnet' in iface_config and 'vlan' in iface_config: + raise ConfigError('Option "client-subnet" incompatible with "vlan"!' + 'Use "ipoe client-ip-pool" instead.') #verify_accel_ppp_base_service(ipoe, local_users=False) |