From 44956774b1672f9f5dece0e720db07f2547895af Mon Sep 17 00:00:00 2001 From: Lukas Stockner Date: Fri, 1 Dec 2023 11:22:35 +0100 Subject: [PATCH] Add CoPP trap for DHCP L2 broadcasts Signed-off-by: Lukas Stockner --- orchagent/copporch.cpp | 2 ++ tests/mock_tests/copp_cfg.json | 2 +- tests/test_copp.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/orchagent/copporch.cpp b/orchagent/copporch.cpp index 9d597c601f..a4d5c1f23e 100644 --- a/orchagent/copporch.cpp +++ b/orchagent/copporch.cpp @@ -61,11 +61,13 @@ static map trap_id_map = { {"arp_req", SAI_HOSTIF_TRAP_TYPE_ARP_REQUEST}, {"arp_resp", SAI_HOSTIF_TRAP_TYPE_ARP_RESPONSE}, {"dhcp", SAI_HOSTIF_TRAP_TYPE_DHCP}, + {"dhcp_l2", SAI_HOSTIF_TRAP_TYPE_DHCP_L2}, {"ospf", SAI_HOSTIF_TRAP_TYPE_OSPF}, {"pim", SAI_HOSTIF_TRAP_TYPE_PIM}, {"vrrp", SAI_HOSTIF_TRAP_TYPE_VRRP}, {"bgp", SAI_HOSTIF_TRAP_TYPE_BGP}, {"dhcpv6", SAI_HOSTIF_TRAP_TYPE_DHCPV6}, + {"dhcpv6_l2", SAI_HOSTIF_TRAP_TYPE_DHCPV6_L2}, {"ospfv6", SAI_HOSTIF_TRAP_TYPE_OSPFV6}, {"isis", SAI_HOSTIF_TRAP_TYPE_ISIS}, {"vrrpv6", SAI_HOSTIF_TRAP_TYPE_VRRPV6}, diff --git a/tests/mock_tests/copp_cfg.json b/tests/mock_tests/copp_cfg.json index 46d921b827..c8a2b8d58f 100644 --- a/tests/mock_tests/copp_cfg.json +++ b/tests/mock_tests/copp_cfg.json @@ -82,7 +82,7 @@ "trap_group": "queue4_group3" }, "dhcp_relay": { - "trap_ids": "dhcp,dhcpv6", + "trap_ids": "dhcp,dhcp_l2,dhcpv6,dhcpv6_l2", "trap_group": "queue4_group3" }, "udld": { diff --git a/tests/test_copp.py b/tests/test_copp.py index 5885a489b5..05c7e3e2e5 100644 --- a/tests/test_copp.py +++ b/tests/test_copp.py @@ -157,7 +157,7 @@ "lacp": ["lacp", copp_group_queue4_group1, "always_enabled"], "arp": ["arp_req;arp_resp;neigh_discovery", copp_group_queue4_group2, "always_enabled"], "lldp": ["lldp", copp_group_queue4_group3], - "dhcp": ["dhcp;dhcpv6", copp_group_queue4_group3], + "dhcp": ["dhcp;dhcp_l2;dhcpv6;dhcpv6_l2", copp_group_queue4_group3], "udld": ["udld", copp_group_queue4_group3, "always_enabled"], "ip2me": ["ip2me", copp_group_queue1_group1, "always_enabled"], "nat": ["src_nat_miss;dest_nat_miss", copp_group_queue1_group2],