From eea75da96e892bd1dae0f11a8b3e1268188179e7 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Tue, 27 Mar 2018 12:37:16 -0700
Subject: [PATCH] Revert "[minigraph-gen] fix AclInterface entries in minigraph
 (#538)"

This reverts commit 2c13a8dc6c024e63e1219362753e5ca1c9a8661a.
---
 ansible/minigraph/lab-a7260-01.t0-116.xml    | 8 +-------
 ansible/minigraph/lab-s6000-01.t0.xml        | 8 +-------
 ansible/minigraph/lab-s6100-01.t0-64.xml     | 8 +-------
 ansible/minigraph/lab-s6100-01.t1-64-lag.xml | 8 +-------
 ansible/minigraph/str-msn2700-01.t0.xml      | 8 +-------
 ansible/minigraph/str-msn2700-01.t1-lag.xml  | 8 +-------
 ansible/minigraph/str-msn2700-01.t1.xml      | 8 +-------
 ansible/templates/minigraph_dpg.j2           | 8 +-------
 8 files changed, 8 insertions(+), 56 deletions(-)

diff --git a/ansible/minigraph/lab-a7260-01.t0-116.xml b/ansible/minigraph/lab-a7260-01.t0-116.xml
index e60a40aa84..bc62e42b3b 100644
--- a/ansible/minigraph/lab-a7260-01.t0-116.xml
+++ b/ansible/minigraph/lab-a7260-01.t0-116.xml
@@ -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/>
diff --git a/ansible/minigraph/lab-s6000-01.t0.xml b/ansible/minigraph/lab-s6000-01.t0.xml
index eecfc65d69..8f3d2b7878 100644
--- a/ansible/minigraph/lab-s6000-01.t0.xml
+++ b/ansible/minigraph/lab-s6000-01.t0.xml
@@ -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/>
diff --git a/ansible/minigraph/lab-s6100-01.t0-64.xml b/ansible/minigraph/lab-s6100-01.t0-64.xml
index 9fdd527d1c..b3f640936b 100644
--- a/ansible/minigraph/lab-s6100-01.t0-64.xml
+++ b/ansible/minigraph/lab-s6100-01.t0-64.xml
@@ -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/>
diff --git a/ansible/minigraph/lab-s6100-01.t1-64-lag.xml b/ansible/minigraph/lab-s6100-01.t1-64-lag.xml
index f027899409..1daa68b8f8 100644
--- a/ansible/minigraph/lab-s6100-01.t1-64-lag.xml
+++ b/ansible/minigraph/lab-s6100-01.t1-64-lag.xml
@@ -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/>
diff --git a/ansible/minigraph/str-msn2700-01.t0.xml b/ansible/minigraph/str-msn2700-01.t0.xml
index 812711a326..12581604d2 100644
--- a/ansible/minigraph/str-msn2700-01.t0.xml
+++ b/ansible/minigraph/str-msn2700-01.t0.xml
@@ -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/>
diff --git a/ansible/minigraph/str-msn2700-01.t1-lag.xml b/ansible/minigraph/str-msn2700-01.t1-lag.xml
index 5dc22d8f5b..1b8e475dca 100644
--- a/ansible/minigraph/str-msn2700-01.t1-lag.xml
+++ b/ansible/minigraph/str-msn2700-01.t1-lag.xml
@@ -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/>
diff --git a/ansible/minigraph/str-msn2700-01.t1.xml b/ansible/minigraph/str-msn2700-01.t1.xml
index ff8c110f05..44a8d32180 100644
--- a/ansible/minigraph/str-msn2700-01.t1.xml
+++ b/ansible/minigraph/str-msn2700-01.t1.xml
@@ -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/>
diff --git a/ansible/templates/minigraph_dpg.j2 b/ansible/templates/minigraph_dpg.j2
index beb87eabfc..3a93a886a9 100644
--- a/ansible/templates/minigraph_dpg.j2
+++ b/ansible/templates/minigraph_dpg.j2
@@ -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/>