[minigraph-gen] fix AclInterface entries in minigraph (#538)

To eanble service_acl test.
sonic-net · Mar 27, 2018 · 2c13a8d · 2c13a8d
1 parent 2218e14
commit 2c13a8d
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/>