disabling offline internal in integration tests

agents/agent_caps_it_test.go

@@ -57,7 +57,11 @@ func TestDiameterAgentCapsIT(t *testing.T) {
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
+			"db_type": "*internal",
+			"opts":{
+			"internalDBDumpInterval": "0",	
+			"internalDBRewriteInterval": "0"
+	}
     	}
 	},
 },

agents/diam_prom_it_test.go

@@ -55,12 +55,12 @@ func TestDiamPrometheus(t *testing.T) {
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
+			"db_type": "*internal",
+				"opts":{
+				"internalDBRewriteInterval": "0s",
+				"internalDBDumpInterval": "0s"
+			}
     	}
-	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
 	}
 },
 "sessions": {

agents/diambench_test.go

@@ -60,13 +60,13 @@ func BenchmarkDiameterCaps(b *testing.B) {
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
+			"db_type": "*internal",
+				"opts":{
+			"internalDBRewriteInterval": "0s",
+			"internalDBDumpInterval": "0s"
+		}
     	}
 	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
-	}
 },
 "cores": {
 	"caps": %d,

apis/cores_it_test.go

@@ -53,13 +53,14 @@ func TestCoreSProfilingFlags(t *testing.T) {
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
+			"db_type": "*internal",
+			"opts":{
+			"internalDBRewriteInterval": "0s",
+			"internalDBDumpInterval": "0s"
+		}
     	}
 	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
-	}
+
 }
 }`
 
@@ -188,12 +189,12 @@ func TestCoreSProfilingAPI(t *testing.T) {
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
+			"db_type": "*internal",
+			"opts":{
+			"internalDBRewriteInterval": "0s",
+			"internalDBDumpInterval": "0s"
+		}
     	}
-	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
 	}
 },}`,
 		Encoding: *utils.Encoding,

attributes/attributes_it_test.go

@@ -2249,13 +2249,13 @@ func TestAttributesArith(t *testing.T) {
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
+			"db_type": "*internal",
+			"opts":{
+			"internalDBRewriteInterval": "0s",
+			"internalDBDumpInterval": "0s"
+		}
     	}
 	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
