Update backend acl template and unit tests (#18659)

neethajohn · mssonicbld · commit e0f87535bf2d · 2024-04-16T04:01:09.000+08:00
Signed-off-by: Neetha John &lt;nejo@microsoft.com&gt;
diff --git a/files/build_templates/backend_acl.j2 b/files/build_templates/backend_acl.j2
@@ -1,15 +1,3 @@
-{%- set vlan2ports = {} %}
-{%- for vlan in VLAN %}
-    {% set portlist = [] %}
-    {%- for vlan_name, port in VLAN_MEMBER %}
-        {%- if vlan_name == vlan %}
-            {%- if portlist.append(port) %}{%- endif %}
-        {%- endif %}
-    {%- endfor %}
-    {%- set _ = vlan2ports.update({vlan: portlist| sort | join(',')}) %}
-{%- endfor %}
-
-
 {
         "acl": {
                 "acl-sets": {
@@ -31,13 +19,6 @@
                                                                      "config": {
                                                                              "vlan_id": "{{ vlan_entries['vlanid'] }}"
                                                                      }
-                                                             },
-                                                             "input_interface": {
-                                                                     "interface_ref": {
-                                                                             "config": {
-                                                                                     "interface": "{{ vlan2ports[vlan] }}"
-                                                                             }
-                                                                      }
                                                              }
 
                                                      }{% if not loop.last %},{% endif %} 
diff --git a/src/sonic-config-engine/tests/data/backend_acl/acl_multi_vlan.json b/src/sonic-config-engine/tests/data/backend_acl/acl_multi_vlan.json
@@ -19,13 +19,6 @@
                                                                      "config": {
                                                                              "vlan_id": "1000"
                                                                      }
-                                                             },
-                                                             "input_interface": {
-                                                                     "interface_ref": {
-                                                                             "config": {
-                                                                                     "interface": "Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76"
-                                                                             }
-                                                                      }
                                                              }
 
                                                      },                                                     "2": {
@@ -41,13 +34,6 @@
                                                                      "config": {
                                                                              "vlan_id": "2000"
                                                                      }
-                                                             },
-                                                             "input_interface": {
-                                                                     "interface_ref": {
-                                                                             "config": {
-                                                                                     "interface": "Ethernet4,Ethernet8"
-                                                                             }
-                                                                      }
                                                              }
 
                                                      }                                                 }
diff --git a/src/sonic-config-engine/tests/data/backend_acl/acl_single_vlan.json b/src/sonic-config-engine/tests/data/backend_acl/acl_single_vlan.json
@@ -19,13 +19,6 @@
                                                                      "config": {
                                                                              "vlan_id": "1000"
                                                                      }
-                                                             },
-                                                             "input_interface": {
-                                                                     "interface_ref": {
-                                                                             "config": {
-                                                                                     "interface": "Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet4,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet8"
-                                                                             }
-                                                                      }
                                                              }
 
                                                      }

Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,6 @@`
`19`	`19`	`"config": {`
`20`	`20`	`"vlan_id": "1000"`
`21`	`21`	`}`
`22`		`- },`
`23`		`- "input_interface": {`
`24`		`- "interface_ref": {`
`25`		`- "config": {`
`26`		`- "interface": "Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet4,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet8"`
`27`		`- }`
`28`		`- }`
`29`	`22`	`}`
`30`	`23`
`31`	`24`	`}`