From 97f247ddaa79389eb2f98e9f153860bfb2da0702 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 17 Jun 2023 23:36:38 +0800 Subject: [PATCH 1/2] [submodule] Update submodule sonic-telemetry to the latest HEAD automatically (#15522) src/sonic-telemetry * a4bfafe - (HEAD -> 202205, origin/202205) Merge pull request #119 from zbud-msft/202205_gnmi_get_log (5 hours ago) [Ying Xie] * 1b49409 - Merge branch '202205' into 202205_gnmi_get_log (7 days ago) [Zain Budhwani] * b478159 - Cherry pick commit 4a8964a (#104) (7 days ago) [Zain Budhwani] --- src/sonic-telemetry | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-telemetry b/src/sonic-telemetry index 19ca64a66863..a4bfafe9a137 160000 --- a/src/sonic-telemetry +++ b/src/sonic-telemetry @@ -1 +1 @@ -Subproject commit 19ca64a66863f9b01346b90c589a0bd64bcc992e +Subproject commit a4bfafe9a137f1018831e5d0743edd756f38ddd5 From ff35113a222582e5f79d95fe161dc0b19eb7799b Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 17 Jun 2023 23:45:02 +0800 Subject: [PATCH 2/2] Update the defination of acl table type BMCDATA and BMCDATAV6 (#15385) (#15527) 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: Co-authored-by: Zhijian Li --- 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 0b059c27b19a..a95b2698de14 100644 --- a/src/sonic-config-engine/minigraph.py +++ b/src/sonic-config-engine/minigraph.py @@ -55,12 +55,12 @@ '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 23d2b0cac8a3..43f92ccdc996 100644 --- a/src/sonic-config-engine/tests/test_minigraph_case.py +++ b/src/sonic-config-engine/tests/test_minigraph_case.py @@ -500,12 +500,12 @@ def test_minigraph_acl_type_bmcdata(self): 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',