From 90dc0568243e35821882ca39cb8ec055dc68c2bd Mon Sep 17 00:00:00 2001 From: Zhijian Li Date: Sat, 17 Jun 2023 23:43:15 +0800 Subject: [PATCH] Update the defination of acl table type BMCDATA and BMCDATAV6 (#15385) Why I did it Update the definition of acl table type BMCDATA and BMCDATAV6 in minigraph parser. Work item tracking Microsoft ADO (number only): 24101023 How I did it Update the definition of acl table type BMCDATA and BMCDATAV6 in minigraph parser. How to verify it Ran unittest to verify this update: --- src/sonic-config-engine/minigraph.py | 4 ++-- src/sonic-config-engine/tests/test_minigraph_case.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py index be1a77205f..016387b46c 100644 --- a/src/sonic-config-engine/minigraph.py +++ b/src/sonic-config-engine/minigraph.py @@ -56,12 +56,12 @@ acl_table_type_defination = { 'BMCDATA': { "ACTIONS": "PACKET_ACTION,COUNTER", "BIND_POINTS": "PORT", - "MATCHES": "SRC_IP,DST_IP,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,TCP_FLAGS", + "MATCHES": "SRC_IP,DST_IP,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,L4_SRC_PORT,L4_DST_PORT,L4_SRC_PORT_RANGE,L4_DST_PORT_RANGE", }, 'BMCDATAV6': { "ACTIONS": "PACKET_ACTION,COUNTER", "BIND_POINTS": "PORT", - "MATCHES": "SRC_IPV6,DST_IPV6,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,TCP_FLAGS", + "MATCHES": "SRC_IPV6,DST_IPV6,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,L4_SRC_PORT,L4_DST_PORT,L4_SRC_PORT_RANGE,L4_DST_PORT_RANGE", } } diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py index 48221a74ab..d33d2c14e8 100644 --- a/src/sonic-config-engine/tests/test_minigraph_case.py +++ b/src/sonic-config-engine/tests/test_minigraph_case.py @@ -499,12 +499,12 @@ class TestCfgGenCaseInsensitive(TestCase): expected_acl_type_bmcdata = { "ACTIONS": "PACKET_ACTION,COUNTER", "BIND_POINTS": "PORT", - "MATCHES": "SRC_IP,DST_IP,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,TCP_FLAGS", + "MATCHES": "SRC_IP,DST_IP,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,L4_SRC_PORT,L4_DST_PORT,L4_SRC_PORT_RANGE,L4_DST_PORT_RANGE", } expected_acl_type_bmcdatav6 = { "ACTIONS": "PACKET_ACTION,COUNTER", "BIND_POINTS": "PORT", - "MATCHES": "SRC_IPV6,DST_IPV6,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,TCP_FLAGS", + "MATCHES": "SRC_IPV6,DST_IPV6,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,L4_SRC_PORT,L4_DST_PORT,L4_SRC_PORT_RANGE,L4_DST_PORT_RANGE", } expected_acl_table_bmc_acl_northbound = { 'policy_desc': 'BMC_ACL_NORTHBOUND',