From ac23b681c77b4392121eb6b02062ce0d6cbc43ab Mon Sep 17 00:00:00 2001 From: EdenGri Date: Tue, 11 Oct 2022 18:46:51 +0000 Subject: [PATCH 1/3] Remove LOGLEVEL DB since is no longer used --- src/swsssdk/config/database_config.json | 5 ----- src/swsssdk/sonic_db_dump_load.py | 2 +- test/config/database_config.json | 5 ----- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/swsssdk/config/database_config.json b/src/swsssdk/config/database_config.json index b86ae11bb..d96eb8275 100644 --- a/src/swsssdk/config/database_config.json +++ b/src/swsssdk/config/database_config.json @@ -22,11 +22,6 @@ "separator": ":", "instance" : "redis" }, - "LOGLEVEL_DB" : { - "id" : 3, - "separator": ":", - "instance" : "redis" - }, "CONFIG_DB" : { "id" : 4, "separator": "|", diff --git a/src/swsssdk/sonic_db_dump_load.py b/src/swsssdk/sonic_db_dump_load.py index 0240c116d..298fa8af7 100644 --- a/src/swsssdk/sonic_db_dump_load.py +++ b/src/swsssdk/sonic_db_dump_load.py @@ -113,7 +113,7 @@ def do_load(options, args): parser.add_option('-A', '--use-expireat', help='use EXPIREAT rather than TTL/EXPIRE', action='store_true') else: parser.add_option('-l', '--load', help='load data into redis (default is to dump data from redis)', action='store_true') - parser.add_option('-n', '--dbname', help='dump DATABASE (APPL_DB/ASIC_DB/COUNTERS_DB/LOGLEVEL_DB/CONFIG_DB...)') + parser.add_option('-n', '--dbname', help='dump DATABASE (APPL_DB/ASIC_DB/COUNTERS_DB/CONFIG_DB...)') parser.add_option('-t', '--conntype', help='indicate redis connection type (tcp[default] or unix_socket)', default='tcp') parser.add_option('-k', '--keys', help='dump only keys matching specified glob-style pattern') parser.add_option('-o', '--output', help='write to OUTPUT instead of stdout (dump mode only)') diff --git a/test/config/database_config.json b/test/config/database_config.json index b86ae11bb..d96eb8275 100644 --- a/test/config/database_config.json +++ b/test/config/database_config.json @@ -22,11 +22,6 @@ "separator": ":", "instance" : "redis" }, - "LOGLEVEL_DB" : { - "id" : 3, - "separator": ":", - "instance" : "redis" - }, "CONFIG_DB" : { "id" : 4, "separator": "|", From 799681a436d3189bfebfce056ee1f0d19ad59c23 Mon Sep 17 00:00:00 2001 From: EdenGri <63317673+EdenGri@users.noreply.github.com> Date: Sun, 13 Nov 2022 16:12:21 +0200 Subject: [PATCH 2/3] Update sonic_db_dump_load.py --- src/swsssdk/sonic_db_dump_load.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/swsssdk/sonic_db_dump_load.py b/src/swsssdk/sonic_db_dump_load.py index 298fa8af7..0240c116d 100644 --- a/src/swsssdk/sonic_db_dump_load.py +++ b/src/swsssdk/sonic_db_dump_load.py @@ -113,7 +113,7 @@ def do_load(options, args): parser.add_option('-A', '--use-expireat', help='use EXPIREAT rather than TTL/EXPIRE', action='store_true') else: parser.add_option('-l', '--load', help='load data into redis (default is to dump data from redis)', action='store_true') - parser.add_option('-n', '--dbname', help='dump DATABASE (APPL_DB/ASIC_DB/COUNTERS_DB/CONFIG_DB...)') + parser.add_option('-n', '--dbname', help='dump DATABASE (APPL_DB/ASIC_DB/COUNTERS_DB/LOGLEVEL_DB/CONFIG_DB...)') parser.add_option('-t', '--conntype', help='indicate redis connection type (tcp[default] or unix_socket)', default='tcp') parser.add_option('-k', '--keys', help='dump only keys matching specified glob-style pattern') parser.add_option('-o', '--output', help='write to OUTPUT instead of stdout (dump mode only)') From 924cb702c2008925b5f87228b0deebdf096b1d50 Mon Sep 17 00:00:00 2001 From: EdenGri <63317673+EdenGri@users.noreply.github.com> Date: Sun, 13 Nov 2022 16:13:05 +0200 Subject: [PATCH 3/3] Update sonic_db_dump_load.py --- src/swsssdk/sonic_db_dump_load.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/swsssdk/sonic_db_dump_load.py b/src/swsssdk/sonic_db_dump_load.py index 0240c116d..298fa8af7 100644 --- a/src/swsssdk/sonic_db_dump_load.py +++ b/src/swsssdk/sonic_db_dump_load.py @@ -113,7 +113,7 @@ def do_load(options, args): parser.add_option('-A', '--use-expireat', help='use EXPIREAT rather than TTL/EXPIRE', action='store_true') else: parser.add_option('-l', '--load', help='load data into redis (default is to dump data from redis)', action='store_true') - parser.add_option('-n', '--dbname', help='dump DATABASE (APPL_DB/ASIC_DB/COUNTERS_DB/LOGLEVEL_DB/CONFIG_DB...)') + parser.add_option('-n', '--dbname', help='dump DATABASE (APPL_DB/ASIC_DB/COUNTERS_DB/CONFIG_DB...)') parser.add_option('-t', '--conntype', help='indicate redis connection type (tcp[default] or unix_socket)', default='tcp') parser.add_option('-k', '--keys', help='dump only keys matching specified glob-style pattern') parser.add_option('-o', '--output', help='write to OUTPUT instead of stdout (dump mode only)')