Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

babel: T6866: IPv6 distribute-lists in access-list6 format have names not numbers #4187

Merged
merged 4 commits into from
Nov 13, 2024
Merged

babel: T6866: IPv6 distribute-lists in access-list6 format have names not numbers #4187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e9c71f
babel: T4977: we do not have EIGRP support - remove redistribution op…
c-po Nov 11, 2024
0cb568c
babel: T4977: use common include for IPv4/IPv6 route redistribution
c-po Nov 11, 2024
02a3eaf
babel: T4977: add missing smoketests
c-po Nov 11, 2024
1686dac
babel: T6866: IPv6 distribute-lists in access-list6 format have names…
c-po Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions interface-definitions/include/babel/redistribute-common.xml.i
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<!-- include start from babel/redistribute-common.xml.i -->
<leafNode name="bgp">
<properties>
<help>Border Gateway Protocol (BGP)</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="connected">
<properties>
<help>Connected routes (directly attached subnet or host)</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="isis">
<properties>
<help>Intermediate System to Intermediate System (IS-IS)</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="kernel">
<properties>
<help>Redistribute Kernel routes (not installed via the zebra RIB)</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="openfabric">
<properties>
<help>OpenFabric Routing Protocol</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="static">
<properties>
<help>Statically configured routes</help>
<valueless/>
</properties>
</leafNode>
<!-- include end -->
22 changes: 8 additions & 14 deletions interface-definitions/include/rip/access-list6.xml.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,25 @@
<leafNode name="in">
<properties>
<help>Access list to apply to input packets</help>
<valueHelp>
<format>u32</format>
<description>Access list to apply to input packets</description>
</valueHelp>
<completionHelp>
<path>policy access-list6</path>
</completionHelp>
<constraint>
<validator name="numeric" argument="--range 0-4294967295"/>
</constraint>
<valueHelp>
<format>txt</format>
<description>Name of IPv6 access-list</description>
</valueHelp>
</properties>
</leafNode>
<leafNode name="out">
<properties>
<help>Access list to apply to output packets</help>
<valueHelp>
<format>u32</format>
<description>Access list to apply to output packets</description>
</valueHelp>
<completionHelp>
<path>policy access-list6</path>
</completionHelp>
<constraint>
<validator name="numeric" argument="--range 0-4294967295"/>
</constraint>
<valueHelp>
<format>txt</format>
<description>Name of IPv6 access-list</description>
</valueHelp>
</properties>
</leafNode>
</children>
Expand Down
84 changes: 4 additions & 80 deletions interface-definitions/protocols_babel.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,42 +71,7 @@
<help>Redistribute IPv4 routes</help>
</properties>
<children>
<leafNode name="bgp">
<properties>
<help>Redistribute BGP routes</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="connected">
<properties>
<help>Redistribute connected routes</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="eigrp">
<properties>
<help>Redistribute EIGRP routes</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="isis">
<properties>
<help>Redistribute IS-IS routes</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="kernel">
<properties>
<help>Redistribute kernel routes</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="nhrp">
<properties>
<help>Redistribute NHRP routes</help>
<valueless/>
</properties>
</leafNode>
#include <include/babel/redistribute-common.xml.i>
<leafNode name="ospf">
<properties>
<help>Redistribute OSPF routes</help>
Expand All @@ -119,64 +84,23 @@
<valueless/>
</properties>
</leafNode>
<leafNode name="static">
<properties>
<help>Redistribute static routes</help>
<valueless/>
</properties>
</leafNode>
</children>
</node>
<node name="ipv6">
<properties>
<help>Redistribute IPv6 routes</help>
</properties>
<children>
<leafNode name="bgp">
<properties>
<help>Redistribute BGP routes</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="connected">
<properties>
<help>Redistribute connected routes</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="isis">
<properties>
<help>Redistribute IS-IS routes</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="kernel">
<properties>
<help>Redistribute kernel routes</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="nhrp">
<properties>
<help>Redistribute NHRP routes</help>
<valueless/>
</properties>
</leafNode>
#include <include/babel/redistribute-common.xml.i>
<leafNode name="ospfv3">
<properties>
<help>Redistribute OSPFv3 routes</help>
<help>Open Shortest Path First (IPv6) (OSPFv3)</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="ripng">
<properties>
<help>Redistribute RIPng routes</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="static">
<properties>
<help>Redistribute static routes</help>
<help>Routing Information Protocol next-generation (IPv6) (RIPng)</help>
<valueless/>
</properties>
</leafNode>
Expand Down
Loading
Loading