Skip to content

Commit 2c13a8d

Browse files
yxiecalguohan
yxieca
authored and
lguohan
committed
[minigraph-gen] fix AclInterface entries in minigraph (#538)
To eanble service_acl test.
1 parent 2218e14 commit 2c13a8d

8 files changed

Lines changed: 56 additions & 8 deletions

‎ansible/minigraph/lab-a7260-01.t0-116.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,19 +280,25 @@
280280
<DataAcls/>
281281
<AclInterfaces>
282282
<AclInterface>
283+
<ElementType>DataAcl</ElementType>
284+
<Name i:nil="true"/>
283285
<InAcl>SNMP_ACL</InAcl>
284286
<AttachTo>SNMP</AttachTo>
285287
<Type>SNMP</Type>
288+
<File>Router_Protect_AP.xml</File>
286289
</AclInterface>
287290
<AclInterface>
288291
<AttachTo>ERSPAN</AttachTo>
289292
<InAcl>Everflow</InAcl>
290293
<Type>Everflow</Type>
291294
</AclInterface>
292-
<AclInterface>
295+
<AclInterface>
296+
<ElementType>DataAcl</ElementType>
297+
<Name i:nil="true"/>
293298
<AttachTo>VTY_LINE</AttachTo>
294299
<InAcl>ssh-only</InAcl>
295300
<Type>SSH</Type>
301+
<File>Router_Protect_AP.xml</File>
296302
</AclInterface>
297303
</AclInterfaces>
298304
<DownstreamSummaries/>

‎ansible/minigraph/lab-s6000-01.t0.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,19 +280,25 @@
280280
<DataAcls/>
281281
<AclInterfaces>
282282
<AclInterface>
283+
<ElementType>DataAcl</ElementType>
284+
<Name i:nil="true"/>
283285
<InAcl>SNMP_ACL</InAcl>
284286
<AttachTo>SNMP</AttachTo>
285287
<Type>SNMP</Type>
288+
<File>Router_Protect_AP.xml</File>
286289
</AclInterface>
287290
<AclInterface>
288291
<AttachTo>ERSPAN</AttachTo>
289292
<InAcl>Everflow</InAcl>
290293
<Type>Everflow</Type>
291294
</AclInterface>
292-
<AclInterface>
295+
<AclInterface>
296+
<ElementType>DataAcl</ElementType>
297+
<Name i:nil="true"/>
293298
<AttachTo>VTY_LINE</AttachTo>
294299
<InAcl>ssh-only</InAcl>
295300
<Type>SSH</Type>
301+
<File>Router_Protect_AP.xml</File>
296302
</AclInterface>
297303
</AclInterfaces>
298304
<DownstreamSummaries/>

‎ansible/minigraph/lab-s6100-01.t0-64.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,19 +280,25 @@
280280
<DataAcls/>
281281
<AclInterfaces>
282282
<AclInterface>
283+
<ElementType>DataAcl</ElementType>
284+
<Name i:nil="true"/>
283285
<InAcl>SNMP_ACL</InAcl>
284286
<AttachTo>SNMP</AttachTo>
285287
<Type>SNMP</Type>
288+
<File>Router_Protect_AP.xml</File>
286289
</AclInterface>
287290
<AclInterface>
288291
<AttachTo>ERSPAN</AttachTo>
289292
<InAcl>Everflow</InAcl>
290293
<Type>Everflow</Type>
291294
</AclInterface>
292-
<AclInterface>
295+
<AclInterface>
296+
<ElementType>DataAcl</ElementType>
297+
<Name i:nil="true"/>
293298
<AttachTo>VTY_LINE</AttachTo>
294299
<InAcl>ssh-only</InAcl>
295300
<Type>SSH</Type>
301+
<File>Router_Protect_AP.xml</File>
296302
</AclInterface>
297303
</AclInterfaces>
298304
<DownstreamSummaries/>

‎ansible/minigraph/lab-s6100-01.t1-64-lag.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1146,19 +1146,25 @@
11461146
<DataAcls/>
11471147
<AclInterfaces>
11481148
<AclInterface>
1149+
<ElementType>DataAcl</ElementType>
1150+
<Name i:nil="true"/>
11491151
<InAcl>SNMP_ACL</InAcl>
11501152
<AttachTo>SNMP</AttachTo>
11511153
<Type>SNMP</Type>
1154+
<File>Router_Protect_AP.xml</File>
11521155
</AclInterface>
11531156
<AclInterface>
11541157
<AttachTo>ERSPAN</AttachTo>
11551158
<InAcl>Everflow</InAcl>
11561159
<Type>Everflow</Type>
11571160
</AclInterface>
1158-
<AclInterface>
1161+
<AclInterface>
1162+
<ElementType>DataAcl</ElementType>
1163+
<Name i:nil="true"/>
11591164
<AttachTo>VTY_LINE</AttachTo>
11601165
<InAcl>ssh-only</InAcl>
11611166
<Type>SSH</Type>
1167+
<File>Router_Protect_AP.xml</File>
11621168
</AclInterface>
11631169
</AclInterfaces>
11641170
<DownstreamSummaries/>

‎ansible/minigraph/str-msn2700-01.t0.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,19 +280,25 @@
280280
<DataAcls/>
281281
<AclInterfaces>
282282
<AclInterface>
283+
<ElementType>DataAcl</ElementType>
284+
<Name i:nil="true"/>
283285
<InAcl>SNMP_ACL</InAcl>
284286
<AttachTo>SNMP</AttachTo>
285287
<Type>SNMP</Type>
288+
<File>Router_Protect_AP.xml</File>
286289
</AclInterface>
287290
<AclInterface>
288291
<AttachTo>ERSPAN</AttachTo>
289292
<InAcl>Everflow</InAcl>
290293
<Type>Everflow</Type>
291294
</AclInterface>
292-
<AclInterface>
295+
<AclInterface>
296+
<ElementType>DataAcl</ElementType>
297+
<Name i:nil="true"/>
293298
<AttachTo>VTY_LINE</AttachTo>
294299
<InAcl>ssh-only</InAcl>
295300
<Type>SSH</Type>
301+
<File>Router_Protect_AP.xml</File>
296302
</AclInterface>
297303
</AclInterfaces>
298304
<DownstreamSummaries/>

‎ansible/minigraph/str-msn2700-01.t1-lag.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1066,19 +1066,25 @@
10661066
<DataAcls/>
10671067
<AclInterfaces>
10681068
<AclInterface>
1069+
<ElementType>DataAcl</ElementType>
1070+
<Name i:nil="true"/>
10691071
<InAcl>SNMP_ACL</InAcl>
10701072
<AttachTo>SNMP</AttachTo>
10711073
<Type>SNMP</Type>
1074+
<File>Router_Protect_AP.xml</File>
10721075
</AclInterface>
10731076
<AclInterface>
10741077
<AttachTo>ERSPAN</AttachTo>
10751078
<InAcl>Everflow</InAcl>
10761079
<Type>Everflow</Type>
10771080
</AclInterface>
1078-
<AclInterface>
1081+
<AclInterface>
1082+
<ElementType>DataAcl</ElementType>
1083+
<Name i:nil="true"/>
10791084
<AttachTo>VTY_LINE</AttachTo>
10801085
<InAcl>ssh-only</InAcl>
10811086
<Type>SSH</Type>
1087+
<File>Router_Protect_AP.xml</File>
10821088
</AclInterface>
10831089
</AclInterfaces>
10841090
<DownstreamSummaries/>

‎ansible/minigraph/str-msn2700-01.t1.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1346,19 +1346,25 @@
13461346
<DataAcls/>
13471347
<AclInterfaces>
13481348
<AclInterface>
1349+
<ElementType>DataAcl</ElementType>
1350+
<Name i:nil="true"/>
13491351
<InAcl>SNMP_ACL</InAcl>
13501352
<AttachTo>SNMP</AttachTo>
13511353
<Type>SNMP</Type>
1354+
<File>Router_Protect_AP.xml</File>
13521355
</AclInterface>
13531356
<AclInterface>
13541357
<AttachTo>ERSPAN</AttachTo>
13551358
<InAcl>Everflow</InAcl>
13561359
<Type>Everflow</Type>
13571360
</AclInterface>
1358-
<AclInterface>
1361+
<AclInterface>
1362+
<ElementType>DataAcl</ElementType>
1363+
<Name i:nil="true"/>
13591364
<AttachTo>VTY_LINE</AttachTo>
13601365
<InAcl>ssh-only</InAcl>
13611366
<Type>SSH</Type>
1367+
<File>Router_Protect_AP.xml</File>
13621368
</AclInterface>
13631369
</AclInterfaces>
13641370
<DownstreamSummaries/>

‎ansible/templates/minigraph_dpg.j2‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,19 +103,25 @@
103103
<DataAcls/>
104104
<AclInterfaces>
105105
<AclInterface>
106+
<ElementType>DataAcl</ElementType>
107+
<Name i:nil="true"/>
106108
<InAcl>SNMP_ACL</InAcl>
107109
<AttachTo>SNMP</AttachTo>
108110
<Type>SNMP</Type>
111+
<File>Router_Protect_AP.xml</File>
109112
</AclInterface>
110113
<AclInterface>
111114
<AttachTo>ERSPAN</AttachTo>
112115
<InAcl>Everflow</InAcl>
113116
<Type>Everflow</Type>
114117
</AclInterface>
115-
<AclInterface>
118+
<AclInterface>
119+
<ElementType>DataAcl</ElementType>
120+
<Name i:nil="true"/>
116121
<AttachTo>VTY_LINE</AttachTo>
117122
<InAcl>ssh-only</InAcl>
118123
<Type>SSH</Type>
124+
<File>Router_Protect_AP.xml</File>
119125
</AclInterface>
120126
</AclInterfaces>
121127
<DownstreamSummaries/>

0 commit comments

Comments
 (0)