Skip to content

Commit d51765c

Browse files
dmbaturindmbaturin
authored
Merge pull request #4187 from c-po/babel-tests
babel: T6866: IPv6 distribute-lists in access-list6 format have names not numbers
2 parents c6a097e + 1686dac commit d51765c

File tree

4 files changed

+268
-94
lines changed

4 files changed

+268
-94
lines changed

‎interface-definitions/include/babel/redistribute-common.xml.i

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<!-- include start from babel/redistribute-common.xml.i -->
2+
<leafNode name="bgp">
3+
<properties>
4+
<help>Border Gateway Protocol (BGP)</help>
5+
<valueless/>
6+
</properties>
7+
</leafNode>
8+
<leafNode name="connected">
9+
<properties>
10+
<help>Connected routes (directly attached subnet or host)</help>
11+
<valueless/>
12+
</properties>
13+
</leafNode>
14+
<leafNode name="isis">
15+
<properties>
16+
<help>Intermediate System to Intermediate System (IS-IS)</help>
17+
<valueless/>
18+
</properties>
19+
</leafNode>
20+
<leafNode name="kernel">
21+
<properties>
22+
<help>Redistribute Kernel routes (not installed via the zebra RIB)</help>
23+
<valueless/>
24+
</properties>
25+
</leafNode>
26+
<leafNode name="openfabric">
27+
<properties>
28+
<help>OpenFabric Routing Protocol</help>
29+
<valueless/>
30+
</properties>
31+
</leafNode>
32+
<leafNode name="static">
33+
<properties>
34+
<help>Statically configured routes</help>
35+
<valueless/>
36+
</properties>
37+
</leafNode>
38+
<!-- include end -->

‎interface-definitions/include/rip/access-list6.xml.i

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,25 @@
77
<leafNode name="in">
88
<properties>
99
<help>Access list to apply to input packets</help>
10-
<valueHelp>
11-
<format>u32</format>
12-
<description>Access list to apply to input packets</description>
13-
</valueHelp>
1410
<completionHelp>
1511
<path>policy access-list6</path>
1612
</completionHelp>
17-
<constraint>
18-
<validator name="numeric" argument="--range 0-4294967295"/>
19-
</constraint>
13+
<valueHelp>
14+
<format>txt</format>
15+
<description>Name of IPv6 access-list</description>
16+
</valueHelp>
2017
</properties>
2118
</leafNode>
2219
<leafNode name="out">
2320
<properties>
2421
<help>Access list to apply to output packets</help>
25-
<valueHelp>
26-
<format>u32</format>
27-
<description>Access list to apply to output packets</description>
28-
</valueHelp>
2922
<completionHelp>
3023
<path>policy access-list6</path>
3124
</completionHelp>
32-
<constraint>
33-
<validator name="numeric" argument="--range 0-4294967295"/>
34-
</constraint>
25+
<valueHelp>
26+
<format>txt</format>
27+
<description>Name of IPv6 access-list</description>
28+
</valueHelp>
3529
</properties>
3630
</leafNode>
3731
</children>

‎interface-definitions/protocols_babel.xml.in

Lines changed: 4 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -71,42 +71,7 @@
7171
<help>Redistribute IPv4 routes</help>
7272
</properties>
7373
<children>
74-
<leafNode name="bgp">
75-
<properties>
76-
<help>Redistribute BGP routes</help>
77-
<valueless/>
78-
</properties>
79-
</leafNode>
80-
<leafNode name="connected">
81-
<properties>
82-
<help>Redistribute connected routes</help>
83-
<valueless/>
84-
</properties>
85-
</leafNode>
86-
<leafNode name="eigrp">
87-
<properties>
88-
<help>Redistribute EIGRP routes</help>
89-
<valueless/>
90-
</properties>
91-
</leafNode>
92-
<leafNode name="isis">
93-
<properties>
94-
<help>Redistribute IS-IS routes</help>
95-
<valueless/>
96-
</properties>
97-
</leafNode>
98-
<leafNode name="kernel">
99-
<properties>
100-
<help>Redistribute kernel routes</help>
101-
<valueless/>
102-
</properties>
103-
</leafNode>
104-
<leafNode name="nhrp">
105-
<properties>
106-
<help>Redistribute NHRP routes</help>
107-
<valueless/>
108-
</properties>
109-
</leafNode>
74+
#include <include/babel/redistribute-common.xml.i>
11075
<leafNode name="ospf">
11176
<properties>
11277
<help>Redistribute OSPF routes</help>
@@ -119,64 +84,23 @@
11984
<valueless/>
12085
</properties>
12186
</leafNode>
122-
<leafNode name="static">
123-
<properties>
124-
<help>Redistribute static routes</help>
125-
<valueless/>
126-
</properties>
127-
</leafNode>
12887
</children>
12988
</node>
13089
<node name="ipv6">
13190
<properties>
13291
<help>Redistribute IPv6 routes</help>
13392
</properties>
13493
<children>
135-
<leafNode name="bgp">
136-
<properties>
137-
<help>Redistribute BGP routes</help>
138-
<valueless/>
139-
</properties>
140-
</leafNode>
141-
<leafNode name="connected">
142-
<properties>
143-
<help>Redistribute connected routes</help>
144-
<valueless/>
145-
</properties>
146-
</leafNode>
147-
<leafNode name="isis">
148-
<properties>
149-
<help>Redistribute IS-IS routes</help>
150-
<valueless/>
151-
</properties>
152-
</leafNode>
153-
<leafNode name="kernel">
154-
<properties>
155-
<help>Redistribute kernel routes</help>
156-
<valueless/>
157-
</properties>
158-
</leafNode>
159-
<leafNode name="nhrp">
160-
<properties>
161-
<help>Redistribute NHRP routes</help>
162-
<valueless/>
163-
</properties>
164-
</leafNode>
94+
#include <include/babel/redistribute-common.xml.i>
16595
<leafNode name="ospfv3">
16696
<properties>
167-
<help>Redistribute OSPFv3 routes</help>
97+
<help>Open Shortest Path First (IPv6) (OSPFv3)</help>
16898
<valueless/>
16999
</properties>
170100
</leafNode>
171101
<leafNode name="ripng">
172102
<properties>
173-
<help>Redistribute RIPng routes</help>
174-
<valueless/>
175-
</properties>
176-
</leafNode>
177-
<leafNode name="static">
178-
<properties>
179-
<help>Redistribute static routes</help>
103+
<help>Routing Information Protocol next-generation (IPv6) (RIPng)</help>
180104
<valueless/>
181105
</properties>
182106
</leafNode>

0 commit comments

Comments
 (0)