-	}
 },
 "admins": {
 	"enabled": true

cdrs/cdrs_it_test.go

@@ -73,13 +73,13 @@ cgrates.org,DEFAULT_RATE,,;0,0,0,*free,RT_ALWAYS,,"* * * * *",;0,false,0s,,0.1,1
 	"db_conns": {
 		"*default": {	
 			"db_type": "*internal",
-			"string_indexed_fields": ["RunID"]
+			"string_indexed_fields": ["RunID"],
+				"opts":{
+				"internalDBRewriteInterval": "0s",
+				"internalDBDumpInterval": "0s"
+			}
 		},
 	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
-	}
 },
 
 "rates": {

cmd/cgr-loader/cgr-loader_it_test.go

@@ -54,20 +54,52 @@ func TestLoadConfig(t *testing.T) {
 	expDBcfg := &config.DbCfg{
 		DBConns: config.DBConns{
 			utils.StorDB: &config.DBConn{
-				Type:     utils.MetaMySQL,
-				Host:     "127.0.0.1",
-				Port:     "3306",
-				Name:     utils.CGRateSLwr,
-				User:     utils.CGRateSLwr,
-				Password: "CGRateS.org",
+				Type:                utils.MetaMySQL,
+				Host:                "127.0.0.1",
+				Port:                "3306",
+				Name:                utils.CGRateSLwr,
+				User:                utils.CGRateSLwr,
+				Password:            "CGRateS.org",
+				StringIndexedFields: []string{},
+				PrefixIndexedFields: []string{},
+				RmtConns:            []string{},
+				RplConns:            []string{},
+				Opts: &config.DBOpts{
+					InternalDBDumpPath:        "/var/lib/cgrates/internal_db/db",
+					InternalDBBackupPath:      "/var/lib/cgrates/internal_db/backup/db",
+					InternalDBStartTimeout:    300000000000,
+					InternalDBDumpInterval:    time.Minute,
+					InternalDBRewriteInterval: time.Hour,
+					InternalDBFileSizeLimit:   1073741824,
+					RedisMaxConns:             10,
+					RedisConnectAttempts:      20,
+					MongoQueryTimeout:         10 * time.Second,
+					MongoConnScheme:           "mongodb",
+					RedisClusterSync:          5 * time.Second,
+					RedisClusterOndownDelay:   0,
+					RedisCluster:              false,
+					RedisPoolPipelineWindow:   150 * time.Microsecond,
+					RedisTLS:                  false,
+					SQLMaxOpenConns:           100,
+					SQLMaxIdleConns:           10,
+					SQLLogLevel:               3,
+					SQLConnMaxLifetime:        0,
+					SQLDSNParams:              map[string]string{},
+					PgSSLMode:                 "disable",
+					MySQLLocation:             "Local",
+				},
 			},
 			utils.MetaDefault: &config.DBConn{
-				Type:     utils.MetaRedis,
-				Host:     "localhost",
-				Port:     "2012",
-				Name:     "100",
-				User:     "cgrates2",
-				Password: "toor",
+				Type:                utils.MetaRedis,
+				Host:                "localhost",
+				Port:                "2012",
+				Name:                "100",
+				User:                "cgrates2",
+				StringIndexedFields: []string{},
+				PrefixIndexedFields: []string{},
+				RmtConns:            []string{},
+				RplConns:            []string{},
+				Password:            "toor",
 				Opts: &config.DBOpts{
 					InternalDBDumpPath:        "/var/lib/cgrates/internal_db/db",
 					InternalDBBackupPath:      "/var/lib/cgrates/internal_db/backup/db",
@@ -111,7 +143,7 @@ func TestLoadConfig(t *testing.T) {
 	ldrCfg := loadConfig()
 	ldrCfg.DbCfg().Items = nil
 	if !reflect.DeepEqual(ldrCfg.DbCfg(), expDBcfg) {
-		t.Errorf("Expected %s received %s", utils.ToJSON(expDBcfg), utils.ToJSON(ldrCfg.DbCfg()))
+		t.Errorf("Expected %s \nreceived %s", utils.ToJSON(expDBcfg), utils.ToJSON(ldrCfg.DbCfg()))
 	}
 	if ldrCfg.GeneralCfg().DBDataEncoding != utils.MetaJSON {
 		t.Errorf("Expected %s received %s", utils.MetaJSON, ldrCfg.GeneralCfg().DBDataEncoding)

config/config.go

@@ -46,8 +46,9 @@ var (
 	}
 	getDftRemHstCfg = func() *RemoteHost { return new(RemoteHost) }
 
-	getDftEvExpCfg = func() *EventExporterCfg { return &EventExporterCfg{Opts: &EventExporterOpts{}} }
-	getDftEvRdrCfg = func() *EventReaderCfg { return &EventReaderCfg{Opts: &EventReaderOpts{}} }
+	getDftEvExpCfg  = func() *EventExporterCfg { return &EventExporterCfg{Opts: &EventExporterOpts{}} }
+	getDftEvRdrCfg  = func() *EventReaderCfg { return &EventReaderCfg{Opts: &EventReaderOpts{}} }
+	getDftDBConnCfg = func() *DBConn { return &DBConn{} }
 )
 
 func init() {
@@ -68,6 +69,13 @@ func init() {
 		}
 	}
 
+	for id, dbconnCfg := range cgrCfg.dbCfg.DBConns {
+		if id == utils.MetaDefault {
+			getDftDBConnCfg = dbconnCfg.Clone
+			break
+		}
+	}
+
 	getDftFsConnCfg = cgrCfg.fsAgentCfg.EventSocketConns[0].Clone // We leave it crashing here on purpose if no Connection defaults defined
 	getDftKamConnCfg = cgrCfg.kamAgentCfg.EvapiConns[0].Clone
 	getDftAstConnCfg = cgrCfg.asteriskAgentCfg.AsteriskConns[0].Clone

config/datadbcfg.go

@@ -362,9 +362,7 @@ func (dbcfg *DbCfg) loadFromJSONCfg(jsnDbCfg *DbJsonCfg) (err error) {
 		}
 		for kJsn, vJsn := range jsnDbCfg.Db_conns {
 			if _, exists := dbcfg.DBConns[kJsn]; !exists {
-				dbcfg.DBConns[kJsn] = &DBConn{
-					Opts: &DBOpts{},
-				}
+				dbcfg.DBConns[kJsn] = getDftDBConnCfg()
 			}
 			if err = dbcfg.DBConns[kJsn].loadFromJSONCfg(vJsn); err != nil {
 				return err

data/conf/samples/acc_generaltest_internal/cgrates.json

@@ -21,12 +21,12 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
+			"db_type": "*internal",
+				"opts":{
+				"internalDBRewriteInterval": "0s",
+				"internalDBDumpInterval": "0s"
+		}
 		}
-	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
 	}
 },
 

data/conf/samples/actions_internal/cgradmin.json

@@ -23,12 +23,12 @@
 	"db_conns": {
 		"*default": {
 			"db_type": "*internal",	
-		},
-	},
-	"opts":{
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+		},
+	}
 },
 
 

data/conf/samples/actions_internal_gob/cgradmin.json

@@ -31,12 +31,12 @@
 	"db_conns": {
 		"*default": {
 			"db_type": "*internal",	
-		},
-	},
-	"opts":{
+			"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+		},
+	},
 },
 
 "cdrs": {

data/conf/samples/apis_actions_internal/cgrates.json

@@ -10,11 +10,11 @@
       "db_conns": {
 		    "*default": {
          "db_type": "*internal",
-	      },
-	    },
-      "opts":{
-		    "internalDBRewriteInterval": "0s",
-		    "internalDBDumpInterval": "0s"
+         "opts":{
+		      "internalDBRewriteInterval": "0s",
+		      "internalDBDumpInterval": "0s"
+	      }
+	      }
 	    }
     },
   

data/conf/samples/apis_chargers_internal/cgrates.json

@@ -13,13 +13,13 @@
 	"db": {
 		"db_conns": {
 			"*default": {
-				"db_type": "*internal"
+				"db_type": "*internal",
+				"opts":{
+					"internalDBRewriteInterval": "0s",
+					"internalDBDumpInterval": "0s"
+		}
 			},
 		},
-		"opts":{
-			"internalDBRewriteInterval": "0s",
-			"internalDBDumpInterval": "0s"
-		}
 	},
 
 	"attributes": {

data/conf/samples/apis_config_internal/cgrates.json

@@ -21,13 +21,13 @@
 "db": {								// database used to store runtime data (eg: accounts, cdr stats)
 "db_conns": {
 		"*default": {
-      "db_type": "*internal",					
-	  },
-	},
-  "opts":{
+      "db_type": "*internal",		
+      "opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
-	}
+	}			
+	  },
+	},
 },
 
 "cdrs": {

data/conf/samples/apis_loaders_internal/cgrates.json

@@ -10,11 +10,11 @@
     "db_conns": {
 		"*default": {
             "db_type": "*internal",
+               "opts":{
+		    "internalDBRewriteInterval": "0s",
+	    	"internalDBDumpInterval": "0s"
+	    }
 	    },
-	},
-    "opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
 	}
 },
 

