diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-10-03 20:51:21 +0200 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2023-10-07 17:15:00 +0000 |
| commit | 713647429b981f35822e8b4c9fafe990d120643c (patch) | |
| tree | 24212ec13751537430b99d63d283620cdc0acc73 | |
| parent | e4fabffe740800d2ad9ded4aec4b768485289653 (diff) | |
| download | vyos-1x-713647429b981f35822e8b4c9fafe990d120643c.tar.gz vyos-1x-713647429b981f35822e8b4c9fafe990d120643c.zip | |
pppoe: T5630: verify MRU is less or equal then MTU
(cherry picked from commit e357258e645cf85de0035d4ecfbf99db4dd90f7e)
| -rwxr-xr-x | smoketest/scripts/cli/test_interfaces_pppoe.py | 7 | ||||
| -rwxr-xr-x | src/conf_mode/interfaces-pppoe.py | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/smoketest/scripts/cli/test_interfaces_pppoe.py b/smoketest/scripts/cli/test_interfaces_pppoe.py index 0685833fb..7b702759f 100755 --- a/smoketest/scripts/cli/test_interfaces_pppoe.py +++ b/smoketest/scripts/cli/test_interfaces_pppoe.py @@ -64,7 +64,7 @@ class PPPoEInterfaceTest(VyOSUnitTestSHIM.TestCase): self.cli_set(base_path + [interface, 'authentication', 'username', user]) self.cli_set(base_path + [interface, 'authentication', 'password', passwd]) self.cli_set(base_path + [interface, 'mtu', mtu]) - self.cli_set(base_path + [interface, 'mru', mru]) + self.cli_set(base_path + [interface, 'mru', '9000']) self.cli_set(base_path + [interface, 'no-peer-dns']) # check validate() - a source-interface is required @@ -72,6 +72,11 @@ class PPPoEInterfaceTest(VyOSUnitTestSHIM.TestCase): self.cli_commit() self.cli_set(base_path + [interface, 'source-interface', self._source_interface]) + # check validate() - MRU needs to be less or equal then MTU + with self.assertRaises(ConfigSessionError): + self.cli_commit() + self.cli_set(base_path + [interface, 'mru', mru]) + # commit changes self.cli_commit() diff --git a/src/conf_mode/interfaces-pppoe.py b/src/conf_mode/interfaces-pppoe.py index fca91253c..0a03a172c 100755 --- a/src/conf_mode/interfaces-pppoe.py +++ b/src/conf_mode/interfaces-pppoe.py @@ -77,6 +77,11 @@ def verify(pppoe): if {'connect_on_demand', 'vrf'} <= set(pppoe): raise ConfigError('On-demand dialing and VRF can not be used at the same time') + # both MTU and MRU have default values, thus we do not need to check + # if the key exists + if int(pppoe['mru']) > int(pppoe['mtu']): + raise ConfigError('PPPoE MRU needs to be lower then MTU!') + return None def generate(pppoe): |