Remove LOGLEVEL DB since is no longer used (sonic-net#64)

This PR is part of the following HLD: Persistent loglevel HLD: sonic-net/SONiC#1041 **- What I did** Deleted the LOGLEVEL_DB. After the Logger tables moved from the LOGLEVEL_DB to the CONFIG_DB and the jinja2_cache was deleted the LOGLEVEL_DB is not in use. **- How I did it** Removed the LOGLEVEL_DB from the SONiC code **- How to verify it** All tests were passed
StormLiangMS · Nov 14, 2022 · 68e0341 · 68e0341
1 parent ec32690
commit 68e0341
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 27 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
 	}