From 1747dc27c375353b45ea4dfb0591775c4ed12562 Mon Sep 17 00:00:00 2001 From: Anukul Verma Date: Mon, 5 Aug 2024 15:53:30 +0530 Subject: [PATCH 1/9] DB migrator change for COPP_GROUP config db upgrade --- scripts/db_migrator.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/scripts/db_migrator.py b/scripts/db_migrator.py index 9be3ce325b..acfd7e4a6c 100755 --- a/scripts/db_migrator.py +++ b/scripts/db_migrator.py @@ -856,6 +856,17 @@ def migrate_aaa(self): if keys: self.configDB.delete(self.configDB.CONFIG_DB, authorization_key) + def migrate_config_db_copp_group_trap_action_mandatory_node(self): + """ + Migrate COPP_GROUP table, for 'default' group Yang mandatory node + 'trap_action' was missing, so add the same so that Yang validation + will go through + """ + copp_group_def = self.configDB.get_entry('COPP_GROUP', 'default') + if 'trap_action' not in copp_group_def: + copp_group_def['trap_action'] = 'trap' + self.configDB.set_entry('COPP_GROUP', 'default', copp_group_def) + def version_unknown(self): """ version_unknown tracks all SONiC versions that doesn't have a version @@ -1240,6 +1251,10 @@ def version_202411_01(self): master branch until 202411 branch is created. """ log.log_info('Handling version_202411_01') + + if self.configDB.keys(self.configDB.CONFIG_DB, "COPP_GROUP|default"): + self.migrate_config_db_copp_group_trap_action_mandatory_node() + return None def get_version(self): From 5b4e9ea0e1c1a4ef3daa1f2b32661f9b6bdb9c4e Mon Sep 17 00:00:00 2001 From: Anukul Verma Date: Mon, 5 Aug 2024 17:01:09 +0530 Subject: [PATCH 2/9] Fix indentation issue --- scripts/db_migrator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/db_migrator.py b/scripts/db_migrator.py index acfd7e4a6c..7778d96f67 100755 --- a/scripts/db_migrator.py +++ b/scripts/db_migrator.py @@ -864,8 +864,8 @@ def migrate_config_db_copp_group_trap_action_mandatory_node(self): """ copp_group_def = self.configDB.get_entry('COPP_GROUP', 'default') if 'trap_action' not in copp_group_def: - copp_group_def['trap_action'] = 'trap' - self.configDB.set_entry('COPP_GROUP', 'default', copp_group_def) + copp_group_def['trap_action'] = 'trap' + self.configDB.set_entry('COPP_GROUP', 'default', copp_group_def) def version_unknown(self): """ From 979f1fbb57241135c835655a9892792abce1d4cd Mon Sep 17 00:00:00 2001 From: Anukul Verma Date: Tue, 6 Aug 2024 15:51:22 +0530 Subject: [PATCH 3/9] Adding test for db migrator changes --- .../config_db/copp_group_table_expected.json | 122 ++++++++++++++++++ .../config_db/copp_group_table_input.json | 121 +++++++++++++++++ tests/db_migrator_test.py | 24 ++++ 3 files changed, 267 insertions(+) create mode 100644 tests/db_migrator_input/config_db/copp_group_table_expected.json create mode 100644 tests/db_migrator_input/config_db/copp_group_table_input.json diff --git a/tests/db_migrator_input/config_db/copp_group_table_expected.json b/tests/db_migrator_input/config_db/copp_group_table_expected.json new file mode 100644 index 0000000000..4826d96592 --- /dev/null +++ b/tests/db_migrator_input/config_db/copp_group_table_expected.json @@ -0,0 +1,122 @@ +{ + "COPP_GROUP": { + "default": { + "queue": "0", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"600", + "cbs":"600", + "red_action":"drop", + "trap_action":"trap" + }, + "queue4_group1": { + "trap_action":"trap", + "trap_priority":"4", + "queue": "4", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"6000", + "cbs":"6000", + "red_action":"drop" + }, + "queue4_group2": { + "trap_action":"copy", + "trap_priority":"4", + "queue": "4", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"600", + "cbs":"600", + "red_action":"drop" + }, + "queue4_group3": { + "trap_action":"trap", + "trap_priority":"4", + "queue": "4", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"300", + "cbs":"300", + "red_action":"drop" + }, + "queue1_group1": { + "trap_action":"trap", + "trap_priority":"1", + "queue": "1", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"6000", + "cbs":"6000", + "red_action":"drop" + }, + "queue1_group2": { + "trap_action":"trap", + "trap_priority":"1", + "queue": "1", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"600", + "cbs":"600", + "red_action":"drop" + }, + "queue2_group1": { + "cbs": "1000", + "cir": "1000", + "genetlink_mcgrp_name": "packets", + "genetlink_name": "psample", + "meter_type": "packets", + "mode": "sr_tcm", + "queue": "2", + "red_action": "drop", + "trap_action": "trap", + "trap_priority": "1" + + } + }, + "COPP_TRAP": { + "bgp": { + "trap_ids": "bgp,bgpv6", + "trap_group": "queue4_group1" + }, + "lacp": { + "trap_ids": "lacp", + "trap_group": "queue4_group1", + "always_enabled": "true" + }, + "arp": { + "trap_ids": "arp_req,arp_resp,neigh_discovery", + "trap_group": "queue4_group2", + "always_enabled": "true" + }, + "lldp": { + "trap_ids": "lldp", + "trap_group": "queue4_group3" + }, + "dhcp_relay": { + "trap_ids": "dhcp,dhcpv6", + "trap_group": "queue4_group3" + }, + "udld": { + "trap_ids": "udld", + "trap_group": "queue4_group3", + "always_enabled": "true" + }, + "ip2me": { + "trap_ids": "ip2me", + "trap_group": "queue1_group1", + "always_enabled": "true" + }, + "macsec": { + "trap_ids": "eapol", + "trap_group": "queue4_group1" + }, + "nat": { + "trap_ids": "src_nat_miss,dest_nat_miss", + "trap_group": "queue1_group2" + }, + "sflow": { + "trap_group": "queue2_group1", + "trap_ids": "sample_packet" + } + } +} diff --git a/tests/db_migrator_input/config_db/copp_group_table_input.json b/tests/db_migrator_input/config_db/copp_group_table_input.json new file mode 100644 index 0000000000..08366e57f6 --- /dev/null +++ b/tests/db_migrator_input/config_db/copp_group_table_input.json @@ -0,0 +1,121 @@ +{ + "COPP_GROUP": { + "default": { + "queue": "0", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"600", + "cbs":"600", + "red_action":"drop" + }, + "queue4_group1": { + "trap_action":"trap", + "trap_priority":"4", + "queue": "4", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"6000", + "cbs":"6000", + "red_action":"drop" + }, + "queue4_group2": { + "trap_action":"copy", + "trap_priority":"4", + "queue": "4", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"600", + "cbs":"600", + "red_action":"drop" + }, + "queue4_group3": { + "trap_action":"trap", + "trap_priority":"4", + "queue": "4", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"300", + "cbs":"300", + "red_action":"drop" + }, + "queue1_group1": { + "trap_action":"trap", + "trap_priority":"1", + "queue": "1", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"6000", + "cbs":"6000", + "red_action":"drop" + }, + "queue1_group2": { + "trap_action":"trap", + "trap_priority":"1", + "queue": "1", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"600", + "cbs":"600", + "red_action":"drop" + }, + "queue2_group1": { + "cbs": "1000", + "cir": "1000", + "genetlink_mcgrp_name": "packets", + "genetlink_name": "psample", + "meter_type": "packets", + "mode": "sr_tcm", + "queue": "2", + "red_action": "drop", + "trap_action": "trap", + "trap_priority": "1" + + } + }, + "COPP_TRAP": { + "bgp": { + "trap_ids": "bgp,bgpv6", + "trap_group": "queue4_group1" + }, + "lacp": { + "trap_ids": "lacp", + "trap_group": "queue4_group1", + "always_enabled": "true" + }, + "arp": { + "trap_ids": "arp_req,arp_resp,neigh_discovery", + "trap_group": "queue4_group2", + "always_enabled": "true" + }, + "lldp": { + "trap_ids": "lldp", + "trap_group": "queue4_group3" + }, + "dhcp_relay": { + "trap_ids": "dhcp,dhcpv6", + "trap_group": "queue4_group3" + }, + "udld": { + "trap_ids": "udld", + "trap_group": "queue4_group3", + "always_enabled": "true" + }, + "ip2me": { + "trap_ids": "ip2me", + "trap_group": "queue1_group1", + "always_enabled": "true" + }, + "macsec": { + "trap_ids": "eapol", + "trap_group": "queue4_group1" + }, + "nat": { + "trap_ids": "src_nat_miss,dest_nat_miss", + "trap_group": "queue1_group2" + }, + "sflow": { + "trap_group": "queue2_group1", + "trap_ids": "sample_packet" + } + } +} diff --git a/tests/db_migrator_test.py b/tests/db_migrator_test.py index cdf4251bd7..5ea1824afc 100644 --- a/tests/db_migrator_test.py +++ b/tests/db_migrator_test.py @@ -1013,3 +1013,27 @@ def test_per_command_aaa(self, test_json): diff = DeepDiff(resulting_table, expected_table, ignore_order=True) assert not diff + +class TestCoppGroupTrapAction(object): + @classmethod + def setup_class(cls): + os.environ['UTILITIES_UNIT_TESTING'] = "2" + + @classmethod + def teardown_class(cls): + os.environ['UTILITIES_UNIT_TESTING'] = "0" + dbconnector.dedicated_dbs['CONFIG_DB'] = None + + def test_copp_group_trap_action_migrator(self): + dbconnector.dedicated_dbs['CONFIG_DB'] = os.path.join(mock_db_path, 'config_db', 'copp_group_table_input') + import db_migrator + dbmgtr = db_migrator.DBMigrator(None) + dbmgtr.migrate() + dbconnector.dedicated_dbs['CONFIG_DB'] = os.path.join(mock_db_path, 'config_db', 'copp_group_table_expected') + expected_db = Db() + + resulting_table = dbmgtr.configDB.get_table('COPP_GROUP') + expected_table = expected_db.cfgdb.get_table('COPP_GROUP') + + diff = DeepDiff(resulting_table, expected_table, ignore_order=True) + assert not diff From d3d994c79a7ac94285945b1c22652bcc7b22cfd0 Mon Sep 17 00:00:00 2001 From: Anukul Verma Date: Tue, 6 Aug 2024 16:05:29 +0530 Subject: [PATCH 4/9] DB migrator test script --- tests/db_migrator_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/db_migrator_test.py b/tests/db_migrator_test.py index 5ea1824afc..7d43d9bbf2 100644 --- a/tests/db_migrator_test.py +++ b/tests/db_migrator_test.py @@ -1014,6 +1014,7 @@ def test_per_command_aaa(self, test_json): diff = DeepDiff(resulting_table, expected_table, ignore_order=True) assert not diff + class TestCoppGroupTrapAction(object): @classmethod def setup_class(cls): From 9e3480ff7bb8ea16a7ee052cfcc4aa8cd6fa3ba1 Mon Sep 17 00:00:00 2001 From: Anukul Verma Date: Tue, 6 Aug 2024 17:20:08 +0530 Subject: [PATCH 5/9] Adding DB Version in input json test file --- tests/db_migrator_input/config_db/copp_group_table_input.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/db_migrator_input/config_db/copp_group_table_input.json b/tests/db_migrator_input/config_db/copp_group_table_input.json index 08366e57f6..dd55a9efe7 100644 --- a/tests/db_migrator_input/config_db/copp_group_table_input.json +++ b/tests/db_migrator_input/config_db/copp_group_table_input.json @@ -117,5 +117,8 @@ "trap_group": "queue2_group1", "trap_ids": "sample_packet" } + }, + "VERSIONS|DATABASE": { + "VERSION": "version_202405_01" } } From 3f6ab4245f2297fa4142cab4ea0be6e8c7f2433a Mon Sep 17 00:00:00 2001 From: Anukul Verma Date: Tue, 6 Aug 2024 18:00:18 +0530 Subject: [PATCH 6/9] Fixed version number for copp changes --- scripts/db_migrator.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/db_migrator.py b/scripts/db_migrator.py index 7778d96f67..3640ebb194 100755 --- a/scripts/db_migrator.py +++ b/scripts/db_migrator.py @@ -1242,6 +1242,10 @@ def version_202405_01(self): Version 202405_01. """ log.log_info('Handling version_202405_01') + + if self.configDB.keys(self.configDB.CONFIG_DB, "COPP_GROUP|default"): + self.migrate_config_db_copp_group_trap_action_mandatory_node() + self.set_version('version_202411_01') return 'version_202411_01' @@ -1251,10 +1255,6 @@ def version_202411_01(self): master branch until 202411 branch is created. """ log.log_info('Handling version_202411_01') - - if self.configDB.keys(self.configDB.CONFIG_DB, "COPP_GROUP|default"): - self.migrate_config_db_copp_group_trap_action_mandatory_node() - return None def get_version(self): From 349fc51c6102574b5045f3f023b513b43301e18d Mon Sep 17 00:00:00 2001 From: Anukul Verma Date: Tue, 6 Aug 2024 20:12:43 +0530 Subject: [PATCH 7/9] DB migrator test fix --- tests/db_migrator_input/config_db/copp_group_table_input.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/db_migrator_input/config_db/copp_group_table_input.json b/tests/db_migrator_input/config_db/copp_group_table_input.json index dd55a9efe7..a9d2701d11 100644 --- a/tests/db_migrator_input/config_db/copp_group_table_input.json +++ b/tests/db_migrator_input/config_db/copp_group_table_input.json @@ -119,6 +119,6 @@ } }, "VERSIONS|DATABASE": { - "VERSION": "version_202405_01" + "VERSION": "version_202311_03" } } From 6d7d0e8d8b1317ac43fb90d6d5cfddd4b8d7e032 Mon Sep 17 00:00:00 2001 From: Anukul Verma Date: Wed, 7 Aug 2024 10:21:37 +0530 Subject: [PATCH 8/9] Fixed test input json format --- .../config_db/copp_group_table_expected.json | 234 +++++++++-------- .../config_db/copp_group_table_input.json | 238 +++++++++--------- 2 files changed, 232 insertions(+), 240 deletions(-) diff --git a/tests/db_migrator_input/config_db/copp_group_table_expected.json b/tests/db_migrator_input/config_db/copp_group_table_expected.json index 4826d96592..eeedd1e8cd 100644 --- a/tests/db_migrator_input/config_db/copp_group_table_expected.json +++ b/tests/db_migrator_input/config_db/copp_group_table_expected.json @@ -1,122 +1,118 @@ { - "COPP_GROUP": { - "default": { - "queue": "0", - "meter_type":"packets", - "mode":"sr_tcm", - "cir":"600", - "cbs":"600", - "red_action":"drop", - "trap_action":"trap" - }, - "queue4_group1": { - "trap_action":"trap", - "trap_priority":"4", - "queue": "4", - "meter_type":"packets", - "mode":"sr_tcm", - "cir":"6000", - "cbs":"6000", - "red_action":"drop" - }, - "queue4_group2": { - "trap_action":"copy", - "trap_priority":"4", - "queue": "4", - "meter_type":"packets", - "mode":"sr_tcm", - "cir":"600", - "cbs":"600", - "red_action":"drop" - }, - "queue4_group3": { - "trap_action":"trap", - "trap_priority":"4", - "queue": "4", - "meter_type":"packets", - "mode":"sr_tcm", - "cir":"300", - "cbs":"300", - "red_action":"drop" - }, - "queue1_group1": { - "trap_action":"trap", - "trap_priority":"1", - "queue": "1", - "meter_type":"packets", - "mode":"sr_tcm", - "cir":"6000", - "cbs":"6000", - "red_action":"drop" - }, - "queue1_group2": { - "trap_action":"trap", - "trap_priority":"1", - "queue": "1", - "meter_type":"packets", - "mode":"sr_tcm", - "cir":"600", - "cbs":"600", - "red_action":"drop" - }, - "queue2_group1": { - "cbs": "1000", - "cir": "1000", - "genetlink_mcgrp_name": "packets", - "genetlink_name": "psample", - "meter_type": "packets", - "mode": "sr_tcm", - "queue": "2", - "red_action": "drop", - "trap_action": "trap", - "trap_priority": "1" - - } + "COPP_GROUP|default": { + "queue": "0", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"600", + "cbs":"600", + "red_action":"drop", + "trap_action":"trap" }, - "COPP_TRAP": { - "bgp": { - "trap_ids": "bgp,bgpv6", - "trap_group": "queue4_group1" - }, - "lacp": { - "trap_ids": "lacp", - "trap_group": "queue4_group1", - "always_enabled": "true" - }, - "arp": { - "trap_ids": "arp_req,arp_resp,neigh_discovery", - "trap_group": "queue4_group2", - "always_enabled": "true" - }, - "lldp": { - "trap_ids": "lldp", - "trap_group": "queue4_group3" - }, - "dhcp_relay": { - "trap_ids": "dhcp,dhcpv6", - "trap_group": "queue4_group3" - }, - "udld": { - "trap_ids": "udld", - "trap_group": "queue4_group3", - "always_enabled": "true" - }, - "ip2me": { - "trap_ids": "ip2me", - "trap_group": "queue1_group1", - "always_enabled": "true" - }, - "macsec": { - "trap_ids": "eapol", - "trap_group": "queue4_group1" - }, - "nat": { - "trap_ids": "src_nat_miss,dest_nat_miss", - "trap_group": "queue1_group2" - }, - "sflow": { - "trap_group": "queue2_group1", - "trap_ids": "sample_packet" - } - } + "COPP_GROUP|queue4_group1": { + "trap_action":"trap", + "trap_priority":"4", + "queue": "4", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"6000", + "cbs":"6000", + "red_action":"drop" + }, + "COPP_GROUP|queue4_group2": { + "trap_action":"copy", + "trap_priority":"4", + "queue": "4", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"600", + "cbs":"600", + "red_action":"drop" + }, + "COPP_GROUP|queue4_group3": { + "trap_action":"trap", + "trap_priority":"4", + "queue": "4", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"300", + "cbs":"300", + "red_action":"drop" + }, + "COPP_GROUP|queue1_group1": { + "trap_action":"trap", + "trap_priority":"1", + "queue": "1", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"6000", + "cbs":"6000", + "red_action":"drop" + }, + "COPP_GROUP|queue1_group2": { + "trap_action":"trap", + "trap_priority":"1", + "queue": "1", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"600", + "cbs":"600", + "red_action":"drop" + }, + "COPP_GROUP|queue2_group1": { + "cbs": "1000", + "cir": "1000", + "genetlink_mcgrp_name": "packets", + "genetlink_name": "psample", + "meter_type": "packets", + "mode": "sr_tcm", + "queue": "2", + "red_action": "drop", + "trap_action": "trap", + "trap_priority": "1" + + }, + "COPP_TRAP|bgp": { + "trap_ids": "bgp,bgpv6", + "trap_group": "queue4_group1" + }, + "COPP_TRAP|lacp": { + "trap_ids": "lacp", + "trap_group": "queue4_group1", + "always_enabled": "true" + }, + "COPP_TRAP|arp": { + "trap_ids": "arp_req,arp_resp,neigh_discovery", + "trap_group": "queue4_group2", + "always_enabled": "true" + }, + "COPP_TRAP|lldp": { + "trap_ids": "lldp", + "trap_group": "queue4_group3" + }, + "COPP_TRAP|dhcp_relay": { + "trap_ids": "dhcp,dhcpv6", + "trap_group": "queue4_group3" + }, + "COPP_TRAP|udld": { + "trap_ids": "udld", + "trap_group": "queue4_group3", + "always_enabled": "true" + }, + "COPP_TRAP|ip2me": { + "trap_ids": "ip2me", + "trap_group": "queue1_group1", + "always_enabled": "true" + }, + "COPP_TRAP|macsec": { + "trap_ids": "eapol", + "trap_group": "queue4_group1" + }, + "COPP_TRAP|nat": { + "trap_ids": "src_nat_miss,dest_nat_miss", + "trap_group": "queue1_group2" + }, + "COPP_TRAP|sflow": { + "trap_group": "queue2_group1", + "trap_ids": "sample_packet" + }, } diff --git a/tests/db_migrator_input/config_db/copp_group_table_input.json b/tests/db_migrator_input/config_db/copp_group_table_input.json index a9d2701d11..085d440e71 100644 --- a/tests/db_migrator_input/config_db/copp_group_table_input.json +++ b/tests/db_migrator_input/config_db/copp_group_table_input.json @@ -1,124 +1,120 @@ { - "COPP_GROUP": { - "default": { - "queue": "0", - "meter_type":"packets", - "mode":"sr_tcm", - "cir":"600", - "cbs":"600", - "red_action":"drop" - }, - "queue4_group1": { - "trap_action":"trap", - "trap_priority":"4", - "queue": "4", - "meter_type":"packets", - "mode":"sr_tcm", - "cir":"6000", - "cbs":"6000", - "red_action":"drop" - }, - "queue4_group2": { - "trap_action":"copy", - "trap_priority":"4", - "queue": "4", - "meter_type":"packets", - "mode":"sr_tcm", - "cir":"600", - "cbs":"600", - "red_action":"drop" - }, - "queue4_group3": { - "trap_action":"trap", - "trap_priority":"4", - "queue": "4", - "meter_type":"packets", - "mode":"sr_tcm", - "cir":"300", - "cbs":"300", - "red_action":"drop" - }, - "queue1_group1": { - "trap_action":"trap", - "trap_priority":"1", - "queue": "1", - "meter_type":"packets", - "mode":"sr_tcm", - "cir":"6000", - "cbs":"6000", - "red_action":"drop" - }, - "queue1_group2": { - "trap_action":"trap", - "trap_priority":"1", - "queue": "1", - "meter_type":"packets", - "mode":"sr_tcm", - "cir":"600", - "cbs":"600", - "red_action":"drop" - }, - "queue2_group1": { - "cbs": "1000", - "cir": "1000", - "genetlink_mcgrp_name": "packets", - "genetlink_name": "psample", - "meter_type": "packets", - "mode": "sr_tcm", - "queue": "2", - "red_action": "drop", - "trap_action": "trap", - "trap_priority": "1" - - } - }, - "COPP_TRAP": { - "bgp": { - "trap_ids": "bgp,bgpv6", - "trap_group": "queue4_group1" - }, - "lacp": { - "trap_ids": "lacp", - "trap_group": "queue4_group1", - "always_enabled": "true" - }, - "arp": { - "trap_ids": "arp_req,arp_resp,neigh_discovery", - "trap_group": "queue4_group2", - "always_enabled": "true" - }, - "lldp": { - "trap_ids": "lldp", - "trap_group": "queue4_group3" - }, - "dhcp_relay": { - "trap_ids": "dhcp,dhcpv6", - "trap_group": "queue4_group3" - }, - "udld": { - "trap_ids": "udld", - "trap_group": "queue4_group3", - "always_enabled": "true" - }, - "ip2me": { - "trap_ids": "ip2me", - "trap_group": "queue1_group1", - "always_enabled": "true" - }, - "macsec": { - "trap_ids": "eapol", - "trap_group": "queue4_group1" - }, - "nat": { - "trap_ids": "src_nat_miss,dest_nat_miss", - "trap_group": "queue1_group2" - }, - "sflow": { - "trap_group": "queue2_group1", - "trap_ids": "sample_packet" - } + "COPP_GROUP|default": { + "queue": "0", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"600", + "cbs":"600", + "red_action":"drop" }, - "VERSIONS|DATABASE": { - "VERSION": "version_202311_03" - } + "COPP_GROUP|queue4_group1": { + "trap_action":"trap", + "trap_priority":"4", + "queue": "4", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"6000", + "cbs":"6000", + "red_action":"drop" + }, + "COPP_GROUP|queue4_group2": { + "trap_action":"copy", + "trap_priority":"4", + "queue": "4", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"600", + "cbs":"600", + "red_action":"drop" + }, + "COPP_GROUP|queue4_group3": { + "trap_action":"trap", + "trap_priority":"4", + "queue": "4", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"300", + "cbs":"300", + "red_action":"drop" + }, + "COPP_GROUP|queue1_group1": { + "trap_action":"trap", + "trap_priority":"1", + "queue": "1", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"6000", + "cbs":"6000", + "red_action":"drop" + }, + "COPP_GROUP|queue1_group2": { + "trap_action":"trap", + "trap_priority":"1", + "queue": "1", + "meter_type":"packets", + "mode":"sr_tcm", + "cir":"600", + "cbs":"600", + "red_action":"drop" + }, + "COPP_GROUP|queue2_group1": { + "cbs": "1000", + "cir": "1000", + "genetlink_mcgrp_name": "packets", + "genetlink_name": "psample", + "meter_type": "packets", + "mode": "sr_tcm", + "queue": "2", + "red_action": "drop", + "trap_action": "trap", + "trap_priority": "1" + + }, + "COPP_TRAP|bgp": { + "trap_ids": "bgp,bgpv6", + "trap_group": "queue4_group1" + }, + "COPP_TRAP|lacp": { + "trap_ids": "lacp", + "trap_group": "queue4_group1", + "always_enabled": "true" + }, + "COPP_TRAP|arp": { + "trap_ids": "arp_req,arp_resp,neigh_discovery", + "trap_group": "queue4_group2", + "always_enabled": "true" + }, + "COPP_TRAP|lldp": { + "trap_ids": "lldp", + "trap_group": "queue4_group3" + }, + "COPP_TRAP|dhcp_relay": { + "trap_ids": "dhcp,dhcpv6", + "trap_group": "queue4_group3" + }, + "COPP_TRAP|udld": { + "trap_ids": "udld", + "trap_group": "queue4_group3", + "always_enabled": "true" + }, + "COPP_TRAP|ip2me": { + "trap_ids": "ip2me", + "trap_group": "queue1_group1", + "always_enabled": "true" + }, + "COPP_TRAP|macsec": { + "trap_ids": "eapol", + "trap_group": "queue4_group1" + }, + "COPP_TRAP|nat": { + "trap_ids": "src_nat_miss,dest_nat_miss", + "trap_group": "queue1_group2" + }, + "COPP_TRAP|sflow": { + "trap_group": "queue2_group1", + "trap_ids": "sample_packet" + }, + "VERSIONS|DATABASE": { + "VERSION": "version_202405_01" + } } From 54481bb06c0e9fab5ab242dd0a3ca2b454742649 Mon Sep 17 00:00:00 2001 From: Anukul Verma Date: Wed, 7 Aug 2024 12:22:45 +0530 Subject: [PATCH 9/9] Fix json input file --- .../db_migrator_input/config_db/copp_group_table_expected.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/db_migrator_input/config_db/copp_group_table_expected.json b/tests/db_migrator_input/config_db/copp_group_table_expected.json index eeedd1e8cd..1337b9a1df 100644 --- a/tests/db_migrator_input/config_db/copp_group_table_expected.json +++ b/tests/db_migrator_input/config_db/copp_group_table_expected.json @@ -114,5 +114,5 @@ "COPP_TRAP|sflow": { "trap_group": "queue2_group1", "trap_ids": "sample_packet" - }, + } }