data/conf/samples/apis_srvmng_internal/cgrates.json

@@ -17,13 +17,13 @@
 "db": {
     "db_conns": {
 		"*default": {
-            "db_type": "*internal"
-	    },
-	},
-    "opts":{
+            "db_type": "*internal",
+              "opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+	    },
+	}
 },
 
 }

data/conf/samples/attr_test_internal/cgrates.json

@@ -21,12 +21,12 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
+			"db_type": "*internal",
+			"opts":{
+			"internalDBRewriteInterval": "0s",
+			"internalDBDumpInterval": "0s"
+		}
 		},
-	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
 	}
 },
 

data/conf/samples/attributes_internal/cgrates.json

@@ -3,12 +3,12 @@
 "db": {
   "db_conns": {
 		"*default": {
-      "db_type": "*internal"
+      "db_type": "*internal",
+        "opts":{
+		    "internalDBRewriteInterval": "0s",
+		    "internalDBDumpInterval": "0s"
+	  }
 	  },
-	},
-  "opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
 	}
 },
 

data/conf/samples/cdrsv1processevent/cgrates.json

@@ -15,13 +15,13 @@
 "db":{
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-		},
-	},
-	"opts":{
+			"db_type": "*internal",
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+		},
+	}
 },
 
 

data/conf/samples/cdrsv2internal/cgrates.json

@@ -9,12 +9,12 @@
 		"*default": {
 			"db_type": "*internal",
 			"string_indexed_fields": ["RunID"],
-		},
-	},
-	"opts":{
+			"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+		},
+	}
 },
 
 "rates": {

data/conf/samples/cdrsv_failover_internal/cgrates.json

@@ -11,13 +11,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-		},
-	},
-	"opts":{
+			"db_type": "*internal",
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+		},
+	}
 },
 
 "rates": {

data/conf/samples/cfg_rld_rates_internal/cgrates.json

@@ -17,13 +17,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-		},
-	},
-	"opts":{
+			"db_type": "*internal",
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+		},
+	}
 },
 
 }

data/conf/samples/core_config/cgrates.json

@@ -11,13 +11,13 @@
 "db": {
   "db_conns": {
 		"*default": {
-      "db_type": "*internal"
-	  },
-	},
-  "opts":{
+      "db_type": "*internal",
+	    "opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+	  },
+	}
 },
 
 "admins": {

data/conf/samples/dataconverter_internal/cgrates.json

@@ -7,13 +7,13 @@
 "db": {
     "db_conns": {
 		"*default": {
-            "db_type": "*internal"
-	    },
-	},
-    "opts":{
+            "db_type": "*internal",
+               "opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+	    },
+	}
 },
 
 "attributes": {

data/conf/samples/diamagent_internal_empty_apps/cgrates.json

@@ -21,13 +21,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-		},
-	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
+			"db_type": "*internal",
+			"opts":{
+				"internalDBRewriteInterval": "0",
+				"internalDBDumpInterval": "0"
 	}
+		}
+	},
 },
 
 "cdrs": {

data/conf/samples/diamagent_internal_gobbirpc/cgrates.json

@@ -28,12 +28,12 @@
 	"db_conns": {
 		"*default": {
 			"db_type": "*internal",	
-		},
-	},
-	"opts":{
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+		},
+	}
 },
 
 

data/conf/samples/diamagent_internal_jsonbirpc/cgrates.json

@@ -28,12 +28,12 @@
 	"db_conns": {
 		"*default": {
 			"db_type": "*internal",	
-		},
-	},
-	"opts":{
+			"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+		},
+	},
 },
 
 "cdrs": {

data/conf/samples/diamagent_internal_supp_apps/cgrates.json

@@ -21,13 +21,12 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-		},
-	},
-	"opts":{
+			"db_type": "*internal",
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+	}
 },
 
 "cdrs": {

data/conf/samples/diamsctpagent_internal/cgrates.json

@@ -22,12 +22,12 @@
 	"db_conns": {
 		"*default": {
 			"db_type": "*internal",	
-		},
-	},
-	"opts":{
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+		},
+	}
 },
 
 "rates": {

data/conf/samples/dnsagent_internal/cgrates.json

@@ -7,13 +7,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-		},
-	},
-	"opts":{
+			"db_type": "*internal",
+			"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+		},
+	}
 },
 
 "schedulers": {

data/conf/samples/ees_blocker_internal/cgrates.json

@@ -13,13 +13,13 @@
 "db": {
     "db_conns": {
 		"*default": {
-            "db_type": "*internal"
-	    },
-	},
-	"opts":{
+            "db_type": "*internal",
+            "opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+	    },
+	}
 },
 
 "ees": {

data/conf/samples/ees_cloud/cgrates.json

@@ -12,13 +12,13 @@
 "db": {
     "db_conns": {
 		"*default": {
-            "db_type": "*internal"
-	    },
-	},
-	"opts":{
+            "db_type": "*internal",
+            "opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+	    },
+	}
 },
 
 "ees": {

data/conf/samples/ees_elastic/cgrates.json

@@ -3,12 +3,12 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
+			"db_type": "*internal",
+				"opts":{
+					"internalDBRewriteInterval": "0s",
+					"internalDBDumpInterval": "0s"
+			}
     	}
-	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
 	}
 },
 

