diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-12-01 13:09:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-01 13:09:58 +0100 |
| commit | 12e03feaed0b0f847fceec73597c608703228c44 (patch) | |
| tree | 6be7aed679c8baa90219f1c669eac4ffa177571a | |
| parent | 93038ae22e6e072ffd5c3cdeae49ec7293e5cc1d (diff) | |
| parent | a4f816a65e26338a7d708a243aa59a991a14c950 (diff) | |
| download | vyos-1x-12e03feaed0b0f847fceec73597c608703228c44.tar.gz vyos-1x-12e03feaed0b0f847fceec73597c608703228c44.zip | |
Merge pull request #2558 from vyos/mergify/bp/sagitta/pr-2547
policy: T4704: Allowed to set metric (MED) to (+/-)rtt (backport #2547)
| -rw-r--r-- | interface-definitions/policy.xml.in | 9 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_policy.py | 27 |
2 files changed, 36 insertions, 0 deletions
diff --git a/interface-definitions/policy.xml.in b/interface-definitions/policy.xml.in index c470cfdb3..0d2ed9746 100644 --- a/interface-definitions/policy.xml.in +++ b/interface-definitions/policy.xml.in @@ -1446,9 +1446,18 @@ <format>u32:0-4294967295</format> <description>Metric value</description> </valueHelp> + <valueHelp> + <format><+/-rtt></format> + <description>Add or subtract round trip time</description> + </valueHelp> + <valueHelp> + <format><rtt></format> + <description>Round trip time</description> + </valueHelp> <constraint> <validator name="numeric" argument="--relative --"/> <validator name="numeric" argument="--range 0-4294967295"/> + <regex>^[+|-]?rtt$</regex> </constraint> </properties> </leafNode> diff --git a/smoketest/scripts/cli/test_policy.py b/smoketest/scripts/cli/test_policy.py index 51a33f978..c21d8af4e 100755 --- a/smoketest/scripts/cli/test_policy.py +++ b/smoketest/scripts/cli/test_policy.py @@ -1107,6 +1107,33 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase): 'metric' : '-20', }, }, + '30': { + 'action': 'permit', + 'match': { + 'ip-nexthop-addr': ipv4_nexthop_address, + }, + 'set': { + 'metric': 'rtt', + }, + }, + '40': { + 'action': 'permit', + 'match': { + 'ip-nexthop-addr': ipv4_nexthop_address, + }, + 'set': { + 'metric': '+rtt', + }, + }, + '50': { + 'action': 'permit', + 'match': { + 'ip-nexthop-addr': ipv4_nexthop_address, + }, + 'set': { + 'metric': '-rtt', + }, + }, }, }, } |