diff options
| author | Alex Kudentsov <43482574+alexk37@users.noreply.github.com> | 2026-10-08 22:27:36 +0700 |
|---|---|---|
| committer | Alex Kudentsov <43482574+alexk37@users.noreply.github.com> | 2026-10-18 16:34:21 +0700 |
| commit | 60aabdc9587700a326c8e9df06f09ba0c60c5435 (patch) | |
| tree | fcb9598c8d52d3472eb3628b677d62baf7611dc7 /interface-definitions | |
| parent | db29bdc899e4b4c27569d3c5705839b924393fe6 (diff) | |
| download | vyos-1x-60aabdc9587700a326c8e9df06f09ba0c60c5435.tar.gz vyos-1x-60aabdc9587700a326c8e9df06f09ba0c60c5435.zip | |
ospf: T9441: migrate "parameters opaque-lsa" to "capability opaque"
"protocols ospf parameters opaque-lsa" and "protocols ospf capability
opaque" are two CLI nodes for one FRR setting, FRR's "capability opaque".
Keep "capability opaque" only.
The migration script ospf/2-to-3 sets "capability opaque" where "parameters
opaque-lsa" exists in the default VRF, and deletes the old node (and the
"parameters" node when it is left empty). FRR refuses opaque LSAs outside
the default VRF, so in a VRF instance the option never took effect: for a
VRF the migration drops both "parameters opaque-lsa" and a plain
"capability opaque" instead of moving the value into a node FRR would
refuse at the next commit. The template renders the line from "capability
opaque" only; it rendered the alias form "ospf opaque-lsa" for the old
node, which frr-reload found missing in the running config on every
reload: while only the old node was set, every commit that reloads FRR
reset all adjacencies of that OSPF instance.
Tests: a migration unit test (global instance, VRF instance, a VRF with
"capability opaque" set directly, both nodes set together in a VRF, and
global+VRF independence), the vrf-ospf config test (now carries "parameters
opaque-lsa" in both the default instance and a VRF instance; the VRF
instance is expected to lose it with no replacement), test_ospf_02 uses the
new node, and test_ospf_21 checks the generated FRR config.
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/ospf/protocol-common-config.xml.i | 6 | ||||
| -rw-r--r-- | interface-definitions/include/version/ospf-version.xml.i | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i index caef8abb4..3b8e5aedd 100644 --- a/interface-definitions/include/ospf/protocol-common-config.xml.i +++ b/interface-definitions/include/ospf/protocol-common-config.xml.i @@ -640,12 +640,6 @@ </properties> <defaultValue>cisco</defaultValue> </leafNode> - <leafNode name="opaque-lsa"> - <properties> - <help>Enable the Opaque-LSA capability (rfc2370)</help> - <valueless/> - </properties> - </leafNode> <leafNode name="rfc1583-compatibility"> <properties> <help>Enable RFC1583 criteria for handling AS external routes</help> diff --git a/interface-definitions/include/version/ospf-version.xml.i b/interface-definitions/include/version/ospf-version.xml.i index df108837b..8ba074e81 100644 --- a/interface-definitions/include/version/ospf-version.xml.i +++ b/interface-definitions/include/version/ospf-version.xml.i @@ -1,3 +1,3 @@ <!-- include start from include/version/ospf-version.xml.i --> -<syntaxVersion component='ospf' version='2'></syntaxVersion> +<syntaxVersion component='ospf' version='3'></syntaxVersion> <!-- include end --> |