data/conf/samples/ees_internal/cgrates.json

@@ -18,12 +18,12 @@
 	"db_conns": {
 		"*default": {
 			"db_type": "*internal",
-		},
-	},
-	"opts":{
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+		},
+	}
 },
 
 "rates": {

data/conf/samples/efs/efs_internal/cgrates.json

@@ -13,13 +13,13 @@
     "db": {
         "db_conns": {
 		    "*default": {
-                "db_type": "*internal"
-	        },
-	    },
-        "opts":{
+                "db_type": "*internal",
+                   "opts":{
 		    "internalDBRewriteInterval": "0s",
 		    "internalDBDumpInterval": "0s"
 	    }
+	        },
+	    }
     },
 
     "efs": {

data/conf/samples/ers_internal/cgrates.json

@@ -18,12 +18,12 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
+			"db_type": "*internal",
+				"opts":{
+			"internalDBRewriteInterval": "0s",
+			"internalDBDumpInterval": "0s"
+		}
 		},
-	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
 	}
 },
 

data/conf/samples/ers_mysql_delete_indexed_fields/cgrates.json

@@ -12,13 +12,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+			"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 "sessions": {

data/conf/samples/ers_mysql_filters/cgrates.json

@@ -12,13 +12,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 "sessions": {

data/conf/samples/ers_mysql_meta_delete/cgrates.json

@@ -12,13 +12,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+			"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 "sessions": {

data/conf/samples/ers_mysql_move/cgrates.json

@@ -12,15 +12,14 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+			"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
 },
-
+    	}
+	},
 "sessions": {
 	"enabled": true,
 },

data/conf/samples/ers_mysql_raw_update/cgrates.json

@@ -12,13 +12,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+			"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 "sessions": {

data/conf/samples/ers_mysql_update/cgrates.json

@@ -12,13 +12,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+			"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 "sessions": {

data/conf/samples/ers_nats/cgrates.json

@@ -2,13 +2,13 @@
 "db": {
     "db_conns": {
 		"*default": {
-            "db_type": "*internal"
+            "db_type": "*internal",
+            "opts":{
+		    "internalDBRewriteInterval": "0s",
+		    "internalDBDumpInterval": "0s"
+	    }
     	},
 	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
-	}
 },
 
 "ees": {

data/conf/samples/ers_reload/disabled_internal/cgrates.json

@@ -20,12 +20,12 @@
 	"db_conns": {
 		"*default": {
 			"db_type": "*internal",	
+				"opts":{
+			"internalDBRewriteInterval": "0s",
+			"internalDBDumpInterval": "0s"
+		}
 		},
 	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
-	}
 },
 
 "rates": {

data/conf/samples/export_it_test_internal/cgrates.json

@@ -21,13 +21,13 @@
     "db": {
         "db_conns": {
 	    	"*default": {
-                "db_type": "*internal"
-	        },
-	    },
-    	"opts":{
+                "db_type": "*internal",
+                	"opts":{
 		    "internalDBRewriteInterval": "0s",
 		    "internalDBDumpInterval": "0s"
 	    }
+	        },
+	    }
     },
     
     "cdrs": {

data/conf/samples/filter_indexes_internal/cgrates.json

@@ -10,11 +10,11 @@
     "db_conns": {
 		  "*default": {
         "db_type": "*internal",
+         	"opts":{
+		        "internalDBRewriteInterval": "0s",
+		        "internalDBDumpInterval": "0s"
+	    }
 	    },
-	  },
-  	"opts":{
-		  "internalDBRewriteInterval": "0s",
-		  "internalDBDumpInterval": "0s"
 	  }
   },
 

data/conf/samples/filtered_replication/internal/cgrates.json

@@ -30,6 +30,10 @@
 			"db_type": "*internal",
 			"replication_conns": ["conn2"],
 			"replication_filtered": true,
+			"opts":{
+				"internalDBRewriteInterval": "0s",
+				"internalDBDumpInterval": "0s"
+		}
 		},
 	},
 	"items":{
@@ -48,10 +52,6 @@
 		"*load_ids":{"remote":false,"replicate":true},
 		"*action_profiles":{"remote":false,"replicate":true},
 	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
-	}
 },
 
 

data/conf/samples/filters_internal/cgrates.json

@@ -18,13 +18,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-		},
-	},
-	"opts":{
+			"db_type": "*internal",
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+		},
+	}
 },
 
 "rates": {

data/conf/samples/fltr_sep_internal/cgrates.json

@@ -7,12 +7,12 @@
 "db": {
     "db_conns": {
 		"*default": {
-            "db_type": "*internal"
-	    },
-	},
-    "opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
+            "db_type": "*internal",
+                "opts":{
+		        "internalDBRewriteInterval": "0s",
+	        	"internalDBDumpInterval": "0s"
+            	}
+	    }
 	}
 },
 

data/conf/samples/gocs/au_site/cgrates.json

