Rename default_opts to opts

config/attributescfg.go

@@ -69,8 +69,8 @@ func (alS *AttributeSCfg) loadFromJSONCfg(jsnCfg *AttributeSJsonCfg) (err error)
 	if jsnCfg.Nested_fields != nil {
 		alS.NestedFields = *jsnCfg.Nested_fields
 	}
-	if jsnCfg.Default_opts != nil {
-		alS.DefaultOpts = jsnCfg.Default_opts
+	if jsnCfg.Opts != nil {
+		alS.DefaultOpts = jsnCfg.Opts
 	}
 	return
 }
@@ -82,7 +82,7 @@ func (alS *AttributeSCfg) AsMapInterface() (initialMP map[string]interface{}) {
 		utils.IndexedSelectsCfg: alS.IndexedSelects,
 		utils.ProfileRunsCfg:    alS.ProfileRuns,
 		utils.NestedFieldsCfg:   alS.NestedFields,
-		utils.DefaultOptsCfg:    alS.DefaultOpts,
+		utils.OptsCfg:           alS.DefaultOpts,
 	}
 	if alS.StringIndexedFields != nil {
 		initialMP[utils.StringIndexedFieldsCfg] = utils.CloneStringSlice(*alS.StringIndexedFields)
@@ -148,8 +148,12 @@ type AttributeSJsonCfg struct {
 	Prefix_indexed_fields *[]string
 	Suffix_indexed_fields *[]string
 	Nested_fields         *bool // applies when indexed fields is not defined
+<<<<<<< HEAD
 	Default_opts          map[string]interface{}
 	Profile_runs          *int
+=======
+	Opts                  map[string]interface{}
+>>>>>>> 3df2de22e (Rename default_opts to opts)
 }
 
 func diffAttributeSJsonCfg(d *AttributeSJsonCfg, v1, v2 *AttributeSCfg) *AttributeSJsonCfg {
@@ -177,7 +181,7 @@ func diffAttributeSJsonCfg(d *AttributeSJsonCfg, v1, v2 *AttributeSCfg) *Attribu
 	if v1.NestedFields != v2.NestedFields {
 		d.Nested_fields = utils.BoolPointer(v2.NestedFields)
 	}
-	d.Default_opts = diffMap(d.Default_opts, v1.DefaultOpts, v2.DefaultOpts)
+	d.Opts = diffMap(d.Opts, v1.DefaultOpts, v2.DefaultOpts)
 	return d
 }
 

config/attributescfg_test.go

@@ -67,7 +67,7 @@ func TestAttributeSCfgAsMapInterface(t *testing.T) {
 	"accounts_conns": ["*internal"],			
 	"prefix_indexed_fields": ["*req.index1","*req.index2"],		
     "string_indexed_fields": ["*req.index1"],
-	"default_opts": {
+	"opts": {
 		"*processRuns": 3,
 	},					
 	},		
@@ -83,7 +83,7 @@ func TestAttributeSCfgAsMapInterface(t *testing.T) {
 		utils.IndexedSelectsCfg:      true,
 		utils.NestedFieldsCfg:        false,
 		utils.SuffixIndexedFieldsCfg: []string{},
-		utils.DefaultOptsCfg: map[string]interface{}{
+		utils.OptsCfg: map[string]interface{}{
 			utils.OptsAttributesProcessRuns: float64(3),
 		},
 	}
@@ -100,7 +100,7 @@ func TestAttributeSCfgAsMapInterface2(t *testing.T) {
            "suffix_indexed_fields": ["*req.index1","*req.index2"],
            "nested_fields": true,
            "enabled": true,
-           "default_opts": {
+           "opts": {
 			"*processRuns": 7,
 		},	
      },
@@ -114,7 +114,7 @@ func TestAttributeSCfgAsMapInterface2(t *testing.T) {
 		utils.PrefixIndexedFieldsCfg: []string{},
 		utils.SuffixIndexedFieldsCfg: []string{"*req.index1", "*req.index2"},
 		utils.NestedFieldsCfg:        true,
-		utils.DefaultOptsCfg: map[string]interface{}{
+		utils.OptsCfg: map[string]interface{}{
 			utils.OptsAttributesProcessRuns: float64(7),
 		},
 		utils.ProfileRunsCfg: 0,
@@ -141,7 +141,7 @@ func TestAttributeSCfgAsMapInterface3(t *testing.T) {
 		utils.PrefixIndexedFieldsCfg: []string{},
 		utils.SuffixIndexedFieldsCfg: []string{},
 		utils.NestedFieldsCfg:        false,
-		utils.DefaultOptsCfg: map[string]interface{}{
+		utils.OptsCfg: map[string]interface{}{
 			utils.OptsAttributesProcessRuns: float64(1),
 		},
 		utils.ProfileRunsCfg: 0,
@@ -232,7 +232,7 @@ func TestDiffAttributeSJsonCfg(t *testing.T) {
 		Prefix_indexed_fields: nil,
 		Suffix_indexed_fields: nil,
 		Nested_fields:         utils.BoolPointer(false),
-		Default_opts:          map[string]interface{}{},
+		Opts:                  map[string]interface{}{},
 	}
 
 	rcv := diffAttributeSJsonCfg(d, v1, v2)
@@ -242,7 +242,7 @@ func TestDiffAttributeSJsonCfg(t *testing.T) {
 
 	v2_2 := v1
 	expected2 := &AttributeSJsonCfg{
-		Default_opts: map[string]interface{}{},
+		Opts: map[string]interface{}{},
 	}
 	rcv = diffAttributeSJsonCfg(d, v1, v2_2)
 	if !reflect.DeepEqual(rcv, expected2) {

config/config.go

@@ -147,7 +147,7 @@ func newCGRConfig(config []byte) (cfg *CGRConfig, err error) {
 	cfg.statsCfg = new(StatSCfg)
 	cfg.thresholdSCfg = new(ThresholdSCfg)
 	cfg.routeSCfg = new(RouteSCfg)
-	cfg.RouteSCfg().DefaultOpts = &RoutesOpts{}
+	cfg.RouteSCfg().Opts = &RoutesOpts{}
 	cfg.sureTaxCfg = new(SureTaxCfg)
 	cfg.dispatcherSCfg = new(DispatcherSCfg)
 	cfg.registrarCCfg = new(RegistrarCCfgs)

config/config_defaults.go

@@ -667,7 +667,7 @@ const CGRATES_CFG_JSON = `
 	"prefix_indexed_fields": [],			// query indexes based on these fields for faster processing
 	"suffix_indexed_fields": [],			// query indexes based on these fields for faster processing
 	"nested_fields": false,					// determines which field is checked when matching indexed filters(true: all; false: only the one on the first level)
-	"default_opts":{						// 
+	"opts":{								// 
 		"*processRuns": 1,					// number of run loops when processing event
 	},
 	"profile_runs": 0,						// number of run a profile will process the event
@@ -735,7 +735,7 @@ const CGRATES_CFG_JSON = `
 	"rates_conns": [],						// connections to RateS
 	"accounts_conns": [],					// connections to AccountS
 	"default_ratio":1,						// default ratio used in case of *load strategy
-	"default_opts":{
+	"opts":{
 		"*context": "*routes",
 		"*profileCount": 1,
 		"*ignoreErrors": false,

config/config_it_test.go

@@ -356,7 +356,7 @@ func testCGRConfigReloadSupplierS(t *testing.T) {
 		AccountSConns:       []string{},
 		IndexedSelects:      true,
 		DefaultRatio:        1,
-		DefaultOpts: &RoutesOpts{
+		Opts: &RoutesOpts{
 			Context:      utils.MetaRoutes,
 			ProfileCount: 1,
 			IgnoreErrors: false,

config/config_json_test.go

@@ -753,7 +753,7 @@ func TestDfAttributeServJsonCfg(t *testing.T) {
 		Prefix_indexed_fields: &[]string{},
 		Suffix_indexed_fields: &[]string{},
 		Nested_fields:         utils.BoolPointer(false),
-		Default_opts: map[string]interface{}{
+		Opts: map[string]interface{}{
 			utils.OptsAttributesProcessRuns: float64(1),
 		},
 		Profile_runs: utils.IntPointer(0),
@@ -890,7 +890,7 @@ func TestDfRouteSJsonCfg(t *testing.T) {
 		Accounts_conns:        &[]string{},
 		Default_ratio:         utils.IntPointer(1),
 		Nested_fields:         utils.BoolPointer(false),
-		Default_opts: &RoutesOptsJson{
+		Opts: &RoutesOptsJson{
 			Context:      utils.StringPointer(utils.MetaRoutes),
 			ProfileCount: utils.Float64Pointer(float64(1)),
 			IgnoreErrors: utils.BoolPointer(false),

config/config_test.go

@@ -740,7 +740,7 @@ func TestCgrCfgJSONDefaultRouteSCfg(t *testing.T) {
 		RateSConns:          []string{},
 		AccountSConns:       []string{},
 		DefaultRatio:        1,
-		DefaultOpts: &RoutesOpts{
+		Opts: &RoutesOpts{
 			Context:      utils.MetaRoutes,
 			ProfileCount: float64(1),
 			IgnoreErrors: false,
@@ -1956,7 +1956,7 @@ func TestRouteSConfig(t *testing.T) {
 		AccountSConns:       []string{},
 		DefaultRatio:        1,
 		NestedFields:        false,
-		DefaultOpts: &RoutesOpts{
+		Opts: &RoutesOpts{
 			Context:      utils.MetaRoutes,
 			ProfileCount: float64(1),
 			IgnoreErrors: false,
@@ -4156,7 +4156,7 @@ func TestV1GetConfigAttribute(t *testing.T) {
 			utils.PrefixIndexedFieldsCfg: []string{},
 			utils.SuffixIndexedFieldsCfg: []string{},
 			utils.NestedFieldsCfg:        false,
-			utils.DefaultOptsCfg: map[string]interface{}{
+			utils.OptsCfg: map[string]interface{}{
 				utils.OptsAttributesProcessRuns: float64(1),
 			},
 			utils.ProfileRunsCfg: 0,
@@ -4293,7 +4293,7 @@ func TestV1GetConfigRoutes(t *testing.T) {
 			utils.RateSConnsCfg:          []string{},
 			utils.AccountSConnsCfg:       []string{},
 			utils.DefaultRatioCfg:        1,
-			utils.DefaultOptsCfg: map[string]interface{}{
+			utils.OptsCfg: map[string]interface{}{
 				utils.OptsContext:         utils.MetaRoutes,
 				utils.MetaProfileCountCfg: float64(1),
 				utils.MetaIgnoreErrorsCfg: false,
@@ -5079,7 +5079,7 @@ func TestV1GetConfigAsJSONThresholdS(t *testing.T) {
 
 func TestV1GetConfigAsJSONRouteS(t *testing.T) {
 	var reply string
-	expected := `{"routes":{"accounts_conns":[],"attributes_conns":[],"default_opts":{"*context":"*routes","*ignoreErrors":false,"*maxCost":"","*profileCount":1},"default_ratio":1,"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"rates_conns":[],"resources_conns":[],"stats_conns":[],"suffix_indexed_fields":[]}}`
+	expected := `{"routes":{"accounts_conns":[],"attributes_conns":[],"default_ratio":1,"enabled":false,"indexed_selects":true,"nested_fields":false,"opts":{"*context":"*routes","*ignoreErrors":false,"*maxCost":"","*profileCount":1},"prefix_indexed_fields":[],"rates_conns":[],"resources_conns":[],"stats_conns":[],"suffix_indexed_fields":[]}}`
 	cgrCfg := NewDefaultCGRConfig()
 	if err := cgrCfg.V1GetConfigAsJSON(context.Background(), &SectionWithAPIOpts{Sections: []string{RouteSJSON}}, &reply); err != nil {
 		t.Error(err)
@@ -5957,7 +5957,7 @@ func TestSetCfgInDb(t *testing.T) {
 				String_indexed_fields: &[]string{"field2"},
 				Suffix_indexed_fields: &[]string{"field2"},
 				Prefix_indexed_fields: &[]string{"field2"},
-				Default_opts: map[string]interface{}{
+				Opts: map[string]interface{}{
 					utils.OptsAttributesProcessRuns: float64(3),
 				},
 				Nested_fields: utils.BoolPointer(false),
@@ -5973,7 +5973,7 @@ func TestSetCfgInDb(t *testing.T) {
 		String_indexed_fields: &[]string{"field2"},
 		Suffix_indexed_fields: &[]string{"field2"},
 		Prefix_indexed_fields: &[]string{"field2"},
-		Default_opts: map[string]interface{}{
+		Opts: map[string]interface{}{
 			utils.OptsAttributesProcessRuns: float64(3),
 		},
 		Nested_fields: utils.BoolPointer(false),
@@ -6019,7 +6019,7 @@ func TestSetNilCfgInDb(t *testing.T) {
 		},
 	}
 	expected := &AttributeSJsonCfg{
-		Default_opts: make(map[string]interface{}),
+		Opts: make(map[string]interface{}),
 	}
 	var reply string
 	if err := cfg.V1SetConfig(context.Background(), args, &reply); err != nil {
@@ -6066,7 +6066,7 @@ func TestReloadCfgInDb(t *testing.T) {
 		String_indexed_fields: &[]string{"field2"},
 		Suffix_indexed_fields: &[]string{"field2"},
 		Prefix_indexed_fields: &[]string{"field2"},
-		Default_opts: map[string]interface{}{
+		Opts: map[string]interface{}{
 			utils.OptsAttributesProcessRuns: float64(3),
 		},
 		Nested_fields: utils.BoolPointer(false),

config/routescfg.go

@@ -45,8 +45,7 @@ type RouteSCfg struct {
 	RateSConns          []string
 	AccountSConns       []string
 	DefaultRatio        int
-	DefaultOpts         *RoutesOpts
-	// DefaultOpts         map[string]interface{}
+	Opts                *RoutesOpts
 }
 
 func (rtsOpts *RoutesOpts) loadFromJSONCfg(jsnCfg *RoutesOptsJson) (err error) {
@@ -113,8 +112,8 @@ func (rts *RouteSCfg) loadFromJSONCfg(jsnCfg *RouteSJsonCfg) (err error) {
 	if jsnCfg.Default_ratio != nil {
 		rts.DefaultRatio = *jsnCfg.Default_ratio
 	}
-	if jsnCfg.Default_opts != nil {
-		rts.DefaultOpts.loadFromJSONCfg(jsnCfg.Default_opts)
+	if jsnCfg.Opts != nil {
+		rts.Opts.loadFromJSONCfg(jsnCfg.Opts)
 	}
 	if jsnCfg.Nested_fields != nil {
 		rts.NestedFields = *jsnCfg.Nested_fields
@@ -125,16 +124,16 @@ func (rts *RouteSCfg) loadFromJSONCfg(jsnCfg *RouteSJsonCfg) (err error) {
 // AsMapInterface returns the config as a map[string]interface{}
 func (rts *RouteSCfg) AsMapInterface() (initialMP map[string]interface{}) {
 	opts := map[string]interface{}{
-		utils.OptsContext:         rts.DefaultOpts.Context,
-		utils.MetaProfileCountCfg: rts.DefaultOpts.ProfileCount,
-		utils.MetaIgnoreErrorsCfg: rts.DefaultOpts.IgnoreErrors,
-		utils.MetaMaxCostCfg:      rts.DefaultOpts.MaxCost,
+		utils.OptsContext:         rts.Opts.Context,
+		utils.MetaProfileCountCfg: rts.Opts.ProfileCount,
+		utils.MetaIgnoreErrorsCfg: rts.Opts.IgnoreErrors,
+		utils.MetaMaxCostCfg:      rts.Opts.MaxCost,
 	}
-	if rts.DefaultOpts.Limit != nil {
-		opts[utils.MetaLimitCfg] = *rts.DefaultOpts.Limit
+	if rts.Opts.Limit != nil {
+		opts[utils.MetaLimitCfg] = *rts.Opts.Limit
 	}
-	if rts.DefaultOpts.Offset != nil {
-		opts[utils.MetaOffsetCfg] = *rts.DefaultOpts.Offset
+	if rts.Opts.Offset != nil {
+		opts[utils.MetaOffsetCfg] = *rts.Opts.Offset
 	}
 
 	initialMP = map[string]interface{}{
@@ -142,7 +141,7 @@ func (rts *RouteSCfg) AsMapInterface() (initialMP map[string]interface{}) {
 		utils.IndexedSelectsCfg: rts.IndexedSelects,
 		utils.DefaultRatioCfg:   rts.DefaultRatio,
 		utils.NestedFieldsCfg:   rts.NestedFields,
-		utils.DefaultOptsCfg:    opts,
+		utils.OptsCfg:           opts,
 	}
 	if rts.StringIndexedFields != nil {
 		initialMP[utils.StringIndexedFieldsCfg] = utils.CloneStringSlice(*rts.StringIndexedFields)
@@ -178,7 +177,7 @@ func (rts RouteSCfg) Clone() (cln *RouteSCfg) {
 		IndexedSelects: rts.IndexedSelects,
 		DefaultRatio:   rts.DefaultRatio,
 		NestedFields:   rts.NestedFields,
-		DefaultOpts:    rts.DefaultOpts,
+		Opts:           rts.Opts,
 	}
 	if rts.AttributeSConns != nil {
 		cln.AttributeSConns = utils.CloneStringSlice(rts.AttributeSConns)
@@ -230,8 +229,7 @@ type RouteSJsonCfg struct {
 	Rates_conns           *[]string
 	Accounts_conns        *[]string
 	Default_ratio         *int
-	Default_opts          *RoutesOptsJson
-	// Default_opts          map[string]interface{}
+	Opts                  *RoutesOptsJson
 }
 
 func diffRouteSJsonCfg(d *RouteSJsonCfg, v1, v2 *RouteSCfg) *RouteSJsonCfg {
@@ -268,24 +266,24 @@ func diffRouteSJsonCfg(d *RouteSJsonCfg, v1, v2 *RouteSCfg) *RouteSJsonCfg {
 	if v1.DefaultRatio != v2.DefaultRatio {
 		d.Default_ratio = utils.IntPointer(v2.DefaultRatio)
 	}
-	d.Default_opts = &RoutesOptsJson{}
-	if v1.DefaultOpts.Context != v2.DefaultOpts.Context {
-		d.Default_opts.Context = utils.StringPointer(v2.DefaultOpts.Context)
+	d.Opts = &RoutesOptsJson{}
+	if v1.Opts.Context != v2.Opts.Context {
+		d.Opts.Context = utils.StringPointer(v2.Opts.Context)
 	}
-	if v1.DefaultOpts.Limit != v2.DefaultOpts.Limit {
-		d.Default_opts.Limit = v2.DefaultOpts.Limit
+	if v1.Opts.Limit != v2.Opts.Limit {
+		d.Opts.Limit = v2.Opts.Limit
 	}
-	if v1.DefaultOpts.Offset != v2.DefaultOpts.Offset {
-		d.Default_opts.Offset = v2.DefaultOpts.Offset
+	if v1.Opts.Offset != v2.Opts.Offset {
+		d.Opts.Offset = v2.Opts.Offset
 	}
-	if v1.DefaultOpts.MaxCost != v2.DefaultOpts.MaxCost {
-		d.Default_opts.MaxCost = &v2.DefaultOpts.MaxCost
+	if v1.Opts.MaxCost != v2.Opts.MaxCost {
+		d.Opts.MaxCost = &v2.Opts.MaxCost
 	}
-	if v1.DefaultOpts.IgnoreErrors != v2.DefaultOpts.IgnoreErrors {
-		d.Default_opts.IgnoreErrors = utils.BoolPointer(v2.DefaultOpts.IgnoreErrors)
+	if v1.Opts.IgnoreErrors != v2.Opts.IgnoreErrors {
+		d.Opts.IgnoreErrors = utils.BoolPointer(v2.Opts.IgnoreErrors)
 	}
-	if v1.DefaultOpts.ProfileCount != v2.DefaultOpts.ProfileCount {
-		d.Default_opts.ProfileCount = utils.Float64Pointer(v2.DefaultOpts.ProfileCount)
+	if v1.Opts.ProfileCount != v2.Opts.ProfileCount {
+		d.Opts.ProfileCount = utils.Float64Pointer(v2.Opts.ProfileCount)
 	}
 	return d
 }

config/routescfg_test.go

@@ -52,7 +52,7 @@ func TestRouteSCfgloadFromJsonCfg(t *testing.T) {
 		AccountSConns:       []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAccounts), "conn1"},
 		DefaultRatio:        10,
 		NestedFields:        true,
-		DefaultOpts: &RoutesOpts{
+		Opts: &RoutesOpts{
 			Context:      utils.MetaRoutes,
 			ProfileCount: float64(1),
 			IgnoreErrors: false,
@@ -83,7 +83,7 @@ func TestRouteSCfgAsMapInterface(t *testing.T) {
 		utils.RateSConnsCfg:          []string{},
 		utils.AccountSConnsCfg:       []string{},
 		utils.DefaultRatioCfg:        1,
-		utils.DefaultOptsCfg: map[string]interface{}{
+		utils.OptsCfg: map[string]interface{}{
 			utils.OptsContext:         utils.MetaRoutes,
 			utils.MetaProfileCountCfg: float64(1),
 			utils.MetaIgnoreErrorsCfg: false,
@@ -128,7 +128,7 @@ func TestRouteSCfgAsMapInterface1(t *testing.T) {
 		utils.RateSConnsCfg:          []string{utils.MetaInternal, "conn1"},
 		utils.AccountSConnsCfg:       []string{utils.MetaInternal, "conn1"},
 		utils.DefaultRatioCfg:        2,
-		utils.DefaultOptsCfg: map[string]interface{}{
+		utils.OptsCfg: map[string]interface{}{
 			utils.OptsContext:         utils.MetaRoutes,
 			utils.MetaProfileCountCfg: float64(1),
 			utils.MetaIgnoreErrorsCfg: false,
@@ -193,7 +193,7 @@ func TestDiffRouteSJsonCfg(t *testing.T) {
 		ResourceSConns:      []string{"*localhost"},
 		StatSConns:          []string{"*localhost"},
 		DefaultRatio:        2,
-		DefaultOpts: &RoutesOpts{
+		Opts: &RoutesOpts{
 			Context:      utils.MetaAny,
 			IgnoreErrors: true,
 			MaxCost:      5,
@@ -214,7 +214,7 @@ func TestDiffRouteSJsonCfg(t *testing.T) {
 		ResourceSConns:      []string{"*birpc"},
 		StatSConns:          []string{"*birpc"},
 		DefaultRatio:        3,
-		DefaultOpts: &RoutesOpts{
+		Opts: &RoutesOpts{
 			Context:      utils.MetaRoutes,
 			IgnoreErrors: false,
 			MaxCost:      utils.MetaEventCost,
@@ -235,10 +235,10 @@ func TestDiffRouteSJsonCfg(t *testing.T) {
 		Resources_conns:       &[]string{"*birpc"},
 		Stats_conns:           &[]string{"*birpc"},
 		Default_ratio:         utils.IntPointer(3),
-		Default_opts: &RoutesOptsJson{
+		Opts: &RoutesOptsJson{
 			Context:      utils.StringPointer(utils.MetaRoutes),
 			IgnoreErrors: utils.BoolPointer(false),
-			MaxCost:      &v2.DefaultOpts.MaxCost,
+			MaxCost:      &v2.Opts.MaxCost,
 			Limit:        utils.IntPointer(2),
 			Offset:       utils.IntPointer(2),
 			ProfileCount: utils.Float64Pointer(2),
@@ -252,7 +252,7 @@ func TestDiffRouteSJsonCfg(t *testing.T) {
 
 	v1 = v2
 	expected = &RouteSJsonCfg{
-		Default_opts: &RoutesOptsJson{},
+		Opts: &RoutesOptsJson{},
 	}
 	rcv = diffRouteSJsonCfg(d, v1, v2)
 	if !reflect.DeepEqual(rcv, expected) {