diff --git a/cvl/cvl.go b/cvl/cvl.go index 2f3f8f41646d..edc9a5e606f3 100644 --- a/cvl/cvl.go +++ b/cvl/cvl.go @@ -43,7 +43,6 @@ const ( APPL_DB uint8 = 0 + iota ASIC_DB COUNTERS_DB - LOGLEVEL_DB CONFIG_DB PFC_WD_DB FLEX_COUNTER_DB = PFC_WD_DB diff --git a/tools/test/database_config.json b/tools/test/database_config.json index 51d1120e0b61..bc235b38faba 100644 --- a/tools/test/database_config.json +++ b/tools/test/database_config.json @@ -21,11 +21,6 @@ "separator": ":", "instance" : "redis" }, - "LOGLEVEL_DB" : { - "id" : 3, - "separator": ":", - "instance" : "redis" - }, "CONFIG_DB" : { "id" : 4, "separator": "|", diff --git a/translib/db/db.go b/translib/db/db.go index b14d68b3351a..d553541db59e 100644 --- a/translib/db/db.go +++ b/translib/db/db.go @@ -135,7 +135,7 @@ const ( ApplDB DBNum = iota // 0 AsicDB // 1 CountersDB // 2 - LogLevelDB // 3 + _ // We skip number 3 since the LOGLEVEL_DB that was deprecated ConfigDB // 4 FlexCounterDB // 5 StateDB // 6 @@ -307,8 +307,6 @@ func getDBInstName (dbNo DBNum) string { return "ASIC_DB" case CountersDB: return "COUNTERS_DB" - case LogLevelDB: - return "LOGLEVEL_DB" case ConfigDB: return "CONFIG_DB" case FlexCounterDB: diff --git a/translib/db/db_test.go b/translib/db/db_test.go index ef4f751578c7..6a1bf68e725f 100644 --- a/translib/db/db_test.go +++ b/translib/db/db_test.go @@ -77,11 +77,6 @@ var dbConfig = ` "separator": ":", "instance" : "redis" }, - "LOGLEVEL_DB" : { - "id" : 3, - "separator": ":", - "instance" : "redis" - }, "CONFIG_DB" : { "id" : 4, "separator": "|", diff --git a/translib/transformer/xconst.go b/translib/transformer/xconst.go index a29c8e907025..17a8dcc761db 100644 --- a/translib/transformer/xconst.go +++ b/translib/transformer/xconst.go @@ -42,7 +42,6 @@ const ( REDIS_DB_TYPE_ASIC = "ASIC_DB" REDIS_DB_TYPE_CONFIG = "CONFIG_DB" REDIS_DB_TYPE_COUNTER = "COUNTERS_DB" - REDIS_DB_TYPE_LOG_LVL = "LOGLEVEL_DB" REDIS_DB_TYPE_STATE = "STATE_DB" REDIS_DB_TYPE_FLX_COUNTER = "FLEX_COUNTER_DB" diff --git a/translib/transformer/xlate_utils.go b/translib/transformer/xlate_utils.go index 650ff9d7fd7f..77bb72f7bfae 100644 --- a/translib/transformer/xlate_utils.go +++ b/translib/transformer/xlate_utils.go @@ -532,7 +532,7 @@ func getDBOptions(dbNo db.DBNum) db.Options { switch dbNo { case db.ApplDB, db.CountersDB: opt = getDBOptionsWithSeparator(dbNo, "", ":", ":") - case db.FlexCounterDB, db.AsicDB, db.LogLevelDB, db.ConfigDB, db.StateDB, db.ErrorDB, db.UserDB: + case db.FlexCounterDB, db.AsicDB, db.ConfigDB, db.StateDB, db.ErrorDB, db.UserDB: opt = getDBOptionsWithSeparator(dbNo, "", "|", "|") } diff --git a/translib/transformer/xspec.go b/translib/transformer/xspec.go index ae61ad2977c8..0f668b2b6912 100644 --- a/translib/transformer/xspec.go +++ b/translib/transformer/xspec.go @@ -679,8 +679,6 @@ func dbNameToIndex(dbName string) db.DBNum { dbIndex = db.AsicDB case "COUNTERS_DB" : dbIndex = db.CountersDB - case "LOGLEVEL_DB" : - dbIndex = db.LogLevelDB case "CONFIG_DB" : dbIndex = db.ConfigDB case "FLEX_COUNTER_DB" : diff --git a/translib/translib.go b/translib/translib.go index 737d530fa086..0e8167732529 100644 --- a/translib/translib.go +++ b/translib/translib.go @@ -1051,14 +1051,6 @@ func getAllDbs(isGetCase bool) ([db.MaxDB]*db.DB, error) { return dbs, err } - //Create Log Level DB connection - dbs[db.LogLevelDB], err = db.NewDB(getDBOptions(db.LogLevelDB, isWriteDisabled)) - - if err != nil { - closeAllDbs(dbs[:]) - return dbs, err - } - isWriteDisabled = true //Create Config DB connection @@ -1121,7 +1113,7 @@ func getDBOptions(dbNo db.DBNum, isWriteDisabled bool) db.Options { switch dbNo { case db.ApplDB, db.CountersDB, db.AsicDB: opt = getDBOptionsWithSeparator(dbNo, "", ":", ":", isWriteDisabled) - case db.FlexCounterDB, db.LogLevelDB, db.ConfigDB, db.StateDB: + case db.FlexCounterDB, db.ConfigDB, db.StateDB: opt = getDBOptionsWithSeparator(dbNo, "", "|", "|", isWriteDisabled) }