@@ -36,6 +36,10 @@
 		  "*default": {
         "db_type": "*internal",
         "remote_conns": ["rmtConn"],
+        "opts":{
+		      "internalDBRewriteInterval": "0s",
+		       "internalDBDumpInterval": "0s"
+	    }
 	    },
       "StorDB": {						
 			  "db_type": "mysql",			 
@@ -54,11 +58,7 @@
       "*charger_profiles": {"remote":true, "dbConn": "*default"},
       "*load_ids":{"remote":true, "dbConn": "*default"},
       "*cdrs": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false, "dbConn": "StorDB"}
-    },
-   	"opts":{
-		  "internalDBRewriteInterval": "0s",
-		  "internalDBDumpInterval": "0s"
-	  }
+    }
   },
 
   "rates": {

data/conf/samples/httpagent_internal/cgrates.json

@@ -22,15 +22,15 @@
 			"db_name": "10" 	
 		},
 		"StorDB": {						
-			"db_type": "internal"
+			"db_type": "internal",
+				"opts":{
+		"internalDBRewriteInterval": "0s",
+		"internalDBDumpInterval": "0s"
+	}
 		}
 	},
 	"items": {
 		"*cdrs": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false, "dbConn": "StorDB"}
-	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
 	}
 },
 

data/conf/samples/httpagenttls_internal/cgrates.json

@@ -33,15 +33,15 @@
 			"db_name": "10" 	
 		},
 		"StorDB": {						
-			"db_type": "internal"
+			"db_type": "internal",
+				"opts":{
+		"internalDBRewriteInterval": "0s",
+		"internalDBDumpInterval": "0s"
+	}
 		}
 	},
 	"items": {
 		"*cdrs": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false, "dbConn": "StorDB"}
-	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
 	}
 },
 

data/conf/samples/internal_broadcast_replication/cgrates.json

@@ -33,12 +33,12 @@
 	"db_conns": {
 		"*default": {
 			"db_type": "*internal",	
-		},
-	},
-	"opts":{
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+		},
+	}
 },
 
 "rates": {

data/conf/samples/janus_agent/cgrates.json

@@ -20,13 +20,13 @@
     "db": {
         "db_conns": {
 		    "*default": {
-                "db_type": "*internal"
-	        },
-	    },
-        "opts":{
+                "db_type": "*internal",
+                   "opts":{
             "internalDBRewriteInterval": "0s",
             "internalDBDumpInterval": "0s"
         }
+	        },
+	    }
     },
     
     "cdrs": {

data/conf/samples/loaders/tutinternal/cgrates.json

@@ -22,11 +22,11 @@
 	"db_conns": {
 		"*default": {
 			"db_type": "*internal",
+			"opts":{
+			"internalDBRewriteInterval": "0s",
+			"internalDBDumpInterval": "0s"
+		},
 		},
-	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
 	},
 },
 

data/conf/samples/loaders_indexes_internal_db/cgrates.json

@@ -26,6 +26,10 @@
             "db_type": "*internal",
             "remote_conns": ["engine"],
             "replication_conns": ["engine"],
+            "opts":{
+	        	"internalDBRewriteInterval": "0s",
+		        "internalDBDumpInterval": "0s"
+	        }
 	    },
 	},
     "items":{
@@ -57,11 +61,7 @@
 		"*rate_filter_indexes" : {"replicate": true},
 		"*action_profile_filter_indexes" : {"replicate": true},
 		"*account_filter_indexes" : {"replicate": true}
-    },
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
-	}
+    }
 },
 
 

data/conf/samples/loaders_old2new_internal/cgrates.json

@@ -10,13 +10,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 "loaders": [

data/conf/samples/multiple_dbs/cgrates.json

@@ -20,10 +20,14 @@
 		"*default": {
 			"db_type": "*redis",		
 			"db_port": 6379, 	
-			"db_name": "10"
+			"db_name": "10",
 		},
 		"intrnl": {
-			"db_type": "*internal"
+			"db_type": "*internal",
+			"opts": {
+				"internalDBDumpPath": "/tmp/internal_db/db",
+				"internalDBRewriteInterval": "0s"
+			}
 		},
 		"redis2": {
 			"db_type": "*redis",		
@@ -43,10 +47,6 @@
 		"*charger_profiles": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false, "dbConn": "redis2"},
 		"*charger_filter_indexes" : {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate": false, "dbConn": "intrnl"},
 		"*cdrs": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false, "dbConn": "StorDB"}
-	},
-	"opts": {
-		"internalDBDumpPath": "/tmp/internal_db/db",
-		"internalDBRewriteInterval": "0s"
 	}
 },
 

data/conf/samples/multiple_dbs_mongo/cgrates.json

@@ -23,7 +23,11 @@
 			"db_name": "10"
 		},
 		"internalDBConn": {
-			"db_type": "*internal"
+			"db_type": "*internal",
+	     	"opts": {
+		      "internalDBDumpPath": "/tmp/internal_db/db",
+		    	"internalDBRewriteInterval": "0s"
+	}
 		},
 		"mongoDBConn": {
 			"db_type": "mongo",
@@ -37,10 +41,6 @@
 		"*charger_profiles": {"dbConn": "mongoDBConn"},
 		"*charger_filter_indexes" : {"dbConn": "internalDBConn"},
 		"*cdrs": {"dbConn": "mongoDBConn"}
-	},
-	"opts": {
-		"internalDBDumpPath": "/tmp/internal_db/db",
-		"internalDBRewriteInterval": "0s"
 	}
 },
 

