Skip to content

Commit

Permalink
Merge pull request #4187 from c-po/babel-tests
Browse files Browse the repository at this point in the history 
babel: T6866: IPv6 distribute-lists in access-list6 format have names not numbers
  • Loading branch information
@dmbaturin
dmbaturin authored Nov 13, 2024
2 parents c6a097e + 1686dac commit d51765c
Show file tree
Hide file tree
Showing 4 changed files with 268 additions and 94 deletions.
38 changes: 38 additions & 0 deletions interface-definitions/include/babel/redistribute-common.xml.i
View file
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
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
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

0 comments on commit d51765c

Please sign in to comment.