From 2c13a8dc6c024e63e1219362753e5ca1c9a8661a Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Tue, 27 Mar 2018 10:43:19 -0700
Subject: [PATCH] [minigraph-gen] fix AclInterface entries in minigraph (#538)

To eanble service_acl test.
---
 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, 56 insertions(+), 8 deletions(-)

diff --git a/ansible/minigraph/lab-a7260-01.t0-116.xml b/ansible/minigraph/lab-a7260-01.t0-116.xml
index bc62e42b3b3..e60a40aa84e 100644
--- a/ansible/minigraph/lab-a7260-01.t0-116.xml
+++ b/ansible/minigraph/lab-a7260-01.t0-116.xml
@@ -280,19 +280,25 @@
       <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>
+        <AclInterface>
+          <ElementType>DataAcl</ElementType>
+          <Name i:nil="true"/>
           <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 8f3d2b7878c..eecfc65d697 100644
--- a/ansible/minigraph/lab-s6000-01.t0.xml
+++ b/ansible/minigraph/lab-s6000-01.t0.xml
@@ -280,19 +280,25 @@
       <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>
+        <AclInterface>
+          <ElementType>DataAcl</ElementType>
+          <Name i:nil="true"/>
           <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 b3f640936b4..9fdd527d1ce 100644
--- a/ansible/minigraph/lab-s6100-01.t0-64.xml
+++ b/ansible/minigraph/lab-s6100-01.t0-64.xml
@@ -280,19 +280,25 @@
       <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>
+        <AclInterface>
+          <ElementType>DataAcl</ElementType>
+          <Name i:nil="true"/>
           <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 1daa68b8f85..f0278994092 100644
--- a/ansible/minigraph/lab-s6100-01.t1-64-lag.xml
+++ b/ansible/minigraph/lab-s6100-01.t1-64-lag.xml
@@ -1146,19 +1146,25 @@
       <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>
+        <AclInterface>
+          <ElementType>DataAcl</ElementType>
+          <Name i:nil="true"/>
           <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 12581604d2c..812711a3265 100644
--- a/ansible/minigraph/str-msn2700-01.t0.xml
+++ b/ansible/minigraph/str-msn2700-01.t0.xml
@@ -280,19 +280,25 @@
       <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>
+        <AclInterface>
+          <ElementType>DataAcl</ElementType>
+          <Name i:nil="true"/>
           <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 1b8e475dca1..5dc22d8f5b6 100644
--- a/ansible/minigraph/str-msn2700-01.t1-lag.xml
+++ b/ansible/minigraph/str-msn2700-01.t1-lag.xml
@@ -1066,19 +1066,25 @@
       <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>
+        <AclInterface>
+          <ElementType>DataAcl</ElementType>
+          <Name i:nil="true"/>
           <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 44a8d321808..ff8c110f050 100644
--- a/ansible/minigraph/str-msn2700-01.t1.xml
+++ b/ansible/minigraph/str-msn2700-01.t1.xml
@@ -1346,19 +1346,25 @@
       <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>
+        <AclInterface>
+          <ElementType>DataAcl</ElementType>
+          <Name i:nil="true"/>
           <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 3a93a886a9e..beb87eabfcd 100644
--- a/ansible/templates/minigraph_dpg.j2
+++ b/ansible/templates/minigraph_dpg.j2
@@ -103,19 +103,25 @@
       <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>
+        <AclInterface>
+          <ElementType>DataAcl</ElementType>
+          <Name i:nil="true"/>
           <AttachTo>VTY_LINE</AttachTo>
           <InAcl>ssh-only</InAcl>
           <Type>SSH</Type>
+          <File>Router_Protect_AP.xml</File>
         </AclInterface>
       </AclInterfaces>
       <DownstreamSummaries/>