data/conf/samples/multiral1_internal/cgrates.json

@@ -18,12 +18,13 @@
 	"db_conns": {
 		"*default": {
 			"db_type": "*internal",	
+				"opts":{
+			"internalDBRewriteInterval": "0s",
+			"internalDBDumpInterval": "0s"
+		}
 		},
 	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
-	}
+
 },
 
 

data/conf/samples/multiral2_internal/cgrates.json

@@ -17,13 +17,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 "rates": {

data/conf/samples/offline_internal/cgrates.json

@@ -9,17 +9,17 @@
 	"db": {
 		"db_conns": {
 			"*default": {
-				"db_type": "*internal"
+				"db_type": "*internal",
+					"opts": {
+				"internalDBStartTimeout": "1m",
+				"internalDBDumpInterval": "-1",
+				"internalDBRewriteInterval": "0s"
+			}
 			}
 		},
 		"items": {
 			"*charger_profiles": 
             {"limit": -1,"ttl": "1s","static_ttl": false,"remote": false,"replicate": false}
-		},
-		"opts": {
-			"internalDBStartTimeout": "1m",
-			"internalDBDumpInterval": "-1",
-			"internalDBRewriteInterval": "0s"
 		}
 	},
 	"config_db": {

data/conf/samples/offline_internal_limit/cgrates.json

@@ -9,17 +9,17 @@
     "db": {
 		"db_conns": {
 			"*default": {
-				"db_type": "*internal"
+				"db_type": "*internal",
+				   "opts":{
+            		"internalDBStartTimeout": "1m",
+            		"internalDBDumpInterval": "-1",
+            		"internalDBFileSizeLimit": "4KB",
+					"internalDBRewriteInterval": "0s"
+        	}
 			}
 		},
         "items":{
             "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false}
-        },
-        "opts":{
-            "internalDBStartTimeout": "1m",
-            "internalDBDumpInterval": "-1",
-            "internalDBFileSizeLimit": "4KB",
-			"internalDBRewriteInterval": "0s"
         }
     },
 	"config_db": {

data/conf/samples/offline_internal_ms/cgrates.json

@@ -9,16 +9,16 @@
     "db": {
 		"db_conns": {
 			"*default": {
-				"db_type": "*internal"
+				"db_type": "*internal",
+				 "opts":{
+            	"internalDBStartTimeout": "1m",
+            	"internalDBDumpInterval": "500ms",
+				"internalDBRewriteInterval": "0s"
+        	}
 			}
 		},
         "items":{
             "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false}
-        },
-        "opts":{
-            "internalDBStartTimeout": "1m",
-            "internalDBDumpInterval": "500ms",
-			"internalDBRewriteInterval": "0s"
         }
     },
 	"config_db": {

data/conf/samples/offline_internal_ms_limit/cgrates.json

@@ -9,17 +9,17 @@
     "db": {
 		"db_conns": {
 			"*default": {
-				"db_type": "*internal"
+				"db_type": "*internal",
+				  "opts":{
+            	"internalDBStartTimeout": "1m",
+            	"internalDBDumpInterval": "500ms",
+            	"internalDBFileSizeLimit": "4KB",
+				"internalDBRewriteInterval": "0s"
+        	}
 			}
 		},
         "items":{
             "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false}
-        },
-        "opts":{
-            "internalDBStartTimeout": "1m",
-            "internalDBDumpInterval": "500ms",
-            "internalDBFileSizeLimit": "4KB",
-			"internalDBRewriteInterval": "0s"
         }
     },
 	"config_db": {

data/conf/samples/offline_internal_ms_rewrite/cgrates.json

@@ -9,16 +9,16 @@
     "db": {
 		"db_conns": {
 			"*default": {
-				"db_type": "*internal"
+				"db_type": "*internal",
+				   "opts":{
+            	"internalDBStartTimeout": "1m",
+            	"internalDBDumpInterval": "500ms",
+            	"internalDBRewriteInterval": "-1"
+        	}
 			}
 		},
         "items":{
             "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false}
-        },
-        "opts":{
-            "internalDBStartTimeout": "1m",
-            "internalDBDumpInterval": "500ms",
-            "internalDBRewriteInterval": "-1"
         }
     },
 	"config_db": {

data/conf/samples/offline_internal_ms_rewrite_limit/cgrates.json

@@ -9,16 +9,16 @@
     "db": {
 		"db_conns": {
 			"*default": {
-				"db_type": "*internal"
+				"db_type": "*internal",
+				     "opts":{
+            	"internalDBDumpInterval": "500ms",
+            	"internalDBRewriteInterval": "-1",
+            	"internalDBFileSizeLimit": "4KB"	
+        	}
 			}
 		},
         "items":{
             "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false}
-        },
-        "opts":{
-            "internalDBDumpInterval": "500ms",
-            "internalDBRewriteInterval": "-1",
-            "internalDBFileSizeLimit": "4KB"	
         }
     },
 	"config_db": {

data/conf/samples/offline_internal_ms_rewrite_ms/cgrates.json

@@ -9,16 +9,16 @@
     "db": {
 		"db_conns": {
 			"*default": {
-				"db_type": "*internal"
+				"db_type": "*internal",
+				 "opts":{
+           		 "internalDBStartTimeout": "1m",
+            	"internalDBDumpInterval": "500ms",
+        	    "internalDBRewriteInterval": "500ms"
+       	 }
 			}
 		},
         "items":{
             "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false}
-        },
-        "opts":{
-            "internalDBStartTimeout": "1m",
-            "internalDBDumpInterval": "500ms",
-            "internalDBRewriteInterval": "500ms"
         }
     },
 	"config_db": {

data/conf/samples/offline_internal_ms_rewrite_ms_limit/cgrates.json

@@ -9,16 +9,16 @@
     "db": {
 		"db_conns": {
 			"*default": {
-				"db_type": "*internal"
+				"db_type": "*internal",
+				  "opts":{
+           	 "internalDBDumpInterval": "500ms",
+            	"internalDBRewriteInterval": "500ms",
+        	    "internalDBFileSizeLimit": "4k"	
+        }
 			}
 		},
         "items":{
             "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false}
-        },
-        "opts":{
-            "internalDBDumpInterval": "500ms",
-            "internalDBRewriteInterval": "500ms",
-            "internalDBFileSizeLimit": "4k"	
         }
     },
 	"config_db": {

data/conf/samples/offline_internal_rewrite/cgrates.json

@@ -9,16 +9,16 @@
     "db": {
 		"db_conns": {
 			"*default": {
-				"db_type": "*internal"
+				"db_type": "*internal",
+				      "opts":{
+            	"internalDBStartTimeout": "1m",
+            	"internalDBDumpInterval": "-1",
+         	   "internalDBRewriteInterval": "-1"
+        }
 			}
 		},
         "items":{
             "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false}
-        },
-        "opts":{
-            "internalDBStartTimeout": "1m",
-            "internalDBDumpInterval": "-1",
-            "internalDBRewriteInterval": "-1"
         }
     },
 	"config_db": {

data/conf/samples/offline_internal_rewrite_limit/cgrates.json

@@ -9,17 +9,17 @@
     "db": {
 		"db_conns": {
 			"*default": {
-				"db_type": "*internal"
+				"db_type": "*internal",
+				   "opts":{
+            	"internalDBStartTimeout": "1m",
+            	"internalDBDumpInterval": "-1",
+            	"internalDBRewriteInterval": "-1",
+         	   "internalDBFileSizeLimit": "4K"	
+        }
 			}
 		},
         "items":{
             "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false}
-        },
-        "opts":{
-            "internalDBStartTimeout": "1m",
-            "internalDBDumpInterval": "-1",
-            "internalDBRewriteInterval": "-1",
-            "internalDBFileSizeLimit": "4K"	
         }
     },
 	"config_db": {

data/conf/samples/offline_internal_rewrite_ms/cgrates.json

@@ -9,16 +9,16 @@
     "db": {
 		"db_conns": {
 			"*default": {
-				"db_type": "*internal"
+				"db_type": "*internal",
+				 "opts":{
+            	"internalDBStartTimeout": "1m",
+            	"internalDBDumpInterval": "-1",
+        	    "internalDBRewriteInterval": "500ms"
+        }
 			}
 		},
         "items":{
             "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false}
-        },
-        "opts":{
-            "internalDBStartTimeout": "1m",
-            "internalDBDumpInterval": "-1",
-            "internalDBRewriteInterval": "500ms"
         }
     },
 	"config_db": {

data/conf/samples/offline_internal_rewrite_ms_limit/cgrates.json

@@ -9,17 +9,17 @@
     "db": {
 		"db_conns": {
 			"*default": {
-				"db_type": "*internal"
+				"db_type": "*internal",
+				   "opts":{
+            	"internalDBStartTimeout": "1m",
+            	"internalDBDumpInterval": "-1",
+            	"internalDBRewriteInterval": "500ms",
+         	   "internalDBFileSizeLimit": "4KB"
+        }
 			}
 		},
         "items":{
             "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false}
-        },
-        "opts":{
-            "internalDBStartTimeout": "1m",
-            "internalDBDumpInterval": "-1",
-            "internalDBRewriteInterval": "500ms",
-            "internalDBFileSizeLimit": "4KB"
         }
     },
 	"config_db": {

data/conf/samples/preload_internal/cgrates.json

@@ -9,12 +9,12 @@
   "db": {
     "db_conns": {
       "*default": {
-        "db_type": "*internal"
+        "db_type": "*internal",
+         "opts":{
+          "internalDBRewriteInterval": "0s",
+          "internalDBDumpInterval": "0s"
+    }
         }
-    },
-    "opts":{
-      "internalDBRewriteInterval": "0s",
-      "internalDBDumpInterval": "0s"
     }
   },
   

data/conf/samples/radagent_internal/cgrates.json

@@ -16,13 +16,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 "rals": {

data/conf/samples/radagent_internal_gob/cgrates.json

@@ -26,12 +26,12 @@
 	"db_conns": {
 		"*default": {
 			"db_type": "*internal",	
-		},
-	},
-	"opts":{
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+		},
+	}
 },
 
 

data/conf/samples/radius_ipam/cgrates.json

@@ -37,12 +37,12 @@
   "db": {
     "db_conns": {
       "*default": {
-        "db_type": "*internal"
-        }
-    },
-    "opts":{
+        "db_type": "*internal",
+            "opts":{
       "internalDBRewriteInterval": "0s",
       "internalDBDumpInterval": "0s"
+    }
+        }
     }
   },
   "admins": {

data/conf/samples/radius_status/cgrates.json

@@ -15,13 +15,13 @@
     "db": {
         "db_conns": {
             "*default": {
-                "db_type": "*internal"
-            }
-        },
-        "opts":{
+                "db_type": "*internal",
+                  "opts":{
             "internalDBRewriteInterval": "0s",
             "internalDBDumpInterval": "0s"
         }
+            }
+        }
     },
     
     "rals": {

data/conf/samples/rankings_internal/cgrates.json

@@ -17,13 +17,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-		},
-	},
-	"opts":{
+			"db_type": "*internal",
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+		},
+	}
 },
 
 

data/conf/samples/rates_internal/cgrates.json

@@ -3,13 +3,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 "rates": {

data/conf/samples/resources_internal/cgrates.json

@@ -7,13 +7,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+			"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 "actions": {

data/conf/samples/routes_cases_internal/cgrates.json

@@ -14,13 +14,13 @@
     "db": {
         "db_conns": {
             "*default": {
-                "db_type": "*internal"
-            }
-        },
-        "opts":{
+                "db_type": "*internal",
+                       "opts":{
             "internalDBRewriteInterval": "0s",
             "internalDBDumpInterval": "0s"
         }
+            }
+        }
     },
         
     "attributes": {

data/conf/samples/routes_generaltests_internal/cgrates.json

@@ -17,13 +17,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+            	"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 "resources": {

data/conf/samples/routes_internal/cgrates.json

@@ -17,12 +17,12 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
+			"db_type": "*internal",
+			"opts":{
+				"internalDBRewriteInterval": "0s",
+				"internalDBDumpInterval": "0s"
+		}
    		}
-	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
 	}
 },
 

data/conf/samples/sessinternal/cgrates.json

@@ -14,13 +14,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 "rates": {

data/conf/samples/session_volume_discount_internal/cgrates.json

@@ -14,13 +14,13 @@
     "db": {
         "db_conns": {
             "*default": {
-                "db_type": "*internal"
-            }
-        },
-        "opts":{
+                "db_type": "*internal",
+                       "opts":{
             "internalDBRewriteInterval": "0s",
             "internalDBDumpInterval": "0s"
         }
+            }
+        }
     },
         
     "sessions": {

data/conf/samples/sessions_internal/cgrates.json

@@ -21,12 +21,12 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
+			"db_type": "*internal",
+			"opts":{
+				"internalDBRewriteInterval": "0s",
+				"internalDBDumpInterval": "0s"
+		}
     	}
-	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
 	}
 },
 

data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_internal/cgrates.json

@@ -17,13 +17,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 

data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_internal/cgrates.json

@@ -24,13 +24,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 

data/conf/samples/sipagent_internal/cgrates.json

@@ -22,13 +22,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 "sessions": {

data/conf/samples/smg_automatic_debits_internal/cgrates.json

@@ -10,13 +10,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 "rates": {

data/conf/samples/stats_internal/cgrates.json

@@ -9,12 +9,12 @@
     "db": {
       "db_conns": {
         "*default": {
-          "db_type": "*internal"
-          }
-      },
-      "opts":{
+          "db_type": "*internal",
+                "opts":{
         "internalDBRewriteInterval": "0s",
         "internalDBDumpInterval": "0s"
+      }
+          }
       }
     },
   

data/conf/samples/thresholds_internal/cgrates.json

@@ -9,12 +9,12 @@
     "db": {
       "db_conns": {
         "*default": {
-          "db_type": "*internal"
-          }
-      },
-      "opts":{
+          "db_type": "*internal",
+                "opts":{
         "internalDBRewriteInterval": "0s",
         "internalDBDumpInterval": "0s"
+      }
+          }
       }
     },
   

data/conf/samples/tp_internal/cgrates.json

@@ -21,12 +21,12 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
+			"db_type": "*internal",
+				"opts":{
+			"internalDBRewriteInterval": "0s",
+			"internalDBDumpInterval": "0s"
+		}
     	}
-	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
 	}
 },
 

data/conf/samples/tpe_internal/cgrates.json

@@ -14,13 +14,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+			"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 "sessions": {

data/conf/samples/tut_session_internal/cgrates.json

@@ -21,13 +21,13 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
-    	}
-	},
-	"opts":{
+			"db_type": "*internal",
+				"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 "rals": {

data/conf/samples/tutinternal/cgrates.json

@@ -31,12 +31,12 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
+			"db_type": "*internal",
+			"opts":{
+					"internalDBRewriteInterval": "0s",
+					"internalDBDumpInterval": "0s"
+			}
     	}
-	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
 	}
 },
 

data/conf/samples/tutinternal_gob/cgrates.json

@@ -29,12 +29,12 @@
 	"db_conns": {
 		"*default": {
 			"db_type": "*internal",	
-    	}
-	},
-	"opts":{
+			"opts":{
 		"internalDBRewriteInterval": "0s",
 		"internalDBDumpInterval": "0s"
 	}
+    	}
+	}
 },
 
 

data/conf/samples/tutinternal_new/cgrates.json

@@ -18,12 +18,11 @@
 "db": {
 	"db_conns": {
 		"*default": {
-			"db_type": "*internal"
+			"db_type": "*internal",	"opts":{
+			"internalDBRewriteInterval": "0s",
+			"internalDBDumpInterval": "0s"
+		}
     	}
-	},
-	"opts":{
-		"internalDBRewriteInterval": "0s",
-		"internalDBDumpInterval": "0s"
 	}
 },