Skip to content

Commit

Permalink
Revert "[minigraph-gen] fix AclInterface entries in minigraph (#538)"
Browse files Browse the repository at this point in the history
This reverts commit 2c13a8d.
  • Loading branch information
yxieca authored Mar 27, 2018
1 parent 2c13a8d commit eea75da
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 56 deletions.
8 changes: 1 addition & 7 deletions ansible/minigraph/lab-a7260-01.t0-116.xml
Original file line number Diff line number Diff line change
Expand Up @@ -280,25 +280,19 @@
<DataAcls/>
<AclInterfaces>
<AclInterface>
<ElementType>DataAcl</ElementType>
<Name i:nil="true"/>
<InAcl>SNMP_ACL</InAcl>
<AttachTo>SNMP</AttachTo>
<Type>SNMP</Type>
<File>Router_Protect_AP.xml</File>
</AclInterface>
<AclInterface>
<AttachTo>ERSPAN</AttachTo>
<InAcl>Everflow</InAcl>
<Type>Everflow</Type>
</AclInterface>
<AclInterface>
<ElementType>DataAcl</ElementType>
<Name i:nil="true"/>
<AclInterface>
<AttachTo>VTY_LINE</AttachTo>
<InAcl>ssh-only</InAcl>
<Type>SSH</Type>
<File>Router_Protect_AP.xml</File>
</AclInterface>
</AclInterfaces>
<DownstreamSummaries/>
Expand Down
8 changes: 1 addition & 7 deletions ansible/minigraph/lab-s6000-01.t0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -280,25 +280,19 @@
<DataAcls/>
<AclInterfaces>
<AclInterface>
<ElementType>DataAcl</ElementType>
<Name i:nil="true"/>
<InAcl>SNMP_ACL</InAcl>
<AttachTo>SNMP</AttachTo>
<Type>SNMP</Type>
<File>Router_Protect_AP.xml</File>
</AclInterface>
<AclInterface>
<AttachTo>ERSPAN</AttachTo>
<InAcl>Everflow</InAcl>
<Type>Everflow</Type>
</AclInterface>
<AclInterface>
<ElementType>DataAcl</ElementType>
<Name i:nil="true"/>
<AclInterface>
<AttachTo>VTY_LINE</AttachTo>
<InAcl>ssh-only</InAcl>
<Type>SSH</Type>
<File>Router_Protect_AP.xml</File>
</AclInterface>
</AclInterfaces>
<DownstreamSummaries/>
Expand Down
8 changes: 1 addition & 7 deletions ansible/minigraph/lab-s6100-01.t0-64.xml
Original file line number Diff line number Diff line change
Expand Up @@ -280,25 +280,19 @@
<DataAcls/>
<AclInterfaces>
<AclInterface>
<ElementType>DataAcl</ElementType>
<Name i:nil="true"/>
<InAcl>SNMP_ACL</InAcl>
<AttachTo>SNMP</AttachTo>
<Type>SNMP</Type>
<File>Router_Protect_AP.xml</File>
</AclInterface>
<AclInterface>
<AttachTo>ERSPAN</AttachTo>
<InAcl>Everflow</InAcl>
<Type>Everflow</Type>
</AclInterface>
<AclInterface>
<ElementType>DataAcl</ElementType>
<Name i:nil="true"/>
<AclInterface>
<AttachTo>VTY_LINE</AttachTo>
<InAcl>ssh-only</InAcl>
<Type>SSH</Type>
<File>Router_Protect_AP.xml</File>
</AclInterface>
</AclInterfaces>
<DownstreamSummaries/>
Expand Down
8 changes: 1 addition & 7 deletions ansible/minigraph/lab-s6100-01.t1-64-lag.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1146,25 +1146,19 @@
<DataAcls/>
<AclInterfaces>
<AclInterface>
<ElementType>DataAcl</ElementType>
<Name i:nil="true"/>
<InAcl>SNMP_ACL</InAcl>
<AttachTo>SNMP</AttachTo>
<Type>SNMP</Type>
<File>Router_Protect_AP.xml</File>
</AclInterface>
<AclInterface>
<AttachTo>ERSPAN</AttachTo>
<InAcl>Everflow</InAcl>
<Type>Everflow</Type>
</AclInterface>
<AclInterface>
<ElementType>DataAcl</ElementType>
<Name i:nil="true"/>
<AclInterface>
<AttachTo>VTY_LINE</AttachTo>
<InAcl>ssh-only</InAcl>
<Type>SSH</Type>
<File>Router_Protect_AP.xml</File>
</AclInterface>
</AclInterfaces>
<DownstreamSummaries/>
Expand Down
8 changes: 1 addition & 7 deletions ansible/minigraph/str-msn2700-01.t0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -280,25 +280,19 @@
<DataAcls/>
<AclInterfaces>
<AclInterface>
<ElementType>DataAcl</ElementType>
<Name i:nil="true"/>
<InAcl>SNMP_ACL</InAcl>
<AttachTo>SNMP</AttachTo>
<Type>SNMP</Type>
<File>Router_Protect_AP.xml</File>
</AclInterface>
<AclInterface>
<AttachTo>ERSPAN</AttachTo>
<InAcl>Everflow</InAcl>
<Type>Everflow</Type>
</AclInterface>
<AclInterface>
<ElementType>DataAcl</ElementType>
<Name i:nil="true"/>
<AclInterface>
<AttachTo>VTY_LINE</AttachTo>
<InAcl>ssh-only</InAcl>
<Type>SSH</Type>
<File>Router_Protect_AP.xml</File>
</AclInterface>
</AclInterfaces>
<DownstreamSummaries/>
Expand Down
8 changes: 1 addition & 7 deletions ansible/minigraph/str-msn2700-01.t1-lag.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1066,25 +1066,19 @@
<DataAcls/>
<AclInterfaces>
<AclInterface>
<ElementType>DataAcl</ElementType>
<Name i:nil="true"/>
<InAcl>SNMP_ACL</InAcl>
<AttachTo>SNMP</AttachTo>
<Type>SNMP</Type>
<File>Router_Protect_AP.xml</File>
</AclInterface>
<AclInterface>
<AttachTo>ERSPAN</AttachTo>
<InAcl>Everflow</InAcl>
<Type>Everflow</Type>
</AclInterface>
<AclInterface>
<ElementType>DataAcl</ElementType>
<Name i:nil="true"/>
<AclInterface>
<AttachTo>VTY_LINE</AttachTo>
<InAcl>ssh-only</InAcl>
<Type>SSH</Type>
<File>Router_Protect_AP.xml</File>
</AclInterface>
</AclInterfaces>
<DownstreamSummaries/>
Expand Down
8 changes: 1 addition & 7 deletions ansible/minigraph/str-msn2700-01.t1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1346,25 +1346,19 @@
<DataAcls/>
<AclInterfaces>
<AclInterface>
<ElementType>DataAcl</ElementType>
<Name i:nil="true"/>
<InAcl>SNMP_ACL</InAcl>
<AttachTo>SNMP</AttachTo>
<Type>SNMP</Type>
<File>Router_Protect_AP.xml</File>
</AclInterface>
<AclInterface>
<AttachTo>ERSPAN</AttachTo>
<InAcl>Everflow</InAcl>
<Type>Everflow</Type>
</AclInterface>
<AclInterface>
<ElementType>DataAcl</ElementType>
<Name i:nil="true"/>
<AclInterface>
<AttachTo>VTY_LINE</AttachTo>
<InAcl>ssh-only</InAcl>
<Type>SSH</Type>
<File>Router_Protect_AP.xml</File>
</AclInterface>
</AclInterfaces>
<DownstreamSummaries/>
Expand Down
8 changes: 1 addition & 7 deletions ansible/templates/minigraph_dpg.j2
Original file line number Diff line number Diff line change
Expand Up @@ -103,25 +103,19 @@
<DataAcls/>
<AclInterfaces>
<AclInterface>
<ElementType>DataAcl</ElementType>
<Name i:nil="true"/>
<InAcl>SNMP_ACL</InAcl>
<AttachTo>SNMP</AttachTo>
<Type>SNMP</Type>
<File>Router_Protect_AP.xml</File>
</AclInterface>
<AclInterface>
<AttachTo>ERSPAN</AttachTo>
<InAcl>Everflow</InAcl>
<Type>Everflow</Type>
</AclInterface>
<AclInterface>
<ElementType>DataAcl</ElementType>
<Name i:nil="true"/>
<AclInterface>
<AttachTo>VTY_LINE</AttachTo>
<InAcl>ssh-only</InAcl>
<Type>SSH</Type>
<File>Router_Protect_AP.xml</File>
</AclInterface>
</AclInterfaces>
<DownstreamSummaries/>
Expand Down

0 comments on commit eea75da

Please sign in to comment.