diff --git a/analyzers/analyzers_it_test.go b/analyzers/analyzers_it_test.go index bfb3845d8..5c4bc57b4 100644 --- a/analyzers/analyzers_it_test.go +++ b/analyzers/analyzers_it_test.go @@ -132,7 +132,7 @@ func testAnalyzerSRPCConn(t *testing.T) { if err != nil { t.Fatal(err) } - anzBiRPC, err = utils.NewBiJSONrpcClient(anzCfg.SessionSCfg().ListenBijson, srv) + anzBiRPC, err = utils.NewBiJSONrpcClient(anzCfg.SessionSCfg().ListenBiJSON, srv) if err != nil { t.Fatal(err) } diff --git a/apier/v1/caps_it_test.go b/apier/v1/caps_it_test.go index ed7224eb7..413f6fc0f 100644 --- a/apier/v1/caps_it_test.go +++ b/apier/v1/caps_it_test.go @@ -102,7 +102,7 @@ func testCapsRPCConn(t *testing.T) { if err != nil { t.Fatal(err) } - if capsBiRPC, err = utils.NewBiJSONrpcClient(capsCfg.SessionSCfg().ListenBijson, + if capsBiRPC, err = utils.NewBiJSONrpcClient(capsCfg.SessionSCfg().ListenBiJSON, nil); err != nil { t.Fatal(err) } diff --git a/apier/v1/sessions_thresholds_it_test.go b/apier/v1/sessions_thresholds_it_test.go index 314af24c0..02d54bc5a 100644 --- a/apier/v1/sessions_thresholds_it_test.go +++ b/apier/v1/sessions_thresholds_it_test.go @@ -121,7 +121,7 @@ func testSessionSv1ItStartEngine(t *testing.T) { } func testSessionSv1ItRpcConn(t *testing.T) { - dummyClnt, err := utils.NewBiJSONrpcClient(sSv1Cfg2.SessionSCfg().ListenBijson, + dummyClnt, err := utils.NewBiJSONrpcClient(sSv1Cfg2.SessionSCfg().ListenBiJSON, nil) if err != nil { t.Fatal(err) @@ -130,7 +130,7 @@ func testSessionSv1ItRpcConn(t *testing.T) { if err != nil { t.Fatal(err) } - if sSv1BiRpc2, err = utils.NewBiJSONrpcClient(sSv1Cfg2.SessionSCfg().ListenBijson, + if sSv1BiRpc2, err = utils.NewBiJSONrpcClient(sSv1Cfg2.SessionSCfg().ListenBiJSON, srv); err != nil { t.Fatal(err) } diff --git a/apier/v1/sessionsv1_it_test.go b/apier/v1/sessionsv1_it_test.go index c80f73255..4458cb479 100644 --- a/apier/v1/sessionsv1_it_test.go +++ b/apier/v1/sessionsv1_it_test.go @@ -162,7 +162,7 @@ func testSSv1ItStartEngine(t *testing.T) { } func testSSv1ItRpcConn(t *testing.T) { - dummyClnt, err := utils.NewBiJSONrpcClient(sSv1Cfg.SessionSCfg().ListenBijson, + dummyClnt, err := utils.NewBiJSONrpcClient(sSv1Cfg.SessionSCfg().ListenBiJSON, nil) if err != nil { t.Fatal(err) @@ -171,7 +171,7 @@ func testSSv1ItRpcConn(t *testing.T) { if err != nil { t.Fatal(err) } - if sSv1BiRpc, err = utils.NewBiJSONrpcClient(sSv1Cfg.SessionSCfg().ListenBijson, + if sSv1BiRpc, err = utils.NewBiJSONrpcClient(sSv1Cfg.SessionSCfg().ListenBiJSON, srv); err != nil { t.Fatal(err) } diff --git a/cmd/cgr-tester/sessions.go b/cmd/cgr-tester/sessions.go index 5ea9c5635..435a4bf2a 100644 --- a/cmd/cgr-tester/sessions.go +++ b/cmd/cgr-tester/sessions.go @@ -78,7 +78,7 @@ func callSessions(ctx *context.Context, authDur, initDur, updateDur, terminateDu if err != nil { return err } - brpc, err = utils.NewBiJSONrpcClient(tstCfg.SessionSCfg().ListenBijson, srv) + brpc, err = utils.NewBiJSONrpcClient(tstCfg.SessionSCfg().ListenBiJSON, srv) if err != nil { return err } diff --git a/config/config_it_test.go b/config/config_it_test.go index 57da26420..6455b062f 100644 --- a/config/config_it_test.go +++ b/config/config_it_test.go @@ -523,17 +523,17 @@ func testCGRConfigReloadSessionS(t *testing.T) { t.Errorf("Expected OK received: %s", reply) } expAttr := &SessionSCfg{ - Enabled: true, - ListenBijson: "127.0.0.1:2014", - ChargerSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaChargers)}, - RALsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResponder)}, - IPsConns: []string{}, - ResSConns: []string{utils.MetaLocalHost}, - ThreshSConns: []string{}, - StatSConns: []string{}, - RouteSConns: []string{utils.MetaLocalHost}, - AttrSConns: []string{utils.MetaLocalHost}, - CDRsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs)}, + Enabled: true, + ListenBiJSON: "127.0.0.1:2014", + ChargerSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaChargers)}, + RALsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResponder)}, + IPsConns: []string{}, + ResourceSConns: []string{utils.MetaLocalHost}, + ThresholdSConns: []string{}, + StatSConns: []string{}, + RouteSConns: []string{utils.MetaLocalHost}, + AttributeSConns: []string{utils.MetaLocalHost}, + CDRsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs)}, ReplicationConns: []string{}, SessionIndexes: utils.StringSet{}, @@ -979,17 +979,17 @@ func testCGRConfigReloadConfigFromJSONSessionS(t *testing.T) { t.Errorf("Expected OK received: %s", reply) } expAttr := &SessionSCfg{ - Enabled: true, - ListenBijson: "127.0.0.1:2014", - ChargerSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaChargers)}, - RALsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResponder)}, - IPsConns: []string{utils.MetaLocalHost}, - ResSConns: []string{utils.MetaLocalHost}, - ThreshSConns: []string{}, - StatSConns: []string{}, - RouteSConns: []string{utils.MetaLocalHost}, - AttrSConns: []string{utils.MetaLocalHost}, - CDRsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs)}, + Enabled: true, + ListenBiJSON: "127.0.0.1:2014", + ChargerSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaChargers)}, + RALsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResponder)}, + IPsConns: []string{utils.MetaLocalHost}, + ResourceSConns: []string{utils.MetaLocalHost}, + ThresholdSConns: []string{}, + StatSConns: []string{}, + RouteSConns: []string{utils.MetaLocalHost}, + AttributeSConns: []string{utils.MetaLocalHost}, + CDRsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs)}, ReplicationConns: []string{}, SessionIndexes: utils.StringSet{}, @@ -1042,17 +1042,17 @@ func testCGRConfigReloadConfigFromStringSessionS(t *testing.T) { t.Errorf("Expected OK received: %s", reply) } expAttr := &SessionSCfg{ - Enabled: true, - ListenBijson: "127.0.0.1:2014", - ChargerSConns: []string{utils.MetaLocalHost}, - RALsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResponder)}, - IPsConns: []string{utils.MetaLocalHost}, - ResSConns: []string{utils.MetaLocalHost}, - ThreshSConns: []string{}, - StatSConns: []string{}, - RouteSConns: []string{utils.MetaLocalHost}, - AttrSConns: []string{utils.MetaLocalHost}, - CDRsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs)}, + Enabled: true, + ListenBiJSON: "127.0.0.1:2014", + ChargerSConns: []string{utils.MetaLocalHost}, + RALsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResponder)}, + IPsConns: []string{utils.MetaLocalHost}, + ResourceSConns: []string{utils.MetaLocalHost}, + ThresholdSConns: []string{}, + StatSConns: []string{}, + RouteSConns: []string{utils.MetaLocalHost}, + AttributeSConns: []string{utils.MetaLocalHost}, + CDRsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs)}, ReplicationConns: []string{}, SessionIndexes: utils.StringSet{}, @@ -1105,17 +1105,17 @@ func testCGRConfigReloadAll(t *testing.T) { t.Errorf("Expected OK received: %s", reply) } expAttr := &SessionSCfg{ - Enabled: true, - ListenBijson: "127.0.0.1:2014", - ChargerSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaChargers)}, - RALsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResponder)}, - IPsConns: []string{}, - ResSConns: []string{utils.MetaLocalHost}, - ThreshSConns: []string{}, - StatSConns: []string{}, - RouteSConns: []string{utils.MetaLocalHost}, - AttrSConns: []string{utils.MetaLocalHost}, - CDRsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs)}, + Enabled: true, + ListenBiJSON: "127.0.0.1:2014", + ChargerSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaChargers)}, + RALsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResponder)}, + IPsConns: []string{}, + ResourceSConns: []string{utils.MetaLocalHost}, + ThresholdSConns: []string{}, + StatSConns: []string{}, + RouteSConns: []string{utils.MetaLocalHost}, + AttributeSConns: []string{utils.MetaLocalHost}, + CDRsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs)}, ReplicationConns: []string{}, SessionIndexes: utils.StringSet{}, diff --git a/config/config_json_test.go b/config/config_json_test.go index a49cc78cf..c46e46831 100644 --- a/config/config_json_test.go +++ b/config/config_json_test.go @@ -938,30 +938,30 @@ func TestDfCdrsJsonCfg(t *testing.T) { func TestSmgJsonCfg(t *testing.T) { eCfg := &SessionSJsonCfg{ - Enabled: utils.BoolPointer(false), - Listen_bijson: utils.StringPointer("127.0.0.1:2014"), - Listen_bigob: utils.StringPointer(""), - Chargers_conns: &[]string{}, - Rals_conns: &[]string{}, - Cdrs_conns: &[]string{}, - Ips_conns: &[]string{}, - Resources_conns: &[]string{}, - Thresholds_conns: &[]string{}, - Stats_conns: &[]string{}, - Routes_conns: &[]string{}, - Attributes_conns: &[]string{}, - Replication_conns: &[]string{}, - Debit_interval: utils.StringPointer("0s"), - Store_session_costs: utils.BoolPointer(false), - Session_ttl: utils.StringPointer("0s"), - Session_indexes: &[]string{}, - Client_protocol: utils.Float64Pointer(2.0), - Channel_sync_interval: utils.StringPointer("0"), - Stale_chan_max_extra_usage: utils.StringPointer("0"), - Terminate_attempts: utils.IntPointer(5), - Alterable_fields: &[]string{}, - Backup_interval: utils.StringPointer("0s"), - Default_usage: &map[string]string{ + Enabled: utils.BoolPointer(false), + ListenBiJSON: utils.StringPointer("127.0.0.1:2014"), + ListenBiGob: utils.StringPointer(""), + ChargerSConns: &[]string{}, + RALsConns: &[]string{}, + CDRsConns: &[]string{}, + IPsConns: &[]string{}, + ResourceSConns: &[]string{}, + ThresholdSConns: &[]string{}, + StatSConns: &[]string{}, + RouteSConns: &[]string{}, + AttributeSConns: &[]string{}, + ReplicationConns: &[]string{}, + DebitInterval: utils.StringPointer("0s"), + StoreSCosts: utils.BoolPointer(false), + SessionTTL: utils.StringPointer("0s"), + SessionIndexes: &[]string{}, + ClientProtocol: utils.Float64Pointer(2.0), + ChannelSyncInterval: utils.StringPointer("0"), + StaleChanMaxExtraUsage: utils.StringPointer("0"), + TerminateAttempts: utils.IntPointer(5), + AlterableFields: &[]string{}, + BackupInterval: utils.StringPointer("0s"), + DefaultUsage: &map[string]string{ utils.MetaAny: "3h", utils.MetaVoice: "3h", utils.MetaData: "1048576", @@ -974,7 +974,7 @@ func TestSmgJsonCfg(t *testing.T) { Privatekey_path: utils.StringPointer(""), Publickey_path: utils.StringPointer(""), }, - Scheduler_conns: &[]string{}, + SchedulerConns: &[]string{}, } dfCgrJSONCfg, err := NewCgrJsonCfgFromBytes([]byte(CGRATES_CFG_JSON)) if err != nil { diff --git a/config/config_test.go b/config/config_test.go index 31bea0d12..8d8a47ec7 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -480,16 +480,16 @@ func TestCgrCfgJSONLoadCDRS(t *testing.T) { func TestCgrCfgJSONDefaultsSMGenericCfg(t *testing.T) { eSessionSCfg := &SessionSCfg{ Enabled: false, - ListenBijson: "127.0.0.1:2014", + ListenBiJSON: "127.0.0.1:2014", ChargerSConns: []string{}, RALsConns: []string{}, CDRsConns: []string{}, IPsConns: []string{}, - ResSConns: []string{}, - ThreshSConns: []string{}, + ResourceSConns: []string{}, + ThresholdSConns: []string{}, StatSConns: []string{}, RouteSConns: []string{}, - AttrSConns: []string{}, + AttributeSConns: []string{}, ReplicationConns: []string{}, DebitInterval: 0, StoreSCosts: false, @@ -1225,7 +1225,7 @@ func TestLoadSessionSCfgError(t *testing.T) { "session_ttl_usage": 1, }, }` - expected := "json: cannot unmarshal number into Go struct field SessionSJsonCfg.Session_ttl_usage of type string" + expected := "json: cannot unmarshal number into Go struct field SessionSJsonCfg.session_ttl_usage of type string" cgrConfig := NewDefaultCGRConfig() if cgrCfgJSON, err := NewCgrJsonCfgFromBytes([]byte(cfgJSONStr)); err != nil { t.Error(err) @@ -1984,15 +1984,15 @@ func TestRouteSConfig(t *testing.T) { func TestSessionSConfig(t *testing.T) { expected := &SessionSCfg{ Enabled: false, - ListenBijson: "127.0.0.1:2014", + ListenBiJSON: "127.0.0.1:2014", ChargerSConns: []string{}, RALsConns: []string{}, IPsConns: []string{}, - ResSConns: []string{}, - ThreshSConns: []string{}, + ResourceSConns: []string{}, + ThresholdSConns: []string{}, StatSConns: []string{}, RouteSConns: []string{}, - AttrSConns: []string{}, + AttributeSConns: []string{}, CDRsConns: []string{}, ReplicationConns: []string{}, DebitInterval: 0, diff --git a/config/configsanity.go b/config/configsanity.go index 56749320d..1128db864 100644 --- a/config/configsanity.go +++ b/config/configsanity.go @@ -193,7 +193,7 @@ func (cfg *CGRConfig) checkConfigSanity() error { return fmt.Errorf("<%s> connection with id: <%s> not defined", utils.SessionS, connID) } } - for _, connID := range cfg.sessionSCfg.ResSConns { + for _, connID := range cfg.sessionSCfg.ResourceSConns { if strings.HasPrefix(connID, utils.MetaInternal) && !cfg.resourceSCfg.Enabled { return fmt.Errorf("<%s> not enabled but requested by <%s> component", utils.ResourceS, utils.SessionS) } @@ -201,7 +201,7 @@ func (cfg *CGRConfig) checkConfigSanity() error { return fmt.Errorf("<%s> connection with id: <%s> not defined", utils.SessionS, connID) } } - for _, connID := range cfg.sessionSCfg.ThreshSConns { + for _, connID := range cfg.sessionSCfg.ThresholdSConns { if strings.HasPrefix(connID, utils.MetaInternal) && !cfg.thresholdSCfg.Enabled { return fmt.Errorf("<%s> not enabled but requested by <%s> component", utils.ThresholdS, utils.SessionS) } @@ -225,7 +225,7 @@ func (cfg *CGRConfig) checkConfigSanity() error { return fmt.Errorf("<%s> connection with id: <%s> not defined", utils.SessionS, connID) } } - for _, connID := range cfg.sessionSCfg.AttrSConns { + for _, connID := range cfg.sessionSCfg.AttributeSConns { if strings.HasPrefix(connID, utils.MetaInternal) && !cfg.attributeSCfg.Enabled { return fmt.Errorf("<%s> not enabled but requested by <%s> component", utils.AttributeS, utils.SessionS) } diff --git a/config/configsanity_test.go b/config/configsanity_test.go index 59fa1da39..aa7ca4c80 100644 --- a/config/configsanity_test.go +++ b/config/configsanity_test.go @@ -286,17 +286,17 @@ func TestConfigSanitySessionS(t *testing.T) { cfg.sessionSCfg.RALsConns = []string{} cfg.ralsCfg.Enabled = true - cfg.sessionSCfg.ResSConns = []string{utils.MetaInternal} + cfg.sessionSCfg.ResourceSConns = []string{utils.MetaInternal} expected = " not enabled but requested by component" if err := cfg.checkConfigSanity(); err == nil || err.Error() != expected { t.Errorf("Expecting: %+q received: %+q", expected, err) } - cfg.sessionSCfg.ResSConns = []string{"test"} + cfg.sessionSCfg.ResourceSConns = []string{"test"} expected = " connection with id: not defined" if err := cfg.checkConfigSanity(); err == nil || err.Error() != expected { t.Errorf("Expecting: %+q received: %+q", expected, err) } - cfg.sessionSCfg.ResSConns = []string{} + cfg.sessionSCfg.ResourceSConns = []string{} cfg.resourceSCfg.Enabled = true cfg.sessionSCfg.IPsConns = []string{utils.MetaInternal} @@ -312,17 +312,17 @@ func TestConfigSanitySessionS(t *testing.T) { cfg.sessionSCfg.IPsConns = []string{} cfg.ipsCfg.Enabled = true - cfg.sessionSCfg.ThreshSConns = []string{utils.MetaInternal} + cfg.sessionSCfg.ThresholdSConns = []string{utils.MetaInternal} expected = " not enabled but requested by component" if err := cfg.checkConfigSanity(); err == nil || err.Error() != expected { t.Errorf("Expecting: %+q received: %+q", expected, err) } - cfg.sessionSCfg.ThreshSConns = []string{"test"} + cfg.sessionSCfg.ThresholdSConns = []string{"test"} expected = " connection with id: not defined" if err := cfg.checkConfigSanity(); err == nil || err.Error() != expected { t.Errorf("Expecting: %+q received: %+q", expected, err) } - cfg.sessionSCfg.ThreshSConns = []string{} + cfg.sessionSCfg.ThresholdSConns = []string{} cfg.thresholdSCfg.Enabled = true cfg.sessionSCfg.StatSConns = []string{utils.MetaInternal} @@ -351,17 +351,17 @@ func TestConfigSanitySessionS(t *testing.T) { cfg.sessionSCfg.RouteSConns = []string{} cfg.routeSCfg.Enabled = true - cfg.sessionSCfg.AttrSConns = []string{utils.MetaInternal} + cfg.sessionSCfg.AttributeSConns = []string{utils.MetaInternal} expected = " not enabled but requested by component" if err := cfg.checkConfigSanity(); err == nil || err.Error() != expected { t.Errorf("Expecting: %+q received: %+q", expected, err) } - cfg.sessionSCfg.AttrSConns = []string{"test"} + cfg.sessionSCfg.AttributeSConns = []string{"test"} expected = " connection with id: not defined" if err := cfg.checkConfigSanity(); err == nil || err.Error() != expected { t.Errorf("Expecting: %+q received: %+q", expected, err) } - cfg.sessionSCfg.AttrSConns = []string{} + cfg.sessionSCfg.AttributeSConns = []string{} cfg.attributeSCfg.Enabled = true cfg.sessionSCfg.CDRsConns = []string{utils.MetaInternal} diff --git a/config/libconfig_json.go b/config/libconfig_json.go index 26b469495..10d2a849f 100644 --- a/config/libconfig_json.go +++ b/config/libconfig_json.go @@ -413,37 +413,37 @@ type EventExporterJsonCfg struct { // SessionSJsonCfg config section type SessionSJsonCfg struct { - Enabled *bool - Listen_bijson *string - Listen_bigob *string - Chargers_conns *[]string - Rals_conns *[]string - Ips_conns *[]string - Resources_conns *[]string - Thresholds_conns *[]string - Stats_conns *[]string - Routes_conns *[]string - Cdrs_conns *[]string - Replication_conns *[]string - Attributes_conns *[]string - Debit_interval *string - Store_session_costs *bool - Session_ttl *string - Session_ttl_max_delay *string - Session_ttl_last_used *string - Session_ttl_usage *string - Session_ttl_last_usage *string - Session_indexes *[]string - Client_protocol *float64 - Channel_sync_interval *string - Stale_chan_max_extra_usage *string - Terminate_attempts *int - Alterable_fields *[]string - Min_dur_low_balance *string - Scheduler_conns *[]string - Stir *STIRJsonCfg - Default_usage *map[string]string - Backup_interval *string + Enabled *bool `json:"enabled"` + ListenBiJSON *string `json:"listen_bijson"` + ListenBiGob *string `json:"listen_bigob"` + ChargerSConns *[]string `json:"chargers_conns"` + RALsConns *[]string `json:"rals_conns"` + IPsConns *[]string `json:"ips_conns"` + ResourceSConns *[]string `json:"resources_conns"` + ThresholdSConns *[]string `json:"thresholds_conns"` + StatSConns *[]string `json:"stats_conns"` + RouteSConns *[]string `json:"routes_conns"` + CDRsConns *[]string `json:"cdrs_conns"` + ReplicationConns *[]string `json:"replication_conns"` + AttributeSConns *[]string `json:"attributes_conns"` + DebitInterval *string `json:"debit_interval"` + StoreSCosts *bool `json:"store_session_costs"` + SessionTTL *string `json:"session_ttl"` + SessionTTLMaxDelay *string `json:"session_ttl_max_delay"` + SessionTTLLastUsed *string `json:"session_ttl_last_used"` + SessionTTLUsage *string `json:"session_ttl_usage"` + SessionTTLLastUsage *string `json:"session_ttl_last_usage"` + SessionIndexes *[]string `json:"session_indexes"` + ClientProtocol *float64 `json:"client_protocol"` + ChannelSyncInterval *string `json:"channel_sync_interval"` + StaleChanMaxExtraUsage *string `json:"stale_chan_max_extra_usage"` + TerminateAttempts *int `json:"terminate_attempts"` + AlterableFields *[]string `json:"alterable_fields"` + MinDurLowBalance *string `json:"min_dur_low_balance"` + SchedulerConns *[]string `json:"scheduler_conns"` + Stir *STIRJsonCfg `json:"stir"` + DefaultUsage *map[string]string `json:"default_usage"` + BackupInterval *string `json:"backup_interval"` } // FreeSWITCHAgent config section diff --git a/config/sessionscfg.go b/config/sessionscfg.go index edab51e82..21046731a 100644 --- a/config/sessionscfg.go +++ b/config/sessionscfg.go @@ -105,16 +105,16 @@ func (fs FsConnCfg) Clone() *FsConnCfg { // SessionSCfg is the config section for SessionS type SessionSCfg struct { Enabled bool - ListenBijson string - ListenBigob string + ListenBiJSON string + ListenBiGob string ChargerSConns []string RALsConns []string IPsConns []string - ResSConns []string - ThreshSConns []string + ResourceSConns []string + ThresholdSConns []string StatSConns []string RouteSConns []string - AttrSConns []string + AttributeSConns []string CDRsConns []string ReplicationConns []string DebitInterval time.Duration @@ -144,15 +144,15 @@ func (scfg *SessionSCfg) loadFromJSONCfg(jsnCfg *SessionSJsonCfg) (err error) { if jsnCfg.Enabled != nil { scfg.Enabled = *jsnCfg.Enabled } - if jsnCfg.Listen_bijson != nil { - scfg.ListenBijson = *jsnCfg.Listen_bijson + if jsnCfg.ListenBiJSON != nil { + scfg.ListenBiJSON = *jsnCfg.ListenBiJSON } - if jsnCfg.Listen_bigob != nil { - scfg.ListenBigob = *jsnCfg.Listen_bigob + if jsnCfg.ListenBiGob != nil { + scfg.ListenBiGob = *jsnCfg.ListenBiGob } - if jsnCfg.Chargers_conns != nil { - scfg.ChargerSConns = make([]string, len(*jsnCfg.Chargers_conns)) - for idx, connID := range *jsnCfg.Chargers_conns { + if jsnCfg.ChargerSConns != nil { + scfg.ChargerSConns = make([]string, len(*jsnCfg.ChargerSConns)) + for idx, connID := range *jsnCfg.ChargerSConns { // if we have the connection internal we change the name so we can have internal rpc for each subsystem scfg.ChargerSConns[idx] = connID if connID == utils.MetaInternal { @@ -160,9 +160,9 @@ func (scfg *SessionSCfg) loadFromJSONCfg(jsnCfg *SessionSJsonCfg) (err error) { } } } - if jsnCfg.Rals_conns != nil { - scfg.RALsConns = make([]string, len(*jsnCfg.Rals_conns)) - for idx, connID := range *jsnCfg.Rals_conns { + if jsnCfg.RALsConns != nil { + scfg.RALsConns = make([]string, len(*jsnCfg.RALsConns)) + for idx, connID := range *jsnCfg.RALsConns { // if we have the connection internal we change the name so we can have internal rpc for each subsystem scfg.RALsConns[idx] = connID if connID == utils.MetaInternal { @@ -170,32 +170,32 @@ func (scfg *SessionSCfg) loadFromJSONCfg(jsnCfg *SessionSJsonCfg) (err error) { } } } - if jsnCfg.Ips_conns != nil { - scfg.IPsConns = tagInternalConns(*jsnCfg.Ips_conns, utils.MetaIPs) + if jsnCfg.IPsConns != nil { + scfg.IPsConns = tagInternalConns(*jsnCfg.IPsConns, utils.MetaIPs) } - if jsnCfg.Resources_conns != nil { - scfg.ResSConns = make([]string, len(*jsnCfg.Resources_conns)) - for idx, connID := range *jsnCfg.Resources_conns { + if jsnCfg.ResourceSConns != nil { + scfg.ResourceSConns = make([]string, len(*jsnCfg.ResourceSConns)) + for idx, connID := range *jsnCfg.ResourceSConns { // if we have the connection internal we change the name so we can have internal rpc for each subsystem - scfg.ResSConns[idx] = connID + scfg.ResourceSConns[idx] = connID if connID == utils.MetaInternal { - scfg.ResSConns[idx] = utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources) + scfg.ResourceSConns[idx] = utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources) } } } - if jsnCfg.Thresholds_conns != nil { - scfg.ThreshSConns = make([]string, len(*jsnCfg.Thresholds_conns)) - for idx, connID := range *jsnCfg.Thresholds_conns { + if jsnCfg.ThresholdSConns != nil { + scfg.ThresholdSConns = make([]string, len(*jsnCfg.ThresholdSConns)) + for idx, connID := range *jsnCfg.ThresholdSConns { // if we have the connection internal we change the name so we can have internal rpc for each subsystem - scfg.ThreshSConns[idx] = connID + scfg.ThresholdSConns[idx] = connID if connID == utils.MetaInternal { - scfg.ThreshSConns[idx] = utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds) + scfg.ThresholdSConns[idx] = utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds) } } } - if jsnCfg.Stats_conns != nil { - scfg.StatSConns = make([]string, len(*jsnCfg.Stats_conns)) - for idx, connID := range *jsnCfg.Stats_conns { + if jsnCfg.StatSConns != nil { + scfg.StatSConns = make([]string, len(*jsnCfg.StatSConns)) + for idx, connID := range *jsnCfg.StatSConns { // if we have the connection internal we change the name so we can have internal rpc for each subsystem scfg.StatSConns[idx] = connID if connID == utils.MetaInternal { @@ -203,9 +203,9 @@ func (scfg *SessionSCfg) loadFromJSONCfg(jsnCfg *SessionSJsonCfg) (err error) { } } } - if jsnCfg.Routes_conns != nil { - scfg.RouteSConns = make([]string, len(*jsnCfg.Routes_conns)) - for idx, connID := range *jsnCfg.Routes_conns { + if jsnCfg.RouteSConns != nil { + scfg.RouteSConns = make([]string, len(*jsnCfg.RouteSConns)) + for idx, connID := range *jsnCfg.RouteSConns { // if we have the connection internal we change the name so we can have internal rpc for each subsystem scfg.RouteSConns[idx] = connID if connID == utils.MetaInternal { @@ -213,19 +213,19 @@ func (scfg *SessionSCfg) loadFromJSONCfg(jsnCfg *SessionSJsonCfg) (err error) { } } } - if jsnCfg.Attributes_conns != nil { - scfg.AttrSConns = make([]string, len(*jsnCfg.Attributes_conns)) - for idx, connID := range *jsnCfg.Attributes_conns { + if jsnCfg.AttributeSConns != nil { + scfg.AttributeSConns = make([]string, len(*jsnCfg.AttributeSConns)) + for idx, connID := range *jsnCfg.AttributeSConns { // if we have the connection internal we change the name so we can have internal rpc for each subsystem - scfg.AttrSConns[idx] = connID + scfg.AttributeSConns[idx] = connID if connID == utils.MetaInternal { - scfg.AttrSConns[idx] = utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes) + scfg.AttributeSConns[idx] = utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes) } } } - if jsnCfg.Cdrs_conns != nil { - scfg.CDRsConns = make([]string, len(*jsnCfg.Cdrs_conns)) - for idx, connID := range *jsnCfg.Cdrs_conns { + if jsnCfg.CDRsConns != nil { + scfg.CDRsConns = make([]string, len(*jsnCfg.CDRsConns)) + for idx, connID := range *jsnCfg.CDRsConns { // if we have the connection internal we change the name so we can have internal rpc for each subsystem scfg.CDRsConns[idx] = connID if connID == utils.MetaInternal { @@ -233,93 +233,93 @@ func (scfg *SessionSCfg) loadFromJSONCfg(jsnCfg *SessionSJsonCfg) (err error) { } } } - if jsnCfg.Replication_conns != nil { - scfg.ReplicationConns = make([]string, len(*jsnCfg.Replication_conns)) - for idx, connID := range *jsnCfg.Replication_conns { + if jsnCfg.ReplicationConns != nil { + scfg.ReplicationConns = make([]string, len(*jsnCfg.ReplicationConns)) + for idx, connID := range *jsnCfg.ReplicationConns { if connID == utils.MetaInternal { return fmt.Errorf("Replication connection ID needs to be different than *internal") } scfg.ReplicationConns[idx] = connID } } - if jsnCfg.Debit_interval != nil { - if scfg.DebitInterval, err = utils.ParseDurationWithNanosecs(*jsnCfg.Debit_interval); err != nil { + if jsnCfg.DebitInterval != nil { + if scfg.DebitInterval, err = utils.ParseDurationWithNanosecs(*jsnCfg.DebitInterval); err != nil { return err } } - if jsnCfg.Store_session_costs != nil { - scfg.StoreSCosts = *jsnCfg.Store_session_costs + if jsnCfg.StoreSCosts != nil { + scfg.StoreSCosts = *jsnCfg.StoreSCosts } - if jsnCfg.Session_ttl != nil { - if scfg.SessionTTL, err = utils.ParseDurationWithNanosecs(*jsnCfg.Session_ttl); err != nil { + if jsnCfg.SessionTTL != nil { + if scfg.SessionTTL, err = utils.ParseDurationWithNanosecs(*jsnCfg.SessionTTL); err != nil { return err } } - if jsnCfg.Session_ttl_max_delay != nil { + if jsnCfg.SessionTTLMaxDelay != nil { var maxTTLDelay time.Duration - if maxTTLDelay, err = utils.ParseDurationWithNanosecs(*jsnCfg.Session_ttl_max_delay); err != nil { + if maxTTLDelay, err = utils.ParseDurationWithNanosecs(*jsnCfg.SessionTTLMaxDelay); err != nil { return err } scfg.SessionTTLMaxDelay = &maxTTLDelay } - if jsnCfg.Session_ttl_last_used != nil { + if jsnCfg.SessionTTLLastUsed != nil { var sessionTTLLastUsed time.Duration - if sessionTTLLastUsed, err = utils.ParseDurationWithNanosecs(*jsnCfg.Session_ttl_last_used); err != nil { + if sessionTTLLastUsed, err = utils.ParseDurationWithNanosecs(*jsnCfg.SessionTTLLastUsed); err != nil { return err } scfg.SessionTTLLastUsed = &sessionTTLLastUsed } - if jsnCfg.Session_ttl_usage != nil { + if jsnCfg.SessionTTLUsage != nil { var sessionTTLUsage time.Duration - if sessionTTLUsage, err = utils.ParseDurationWithNanosecs(*jsnCfg.Session_ttl_usage); err != nil { + if sessionTTLUsage, err = utils.ParseDurationWithNanosecs(*jsnCfg.SessionTTLUsage); err != nil { return err } scfg.SessionTTLUsage = &sessionTTLUsage } - if jsnCfg.Session_ttl_last_usage != nil { + if jsnCfg.SessionTTLLastUsage != nil { var sessionTTLLastUsage time.Duration - if sessionTTLLastUsage, err = utils.ParseDurationWithNanosecs(*jsnCfg.Session_ttl_last_usage); err != nil { + if sessionTTLLastUsage, err = utils.ParseDurationWithNanosecs(*jsnCfg.SessionTTLLastUsage); err != nil { return err } scfg.SessionTTLLastUsage = &sessionTTLLastUsage } - if jsnCfg.Session_indexes != nil { - scfg.SessionIndexes = utils.NewStringSet(*jsnCfg.Session_indexes) + if jsnCfg.SessionIndexes != nil { + scfg.SessionIndexes = utils.NewStringSet(*jsnCfg.SessionIndexes) } - if jsnCfg.Client_protocol != nil { - scfg.ClientProtocol = *jsnCfg.Client_protocol + if jsnCfg.ClientProtocol != nil { + scfg.ClientProtocol = *jsnCfg.ClientProtocol } - if jsnCfg.Channel_sync_interval != nil { - if scfg.ChannelSyncInterval, err = utils.ParseDurationWithNanosecs(*jsnCfg.Channel_sync_interval); err != nil { + if jsnCfg.ChannelSyncInterval != nil { + if scfg.ChannelSyncInterval, err = utils.ParseDurationWithNanosecs(*jsnCfg.ChannelSyncInterval); err != nil { return err } } - if jsnCfg.Stale_chan_max_extra_usage != nil { - if scfg.StaleChanMaxExtraUsage, err = utils.ParseDurationWithNanosecs(*jsnCfg.Stale_chan_max_extra_usage); err != nil { + if jsnCfg.StaleChanMaxExtraUsage != nil { + if scfg.StaleChanMaxExtraUsage, err = utils.ParseDurationWithNanosecs(*jsnCfg.StaleChanMaxExtraUsage); err != nil { return err } } - if jsnCfg.Terminate_attempts != nil { - scfg.TerminateAttempts = *jsnCfg.Terminate_attempts + if jsnCfg.TerminateAttempts != nil { + scfg.TerminateAttempts = *jsnCfg.TerminateAttempts } - if jsnCfg.Alterable_fields != nil { - scfg.AlterableFields = utils.NewStringSet(*jsnCfg.Alterable_fields) + if jsnCfg.AlterableFields != nil { + scfg.AlterableFields = utils.NewStringSet(*jsnCfg.AlterableFields) } - if jsnCfg.Min_dur_low_balance != nil { - if scfg.MinDurLowBalance, err = utils.ParseDurationWithNanosecs(*jsnCfg.Min_dur_low_balance); err != nil { + if jsnCfg.MinDurLowBalance != nil { + if scfg.MinDurLowBalance, err = utils.ParseDurationWithNanosecs(*jsnCfg.MinDurLowBalance); err != nil { return err } } - if jsnCfg.Default_usage != nil { - for k, v := range *jsnCfg.Default_usage { + if jsnCfg.DefaultUsage != nil { + for k, v := range *jsnCfg.DefaultUsage { if scfg.DefaultUsage[k], err = utils.ParseDurationWithNanosecs(v); err != nil { return } } } - if jsnCfg.Scheduler_conns != nil { - scfg.SchedulerConns = make([]string, len(*jsnCfg.Scheduler_conns)) - for idx, connID := range *jsnCfg.Scheduler_conns { + if jsnCfg.SchedulerConns != nil { + scfg.SchedulerConns = make([]string, len(*jsnCfg.SchedulerConns)) + for idx, connID := range *jsnCfg.SchedulerConns { // if we have the connection internal we change the name so we can have internal rpc for each subsystem scfg.SchedulerConns[idx] = connID if connID == utils.MetaInternal { @@ -327,8 +327,8 @@ func (scfg *SessionSCfg) loadFromJSONCfg(jsnCfg *SessionSJsonCfg) (err error) { } } } - if jsnCfg.Backup_interval != nil { - if scfg.BackupInterval, err = utils.ParseDurationWithNanosecs(*jsnCfg.Backup_interval); err != nil { + if jsnCfg.BackupInterval != nil { + if scfg.BackupInterval, err = utils.ParseDurationWithNanosecs(*jsnCfg.BackupInterval); err != nil { return err } } @@ -354,8 +354,8 @@ func (scfg *SessionSCfg) AsMapInterface() (initialMP map[string]any) { } initialMP = map[string]any{ utils.EnabledCfg: scfg.Enabled, - utils.ListenBijsonCfg: scfg.ListenBijson, - utils.ListenBigobCfg: scfg.ListenBigob, + utils.ListenBijsonCfg: scfg.ListenBiJSON, + utils.ListenBigobCfg: scfg.ListenBiGob, utils.ReplicationConnsCfg: scfg.ReplicationConns, utils.IPsConnsCfg: stripInternalConns(scfg.IPsConns), utils.StoreSCostsCfg: scfg.StoreSCosts, @@ -419,9 +419,9 @@ func (scfg *SessionSCfg) AsMapInterface() (initialMP map[string]any) { } initialMP[utils.RALsConnsCfg] = RALsConns } - if scfg.ResSConns != nil { - resSConns := make([]string, len(scfg.ResSConns)) - for i, item := range scfg.ResSConns { + if scfg.ResourceSConns != nil { + resSConns := make([]string, len(scfg.ResourceSConns)) + for i, item := range scfg.ResourceSConns { resSConns[i] = item if item == utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources) { resSConns[i] = utils.MetaInternal @@ -429,9 +429,9 @@ func (scfg *SessionSCfg) AsMapInterface() (initialMP map[string]any) { } initialMP[utils.ResourceSConnsCfg] = resSConns } - if scfg.ThreshSConns != nil { - threshSConns := make([]string, len(scfg.ThreshSConns)) - for i, item := range scfg.ThreshSConns { + if scfg.ThresholdSConns != nil { + threshSConns := make([]string, len(scfg.ThresholdSConns)) + for i, item := range scfg.ThresholdSConns { threshSConns[i] = item if item == utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds) { threshSConns[i] = utils.MetaInternal @@ -459,9 +459,9 @@ func (scfg *SessionSCfg) AsMapInterface() (initialMP map[string]any) { } initialMP[utils.RouteSConnsCfg] = routesConns } - if scfg.AttrSConns != nil { - attrSConns := make([]string, len(scfg.AttrSConns)) - for i, item := range scfg.AttrSConns { + if scfg.AttributeSConns != nil { + attrSConns := make([]string, len(scfg.AttributeSConns)) + for i, item := range scfg.AttributeSConns { attrSConns[i] = item if item == utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes) { attrSConns[i] = utils.MetaInternal @@ -500,7 +500,7 @@ func (scfg *SessionSCfg) AsMapInterface() (initialMP map[string]any) { func (scfg SessionSCfg) Clone() (cln *SessionSCfg) { cln = &SessionSCfg{ Enabled: scfg.Enabled, - ListenBijson: scfg.ListenBijson, + ListenBiJSON: scfg.ListenBiJSON, IPsConns: slices.Clone(scfg.IPsConns), DebitInterval: scfg.DebitInterval, StoreSCosts: scfg.StoreSCosts, @@ -546,13 +546,13 @@ func (scfg SessionSCfg) Clone() (cln *SessionSCfg) { cln.RALsConns = make([]string, len(scfg.RALsConns)) copy(cln.RALsConns, scfg.RALsConns) } - if scfg.ResSConns != nil { - cln.ResSConns = make([]string, len(scfg.ResSConns)) - copy(cln.ResSConns, scfg.ResSConns) + if scfg.ResourceSConns != nil { + cln.ResourceSConns = make([]string, len(scfg.ResourceSConns)) + copy(cln.ResourceSConns, scfg.ResourceSConns) } - if scfg.ThreshSConns != nil { - cln.ThreshSConns = make([]string, len(scfg.ThreshSConns)) - copy(cln.ThreshSConns, scfg.ThreshSConns) + if scfg.ThresholdSConns != nil { + cln.ThresholdSConns = make([]string, len(scfg.ThresholdSConns)) + copy(cln.ThresholdSConns, scfg.ThresholdSConns) } if scfg.StatSConns != nil { cln.StatSConns = make([]string, len(scfg.StatSConns)) @@ -562,9 +562,9 @@ func (scfg SessionSCfg) Clone() (cln *SessionSCfg) { cln.RouteSConns = make([]string, len(scfg.RouteSConns)) copy(cln.RouteSConns, scfg.RouteSConns) } - if scfg.AttrSConns != nil { - cln.AttrSConns = make([]string, len(scfg.AttrSConns)) - copy(cln.AttrSConns, scfg.AttrSConns) + if scfg.AttributeSConns != nil { + cln.AttributeSConns = make([]string, len(scfg.AttributeSConns)) + copy(cln.AttributeSConns, scfg.AttributeSConns) } if scfg.CDRsConns != nil { cln.CDRsConns = make([]string, len(scfg.CDRsConns)) diff --git a/config/sessionscfg_test.go b/config/sessionscfg_test.go index 87223870d..2ad97b468 100644 --- a/config/sessionscfg_test.go +++ b/config/sessionscfg_test.go @@ -67,28 +67,28 @@ func TestFsAgentCfgloadFromJsonCfg1(t *testing.T) { func TestSessionSCfgloadFromJsonCfgCase1(t *testing.T) { cfgJSON := &SessionSJsonCfg{ - Enabled: utils.BoolPointer(true), - Listen_bijson: utils.StringPointer("127.0.0.1:2018"), - Chargers_conns: &[]string{utils.MetaInternal, "*conn1"}, - Rals_conns: &[]string{utils.MetaInternal, "*conn1"}, - Ips_conns: &[]string{utils.MetaInternal, "*conn1"}, - Resources_conns: &[]string{utils.MetaInternal, "*conn1"}, - Thresholds_conns: &[]string{utils.MetaInternal, "*conn1"}, - Stats_conns: &[]string{utils.MetaInternal, "*conn1"}, - Routes_conns: &[]string{utils.MetaInternal, "*conn1"}, - Attributes_conns: &[]string{utils.MetaInternal, "*conn1"}, - Cdrs_conns: &[]string{utils.MetaInternal, "*conn1"}, - Replication_conns: &[]string{"*conn1"}, - Debit_interval: utils.StringPointer("2"), - Store_session_costs: utils.BoolPointer(true), - Session_ttl: utils.StringPointer("0"), - Session_indexes: &[]string{}, - Client_protocol: utils.Float64Pointer(2.5), - Channel_sync_interval: utils.StringPointer("10"), - Terminate_attempts: utils.IntPointer(6), - Alterable_fields: &[]string{}, - Min_dur_low_balance: utils.StringPointer("1"), - Scheduler_conns: &[]string{utils.MetaInternal, "*conn1"}, + Enabled: utils.BoolPointer(true), + ListenBiJSON: utils.StringPointer("127.0.0.1:2018"), + ChargerSConns: &[]string{utils.MetaInternal, "*conn1"}, + RALsConns: &[]string{utils.MetaInternal, "*conn1"}, + IPsConns: &[]string{utils.MetaInternal, "*conn1"}, + ResourceSConns: &[]string{utils.MetaInternal, "*conn1"}, + ThresholdSConns: &[]string{utils.MetaInternal, "*conn1"}, + StatSConns: &[]string{utils.MetaInternal, "*conn1"}, + RouteSConns: &[]string{utils.MetaInternal, "*conn1"}, + AttributeSConns: &[]string{utils.MetaInternal, "*conn1"}, + CDRsConns: &[]string{utils.MetaInternal, "*conn1"}, + ReplicationConns: &[]string{"*conn1"}, + DebitInterval: utils.StringPointer("2"), + StoreSCosts: utils.BoolPointer(true), + SessionTTL: utils.StringPointer("0"), + SessionIndexes: &[]string{}, + ClientProtocol: utils.Float64Pointer(2.5), + ChannelSyncInterval: utils.StringPointer("10"), + TerminateAttempts: utils.IntPointer(6), + AlterableFields: &[]string{}, + MinDurLowBalance: utils.StringPointer("1"), + SchedulerConns: &[]string{utils.MetaInternal, "*conn1"}, Stir: &STIRJsonCfg{ Allowed_attest: &[]string{utils.MetaAny}, Payload_maxduration: utils.StringPointer("-1"), @@ -99,15 +99,15 @@ func TestSessionSCfgloadFromJsonCfgCase1(t *testing.T) { } expected := &SessionSCfg{ Enabled: true, - ListenBijson: "127.0.0.1:2018", + ListenBiJSON: "127.0.0.1:2018", ChargerSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaChargers), "*conn1"}, RALsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResponder), "*conn1"}, IPsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaIPs), "*conn1"}, - ResSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources), "*conn1"}, - ThreshSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds), "*conn1"}, + ResourceSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources), "*conn1"}, + ThresholdSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds), "*conn1"}, StatSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaStats), "*conn1"}, RouteSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaRoutes), "*conn1"}, - AttrSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes), "*conn1"}, + AttributeSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes), "*conn1"}, CDRsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs), "*conn1"}, ReplicationConns: []string{"*conn1"}, DebitInterval: 2, @@ -144,7 +144,7 @@ func TestSessionSCfgloadFromJsonCfgCase1(t *testing.T) { func TestSessionSCfgloadFromJsonCfgCase2(t *testing.T) { cfgJSON := &SessionSJsonCfg{ - Replication_conns: &[]string{utils.MetaInternal}, + ReplicationConns: &[]string{utils.MetaInternal}, } expected := "Replication connection ID needs to be different than *internal" jsonCfg := NewDefaultCGRConfig() @@ -155,7 +155,7 @@ func TestSessionSCfgloadFromJsonCfgCase2(t *testing.T) { func TestSessionSCfgloadFromJsonCfgCase3(t *testing.T) { cfgJSON := &SessionSJsonCfg{ - Debit_interval: utils.StringPointer("1ss"), + DebitInterval: utils.StringPointer("1ss"), } expected := "time: unknown unit \"ss\" in duration \"1ss\"" jsonCfg := NewDefaultCGRConfig() @@ -166,7 +166,7 @@ func TestSessionSCfgloadFromJsonCfgCase3(t *testing.T) { func TestSessionSCfgloadFromJsonCfgCase5(t *testing.T) { cfgJSON := &SessionSJsonCfg{ - Session_ttl: utils.StringPointer("1ss"), + SessionTTL: utils.StringPointer("1ss"), } expected := "time: unknown unit \"ss\" in duration \"1ss\"" jsonCfg := NewDefaultCGRConfig() @@ -177,7 +177,7 @@ func TestSessionSCfgloadFromJsonCfgCase5(t *testing.T) { func TestSessionSCfgloadFromJsonCfgCase7(t *testing.T) { cfgJSON := &SessionSJsonCfg{ - Channel_sync_interval: utils.StringPointer("1ss"), + ChannelSyncInterval: utils.StringPointer("1ss"), } expected := "time: unknown unit \"ss\" in duration \"1ss\"" jsonCfg := NewDefaultCGRConfig() @@ -188,7 +188,7 @@ func TestSessionSCfgloadFromJsonCfgCase7(t *testing.T) { func TestSessionSCfgloadFromJsonCfgCase8(t *testing.T) { cfgJSON := &SessionSJsonCfg{ - Min_dur_low_balance: utils.StringPointer("1ss"), + MinDurLowBalance: utils.StringPointer("1ss"), } expected := "time: unknown unit \"ss\" in duration \"1ss\"" jsonCfg := NewDefaultCGRConfig() @@ -199,7 +199,7 @@ func TestSessionSCfgloadFromJsonCfgCase8(t *testing.T) { func TestSessionSCfgloadFromJsonCfgCase9(t *testing.T) { cfgJSON := &SessionSJsonCfg{ - Session_ttl_last_usage: utils.StringPointer("1ss"), + SessionTTLLastUsage: utils.StringPointer("1ss"), } expected := "time: unknown unit \"ss\" in duration \"1ss\"" jsonCfg := NewDefaultCGRConfig() @@ -207,21 +207,21 @@ func TestSessionSCfgloadFromJsonCfgCase9(t *testing.T) { t.Errorf("Expected %+v, received %+v", expected, err) } cfgJSON1 := &SessionSJsonCfg{ - Session_ttl_last_used: utils.StringPointer("1ss"), + SessionTTLLastUsed: utils.StringPointer("1ss"), } jsonCfg = NewDefaultCGRConfig() if err := jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON1); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } cfgJSON2 := &SessionSJsonCfg{ - Session_ttl_max_delay: utils.StringPointer("1ss"), + SessionTTLMaxDelay: utils.StringPointer("1ss"), } jsonCfg = NewDefaultCGRConfig() if err := jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON2); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } cfgJSON3 := &SessionSJsonCfg{ - Session_ttl_usage: utils.StringPointer("1ss"), + SessionTTLUsage: utils.StringPointer("1ss"), } jsonCfg = NewDefaultCGRConfig() if err := jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON3); err == nil || err.Error() != expected { @@ -231,22 +231,22 @@ func TestSessionSCfgloadFromJsonCfgCase9(t *testing.T) { func TestSessionSCfgloadFromJsonCfgCase10(t *testing.T) { cfgJSON := &SessionSJsonCfg{ - Session_ttl_last_usage: utils.StringPointer("1"), - Session_ttl_last_used: utils.StringPointer("10"), - Session_ttl_max_delay: utils.StringPointer("100"), - Session_ttl_usage: utils.StringPointer("1"), + SessionTTLLastUsage: utils.StringPointer("1"), + SessionTTLLastUsed: utils.StringPointer("10"), + SessionTTLMaxDelay: utils.StringPointer("100"), + SessionTTLUsage: utils.StringPointer("1"), } expected := &SessionSCfg{ Enabled: false, - ListenBijson: "127.0.0.1:2014", + ListenBiJSON: "127.0.0.1:2014", ChargerSConns: []string{}, RALsConns: []string{}, IPsConns: []string{}, - ResSConns: []string{}, - ThreshSConns: []string{}, + ResourceSConns: []string{}, + ThresholdSConns: []string{}, StatSConns: []string{}, RouteSConns: []string{}, - AttrSConns: []string{}, + AttributeSConns: []string{}, CDRsConns: []string{}, ReplicationConns: []string{}, DebitInterval: 0, @@ -300,7 +300,7 @@ func TestSessionSCfgloadFromJsonCfgCase11(t *testing.T) { func TestSessionSCfgloadFromJsonCfgCase12(t *testing.T) { cfgJSON := &SessionSJsonCfg{ - Default_usage: &map[string]string{ + DefaultUsage: &map[string]string{ utils.MetaAny: "1ss", utils.MetaVoice: "1ss", utils.MetaData: "1ss", @@ -950,15 +950,15 @@ func TestFsAgentCfgClone(t *testing.T) { func TestSessionSCfgClone(t *testing.T) { ban := &SessionSCfg{ Enabled: true, - ListenBijson: "127.0.0.1:2018", + ListenBiJSON: "127.0.0.1:2018", ChargerSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaChargers), "*conn1"}, RALsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResponder), "*conn1"}, IPsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaIPs), "*conn1"}, - ResSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources), "*conn1"}, - ThreshSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds), "*conn1"}, + ResourceSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources), "*conn1"}, + ThresholdSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds), "*conn1"}, StatSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaStats), "*conn1"}, RouteSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaRoutes), "*conn1"}, - AttrSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes), "*conn1"}, + AttributeSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes), "*conn1"}, CDRsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs), "*conn1"}, ReplicationConns: []string{"*conn1"}, DebitInterval: 2, @@ -1003,10 +1003,10 @@ func TestSessionSCfgClone(t *testing.T) { if rcv.IPsConns[1] = ""; ban.IPsConns[1] != "*conn1" { t.Errorf("Expected clone to not modify the cloned") } - if rcv.ResSConns[1] = ""; ban.ResSConns[1] != "*conn1" { + if rcv.ResourceSConns[1] = ""; ban.ResourceSConns[1] != "*conn1" { t.Errorf("Expected clone to not modify the cloned") } - if rcv.ThreshSConns[1] = ""; ban.ThreshSConns[1] != "*conn1" { + if rcv.ThresholdSConns[1] = ""; ban.ThresholdSConns[1] != "*conn1" { t.Errorf("Expected clone to not modify the cloned") } if rcv.StatSConns[1] = ""; ban.StatSConns[1] != "*conn1" { @@ -1015,7 +1015,7 @@ func TestSessionSCfgClone(t *testing.T) { if rcv.RouteSConns[1] = ""; ban.RouteSConns[1] != "*conn1" { t.Errorf("Expected clone to not modify the cloned") } - if rcv.AttrSConns[1] = ""; ban.AttrSConns[1] != "*conn1" { + if rcv.AttributeSConns[1] = ""; ban.AttributeSConns[1] != "*conn1" { t.Errorf("Expected clone to not modify the cloned") } if rcv.CDRsConns[1] = ""; ban.CDRsConns[1] != "*conn1" { diff --git a/registrarc/libregistrarc.go b/registrarc/libregistrarc.go index 51ac467ff..d1cf42807 100644 --- a/registrarc/libregistrarc.go +++ b/registrarc/libregistrarc.go @@ -255,9 +255,9 @@ func getConnPort(cfg *config.CGRConfig, transport string, tls bool) (port string } extraPath = cfg.HTTPCfg().HTTPJsonRPCURL case rpcclient.BiRPCJSON: - address = cfg.SessionSCfg().ListenBijson + address = cfg.SessionSCfg().ListenBiJSON case rpcclient.BiRPCGOB: - address = cfg.SessionSCfg().ListenBigob + address = cfg.SessionSCfg().ListenBiGob } if _, port, err = net.SplitHostPort(address); err != nil { return diff --git a/services/asteriskagent_it_test.go b/services/asteriskagent_it_test.go index 1c254930e..1640e89cd 100644 --- a/services/asteriskagent_it_test.go +++ b/services/asteriskagent_it_test.go @@ -39,7 +39,7 @@ import ( func TestAsteriskAgentReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) @@ -113,7 +113,7 @@ func TestAsteriskAgentReload(t *testing.T) { func TestAsteriskAgentReload2(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) diff --git a/services/asteriskagent_test.go b/services/asteriskagent_test.go index 3fa9cca2c..79178b70f 100644 --- a/services/asteriskagent_test.go +++ b/services/asteriskagent_test.go @@ -33,7 +33,7 @@ import ( func TestAsteriskAgentCoverage(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil shdChan := utils.NewSyncedChan() @@ -88,7 +88,7 @@ func TestAsteriskAgentCoverage(t *testing.T) { func TestAsteriskReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil shdChan := utils.NewSyncedChan() diff --git a/services/datadb_it_test.go b/services/datadb_it_test.go index f7d37edca..4a80fbb97 100644 --- a/services/datadb_it_test.go +++ b/services/datadb_it_test.go @@ -681,7 +681,7 @@ func TestDataDBStartSessionSCfgErr(t *testing.T) { db := NewDataDBService(cfg, cM, false, srvDep) cfg.DataDbCfg().Type = "badtype" cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" err := db.Start() if err != nil { t.Errorf("\nExpecting <%+v>,\n Received <%+v>", nil, err) @@ -695,7 +695,7 @@ func TestDataDBStartRalsSCfgErr(t *testing.T) { db := NewDataDBService(cfg, cM, false, srvDep) cfg.DataDbCfg().Type = "badtype" db.cfg.RalsCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" err := db.Start() if err == nil || err.Error() != "unsupported db_type " { t.Errorf("\nExpecting <%+v>,\n Received <%+v>", "unsupported db_type ", err) diff --git a/services/diameteragent_it_test.go b/services/diameteragent_it_test.go index 8c4774941..2d3982bec 100644 --- a/services/diameteragent_it_test.go +++ b/services/diameteragent_it_test.go @@ -38,7 +38,7 @@ import ( func TestDiameterAgentReload1(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) @@ -110,7 +110,7 @@ func TestDiameterAgentReload1(t *testing.T) { func TestDiameterAgentReload2(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) diff --git a/services/dnsagent_it_test.go b/services/dnsagent_it_test.go index 9ecb6a0ad..a08a5bcbb 100644 --- a/services/dnsagent_it_test.go +++ b/services/dnsagent_it_test.go @@ -40,7 +40,7 @@ import ( func TestDNSAgentStartReloadShut(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" cfg.DNSAgentCfg().Enabled = true cfg.DNSAgentCfg().Listeners = []config.DnsListener{ { @@ -96,7 +96,7 @@ func TestDNSAgentReloadFirst(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) @@ -183,7 +183,7 @@ func TestDNSAgentReloadFirst(t *testing.T) { func TestDNSAgentReload2(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" cfg.DNSAgentCfg().Enabled = true cfg.DNSAgentCfg().Listeners[0].Network = "test" cfg.DNSAgentCfg().Listeners[0].Address = "test" diff --git a/services/dnsagent_test.go b/services/dnsagent_test.go index 0fe5b37d3..b1399ada9 100644 --- a/services/dnsagent_test.go +++ b/services/dnsagent_test.go @@ -32,7 +32,7 @@ import ( func TestDNSAgentCoverage(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil shdChan := utils.NewSyncedChan() diff --git a/services/ers_it_test.go b/services/ers_it_test.go index 897ab79d6..19106a873 100644 --- a/services/ers_it_test.go +++ b/services/ers_it_test.go @@ -52,7 +52,7 @@ func TestEventReaderSReload(t *testing.T) { utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil shdChan := utils.NewSyncedChan() diff --git a/services/freeswitchagent_it_test.go b/services/freeswitchagent_it_test.go index 76889b315..f80b7d5ee 100644 --- a/services/freeswitchagent_it_test.go +++ b/services/freeswitchagent_it_test.go @@ -41,7 +41,7 @@ func TestFreeSwitchAgentReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) @@ -100,7 +100,7 @@ func TestFreeSwitchAgentReload2(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) @@ -140,7 +140,7 @@ func TestFreeSwitchAgentReload3(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) diff --git a/services/freeswitchagent_test.go b/services/freeswitchagent_test.go index 83d06d7e8..b04c5263f 100644 --- a/services/freeswitchagent_test.go +++ b/services/freeswitchagent_test.go @@ -33,7 +33,7 @@ import ( func TestFreeSwitchAgentCoverage(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil shdChan := utils.NewSyncedChan() diff --git a/services/httpagent_it_test.go b/services/httpagent_it_test.go index 462aab60c..cb527756b 100644 --- a/services/httpagent_it_test.go +++ b/services/httpagent_it_test.go @@ -39,7 +39,7 @@ import ( func TestHTTPAgentReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) diff --git a/services/kamailioagent_it_test.go b/services/kamailioagent_it_test.go index f1c81d6bf..f96465f9d 100644 --- a/services/kamailioagent_it_test.go +++ b/services/kamailioagent_it_test.go @@ -43,7 +43,7 @@ func TestKamailioAgentReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) @@ -122,7 +122,7 @@ func TestKamailioAgentReload(t *testing.T) { func TestKamailioAgentReload2(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) @@ -147,7 +147,7 @@ func TestKamailioAgentReload2(t *testing.T) { func TestKamailioAgentReload3(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) diff --git a/services/kamailioagent_test.go b/services/kamailioagent_test.go index 6bda03207..577e715a2 100644 --- a/services/kamailioagent_test.go +++ b/services/kamailioagent_test.go @@ -35,7 +35,7 @@ func TestKamailioAgentCoverage(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil shdChan := utils.NewSyncedChan() diff --git a/services/radiusagent_it_test.go b/services/radiusagent_it_test.go index 147eed9cd..5096772a1 100644 --- a/services/radiusagent_it_test.go +++ b/services/radiusagent_it_test.go @@ -40,7 +40,7 @@ import ( func TestRadiusAgentReloadStartShut(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" cfg.RadiusAgentCfg().Enabled = true cfg.RadiusAgentCfg().Listeners = []config.RadiusListener{ { @@ -98,7 +98,7 @@ func TestRadiusAgentReload1(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) diff --git a/services/radiusagent_test.go b/services/radiusagent_test.go index ed40bc726..e6ec902a1 100644 --- a/services/radiusagent_test.go +++ b/services/radiusagent_test.go @@ -33,7 +33,7 @@ import ( func TestRadiusAgentCoverage(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil shdChan := utils.NewSyncedChan() diff --git a/services/sessions.go b/services/sessions.go index 2db3d7808..fb080e091 100644 --- a/services/sessions.go +++ b/services/sessions.go @@ -113,7 +113,7 @@ func (smg *SessionService) Start() error { smg.server.RpcRegister(legacySrv) } // Register BiRpc handlers - if smg.cfg.SessionSCfg().ListenBijson != "" { + if smg.cfg.SessionSCfg().ListenBiJSON != "" { smg.birpcEnabled = true smg.server.BiRPCRegisterName(utils.SessionSv1, srv) // run this in it's own goroutine @@ -123,8 +123,8 @@ func (smg *SessionService) Start() error { } func (smg *SessionService) start() (err error) { - if err := smg.server.ServeBiRPC(smg.cfg.SessionSCfg().ListenBijson, - smg.cfg.SessionSCfg().ListenBigob, smg.sm.OnBiJSONConnect, smg.sm.OnBiJSONDisconnect); err != nil { + if err := smg.server.ServeBiRPC(smg.cfg.SessionSCfg().ListenBiJSON, + smg.cfg.SessionSCfg().ListenBiGob, smg.sm.OnBiJSONConnect, smg.sm.OnBiJSONDisconnect); err != nil { utils.Logger.Err(fmt.Sprintf("<%s> serve BiRPC error: %s!", utils.SessionS, err)) smg.Lock() smg.birpcEnabled = false diff --git a/services/sipagent_it_test.go b/services/sipagent_it_test.go index 0cd942c49..506f2e660 100644 --- a/services/sipagent_it_test.go +++ b/services/sipagent_it_test.go @@ -40,7 +40,7 @@ func TestSIPAgentReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) @@ -110,7 +110,7 @@ func TestSIPAgentReload(t *testing.T) { func TestSIPAgentReload2(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) @@ -147,7 +147,7 @@ func TestSIPAgentReload2(t *testing.T) { func TestSIPAgentReload3(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) diff --git a/services/sipagent_test.go b/services/sipagent_test.go index fb8cf45a8..78181edb7 100644 --- a/services/sipagent_test.go +++ b/services/sipagent_test.go @@ -33,7 +33,7 @@ import ( func TestSIPAgentCoverage(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - cfg.SessionSCfg().ListenBijson = "" + cfg.SessionSCfg().ListenBiJSON = "" filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil shdChan := utils.NewSyncedChan() diff --git a/sessions/sessions.go b/sessions/sessions.go index 67300b2fc..dd259f4fd 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -383,7 +383,7 @@ func (sS *SessionS) forceSTerminate(s *Session, extraUsage time.Duration, tUsage } } // release the resources for the session - if len(sS.cgrCfg.SessionSCfg().ResSConns) != 0 && s.ResourceID != "" { + if len(sS.cgrCfg.SessionSCfg().ResourceSConns) != 0 && s.ResourceID != "" { var reply string cgrEv := &utils.CGREvent{ Tenant: s.Tenant, @@ -397,7 +397,7 @@ func (sS *SessionS) forceSTerminate(s *Session, extraUsage time.Duration, tUsage cgrEv.APIOpts[utils.OptsResourcesUsageID] = s.ResourceID cgrEv.APIOpts[utils.OptsResourcesUnits] = 1 cgrEv.SetCloneable(true) - if err := sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().ResSConns, + if err := sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().ResourceSConns, utils.ResourceSv1ReleaseResources, cgrEv, &reply); err != nil { utils.Logger.Warning( @@ -2187,7 +2187,7 @@ func (sS *SessionS) BiRPCv1AuthorizeEvent(ctx *context.Context, authReply.MaxUsage = &maxUsage } if args.AuthorizeResources { - if len(sS.cgrCfg.SessionSCfg().ResSConns) == 0 { + if len(sS.cgrCfg.SessionSCfg().ResourceSConns) == 0 { return utils.NewErrNotConnected(utils.ResourceS) } originID, _ := args.CGREvent.FieldAsString(utils.OriginID) @@ -2200,7 +2200,7 @@ func (sS *SessionS) BiRPCv1AuthorizeEvent(ctx *context.Context, } args.CGREvent.APIOpts[utils.OptsResourcesUsageID] = originID args.CGREvent.APIOpts[utils.OptsResourcesUnits] = 1 - if err = sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().ResSConns, utils.ResourceSv1AuthorizeResources, + if err = sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().ResourceSConns, utils.ResourceSv1AuthorizeResources, args.CGREvent, &allocMsg); err != nil { return utils.NewErrResourceS(err) } @@ -2458,7 +2458,7 @@ func (sS *SessionS) BiRPCv1InitiateSession(ctx *context.Context, } } if args.AllocateResources { - if len(sS.cgrCfg.SessionSCfg().ResSConns) == 0 { + if len(sS.cgrCfg.SessionSCfg().ResourceSConns) == 0 { return utils.NewErrNotConnected(utils.ResourceS) } if originID == "" { @@ -2470,7 +2470,7 @@ func (sS *SessionS) BiRPCv1InitiateSession(ctx *context.Context, args.CGREvent.APIOpts[utils.OptsResourcesUsageID] = originID args.CGREvent.APIOpts[utils.OptsResourcesUnits] = 1 var allocMessage string - if err = sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().ResSConns, + if err = sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().ResourceSConns, utils.ResourceSv1AllocateResources, args.CGREvent, &allocMessage); err != nil { return utils.NewErrResourceS(err) } @@ -2918,7 +2918,7 @@ func (sS *SessionS) BiRPCv1TerminateSession(ctx *context.Context, } } if args.ReleaseResources { - if len(sS.cgrCfg.SessionSCfg().ResSConns) == 0 { + if len(sS.cgrCfg.SessionSCfg().ResourceSConns) == 0 { return utils.NewErrNotConnected(utils.ResourceS) } if originID == "" { @@ -2930,7 +2930,7 @@ func (sS *SessionS) BiRPCv1TerminateSession(ctx *context.Context, } args.CGREvent.APIOpts[utils.OptsResourcesUsageID] = originID // same ID should be accepted by first group since the previous resource should be expired args.CGREvent.APIOpts[utils.OptsResourcesUnits] = 1 - if err = sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().ResSConns, utils.ResourceSv1ReleaseResources, + if err = sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().ResourceSConns, utils.ResourceSv1ReleaseResources, args.CGREvent, &reply); err != nil { return utils.NewErrResourceS(err) } @@ -3200,7 +3200,7 @@ func (sS *SessionS) BiRPCv1ProcessMessage(ctx *context.Context, } } if args.AllocateResources { - if len(sS.cgrCfg.SessionSCfg().ResSConns) == 0 { + if len(sS.cgrCfg.SessionSCfg().ResourceSConns) == 0 { return utils.NewErrNotConnected(utils.ResourceS) } if originID == "" { @@ -3212,7 +3212,7 @@ func (sS *SessionS) BiRPCv1ProcessMessage(ctx *context.Context, args.CGREvent.APIOpts[utils.OptsResourcesUsageID] = originID args.CGREvent.APIOpts[utils.OptsResourcesUnits] = 1 var allocMessage string - if err = sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().ResSConns, utils.ResourceSv1AllocateResources, + if err = sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().ResourceSConns, utils.ResourceSv1AllocateResources, args.CGREvent, &allocMessage); err != nil { return utils.NewErrResourceS(err) } @@ -3554,7 +3554,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(ctx *context.Context, // check for *resources if argsFlagsWithParams.GetBool(utils.MetaResources) { - if len(sS.cgrCfg.SessionSCfg().ResSConns) == 0 { + if len(sS.cgrCfg.SessionSCfg().ResourceSConns) == 0 { return utils.NewErrNotConnected(utils.ResourceS) } rply.ResourceAllocation = make(map[string]string) @@ -3575,7 +3575,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(ctx *context.Context, //check for subflags and convert them into utils.FlagsWithParams switch { case resOpt.Has(utils.MetaAuthorize): - if err = sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().ResSConns, utils.ResourceSv1AuthorizeResources, + if err = sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().ResourceSConns, utils.ResourceSv1AuthorizeResources, args.CGREvent, &resMessage); err != nil { if blockError { return utils.NewErrResourceS(err) @@ -3586,7 +3586,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(ctx *context.Context, withErrors = true } case resOpt.Has(utils.MetaAllocate): - if err = sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().ResSConns, utils.ResourceSv1AllocateResources, + if err = sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().ResourceSConns, utils.ResourceSv1AllocateResources, args.CGREvent, &resMessage); err != nil { if blockError { return utils.NewErrResourceS(err) @@ -3597,7 +3597,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(ctx *context.Context, withErrors = true } case resOpt.Has(utils.MetaRelease): - if err = sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().ResSConns, utils.ResourceSv1ReleaseResources, + if err = sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().ResourceSConns, utils.ResourceSv1ReleaseResources, args.CGREvent, &resMessage); err != nil { if blockError { return utils.NewErrResourceS(err) @@ -4062,7 +4062,7 @@ func (sS *SessionS) processCDR(cgrEv *utils.CGREvent, flags []string, rply *stri // processThreshold will receive the event and send it to ThresholdS to be processed func (sS *SessionS) processThreshold(cgrEv *utils.CGREvent, thIDs []string, clnb bool) (tIDs []string, err error) { - if len(sS.cgrCfg.SessionSCfg().ThreshSConns) == 0 { + if len(sS.cgrCfg.SessionSCfg().ThresholdSConns) == 0 { return tIDs, utils.NewErrNotConnected(utils.ThresholdS) } if cgrEv.APIOpts == nil { @@ -4074,7 +4074,7 @@ func (sS *SessionS) processThreshold(cgrEv *utils.CGREvent, thIDs []string, clnb } cgrEv.SetCloneable(clnb) //initialize the returned variable - err = sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().ThreshSConns, utils.ThresholdSv1ProcessEvent, cgrEv, &tIDs) + err = sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().ThresholdSConns, utils.ThresholdSv1ProcessEvent, cgrEv, &tIDs) return } @@ -4122,7 +4122,7 @@ func (sS *SessionS) getRoutes(cgrEv *utils.CGREvent, pag utils.Paginator, ignore // processAttributes will receive the event and send it to AttributeS to be processed func (sS *SessionS) processAttributes(cgrEv *utils.CGREvent, attrIDs []string, clnb bool) (rplyEv engine.AttrSProcessEventReply, err error) { - if len(sS.cgrCfg.SessionSCfg().AttrSConns) == 0 { + if len(sS.cgrCfg.SessionSCfg().AttributeSConns) == 0 { return rplyEv, utils.NewErrNotConnected(utils.AttributeS) } if cgrEv.APIOpts == nil { @@ -4135,7 +4135,7 @@ func (sS *SessionS) processAttributes(cgrEv *utils.CGREvent, attrIDs []string, utils.IfaceAsString(ctx), utils.MetaSessionS) cgrEv.SetCloneable(clnb) - err = sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().AttrSConns, utils.AttributeSv1ProcessEvent, + err = sS.connMgr.Call(context.TODO(), sS.cgrCfg.SessionSCfg().AttributeSConns, utils.AttributeSv1ProcessEvent, cgrEv, &rplyEv) if err == nil && !has && utils.IfaceAsString(rplyEv.APIOpts[utils.OptsContext]) == utils.MetaSessionS { delete(rplyEv.APIOpts, utils.OptsContext) diff --git a/sessions/sessions_birpc_it_test.go b/sessions/sessions_birpc_it_test.go index 1abcc91ef..e890eb99c 100644 --- a/sessions/sessions_birpc_it_test.go +++ b/sessions/sessions_birpc_it_test.go @@ -119,12 +119,12 @@ func testSessionsBiRPCApierRpcConn(t *testing.T) { if err != nil { t.Fatal(err) } - dummyClnt, err := utils.NewBiJSONrpcClient(sessionsBiRPCCfg.SessionSCfg().ListenBijson, + dummyClnt, err := utils.NewBiJSONrpcClient(sessionsBiRPCCfg.SessionSCfg().ListenBiJSON, srv) if err != nil { // First attempt is to make sure multiple clients are supported t.Fatal(err) } - if sessionsBiRPC, err = utils.NewBiJSONrpcClient(sessionsBiRPCCfg.SessionSCfg().ListenBijson, + if sessionsBiRPC, err = utils.NewBiJSONrpcClient(sessionsBiRPCCfg.SessionSCfg().ListenBiJSON, srv); err != nil { t.Fatal(err) } diff --git a/sessions/sessions_test.go b/sessions/sessions_test.go index 942a10afc..4402e8e0b 100644 --- a/sessions/sessions_test.go +++ b/sessions/sessions_test.go @@ -2744,7 +2744,7 @@ func TestBiJClntID(t *testing.T) { func TestBiRPCv1AuthorizeEventNoTenant(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.AttributeSCfg().Enabled = true - cfg.SessionSCfg().AttrSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.Attributes)} + cfg.SessionSCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.Attributes)} clMock := clMock(func(_ string, args any, reply any) error { rply, cancast := reply.(*engine.AttrSProcessEventReply) if !cancast { @@ -2817,7 +2817,7 @@ func TestBiRPCv1AuthorizeEventNoTenant(t *testing.T) { func TestBiRPCv1AuthorizeEventWithDigestNoTenant(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.AttributeSCfg().Enabled = true - cfg.SessionSCfg().AttrSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.Attributes)} + cfg.SessionSCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.Attributes)} clMock := clMock(func(_ string, args any, reply any) error { rply, cancast := reply.(*engine.AttrSProcessEventReply) if !cancast { @@ -2888,7 +2888,7 @@ func TestBiRPCv1AuthorizeEventWithDigestNoTenant(t *testing.T) { func TestBiRPCv1InitiateSessionNoTenant(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.AttributeSCfg().Enabled = true - cfg.SessionSCfg().AttrSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.Attributes)} + cfg.SessionSCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.Attributes)} clMock := clMock(func(_ string, args any, reply any) error { rply, cancast := reply.(*engine.AttrSProcessEventReply) if !cancast { @@ -2959,7 +2959,7 @@ func TestBiRPCv1InitiateSessionNoTenant(t *testing.T) { func TestBiRPCv1InitiateSessionWithDigestNoTenant(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.AttributeSCfg().Enabled = true - cfg.SessionSCfg().AttrSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.Attributes)} + cfg.SessionSCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.Attributes)} clMock := clMock(func(_ string, args any, reply any) error { rply, cancast := reply.(*engine.AttrSProcessEventReply) if !cancast { @@ -3027,7 +3027,7 @@ func TestBiRPCv1InitiateSessionWithDigestNoTenant(t *testing.T) { func TestBiRPCv1UpdateSessionNoTenant(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.AttributeSCfg().Enabled = true - cfg.SessionSCfg().AttrSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.Attributes)} + cfg.SessionSCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.Attributes)} clMock := clMock(func(_ string, args any, reply any) error { rply, cancast := reply.(*engine.AttrSProcessEventReply) if !cancast { @@ -3149,7 +3149,7 @@ func TestBiRPCv1TerminateSessionNoTenant(t *testing.T) { func TestBiRPCv1ProcessMessageNoTenant(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.AttributeSCfg().Enabled = true - cfg.SessionSCfg().AttrSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.Attributes)} + cfg.SessionSCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.Attributes)} clMock := clMock(func(_ string, args any, reply any) error { rply, cancast := reply.(*engine.AttrSProcessEventReply) if !cancast { @@ -3220,7 +3220,7 @@ func TestBiRPCv1ProcessMessageNoTenant(t *testing.T) { func TestBiRPCv1ProcessEventNoTenant(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.AttributeSCfg().Enabled = true - cfg.SessionSCfg().AttrSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.Attributes)} + cfg.SessionSCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.Attributes)} clMock := clMock(func(_ string, args any, reply any) error { rply, cancast := reply.(*engine.AttrSProcessEventReply) if !cancast { diff --git a/sessions/sessionscover_test.go b/sessions/sessionscover_test.go index 1f4c9d585..bb521ee54 100644 --- a/sessions/sessionscover_test.go +++ b/sessions/sessionscover_test.go @@ -346,7 +346,7 @@ func TestForceSTerminatorPostCDRs(t *testing.T) { func TestForceSTerminatorReleaseSession(t *testing.T) { log.SetOutput(io.Discard) cfg := config.NewDefaultCGRConfig() - cfg.SessionSCfg().ResSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} + cfg.SessionSCfg().ResourceSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} data, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items) if err != nil { t.Error(err) @@ -981,7 +981,7 @@ func TestDebitLoopSessionWarningSessions(t *testing.T) { sMock <- testMock1 cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().RALsConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaRALs)} - cfg.SessionSCfg().ResSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} + cfg.SessionSCfg().ResourceSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} cfg.SessionSCfg().MinDurLowBalance = 1 * time.Second data, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items) if err != nil { @@ -1042,7 +1042,7 @@ func TestDebitLoopSessionDisconnectSession(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.GeneralCfg().NodeID = "ClientConnID" cfg.SessionSCfg().RALsConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaRALs)} - cfg.SessionSCfg().ResSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} + cfg.SessionSCfg().ResourceSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} cfg.SessionSCfg().MinDurLowBalance = 1 * time.Second data, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items) if err != nil { @@ -1808,7 +1808,7 @@ func TestSyncSessions(t *testing.T) { chanInternal <- sTestMock cfg := config.NewDefaultCGRConfig() //cfg.GeneralCfg().ReplyTimeout = 1 - cfg.SessionSCfg().ResSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} + cfg.SessionSCfg().ResourceSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} cfg.CacheCfg().ReplicationConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaReplicator)} cfg.CacheCfg().Partitions[utils.CacheClosedSessions] = &config.CacheParamCfg{ Replicate: true, @@ -2599,7 +2599,7 @@ func TestBiRPCv1AuthorizeEvent(t *testing.T) { } expected = "NOT_CONNECTED: RouteS" - sessions.cgrCfg.SessionSCfg().AttrSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes)} + sessions.cgrCfg.SessionSCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes)} if err := sessions.BiRPCv1AuthorizeEvent(context.Background(), args, rply); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } @@ -2702,7 +2702,7 @@ func TestBiRPCv1AuthorizeEvent2(t *testing.T) { t.Errorf("Expected %+v, received %+v", expected, err) } - sessions.cgrCfg.SessionSCfg().ResSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} + sessions.cgrCfg.SessionSCfg().ResourceSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} if err := sessions.BiRPCv1AuthorizeEvent(context.Background(), args, rply); err != nil { t.Error(err) } @@ -2804,11 +2804,11 @@ func TestBiRPCv1AuthorizeEventWithDigest(t *testing.T) { chanInternal := make(chan birpc.ClientConnector, 1) chanInternal <- clnt cfg := config.NewDefaultCGRConfig() - cfg.SessionSCfg().AttrSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes)} + cfg.SessionSCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes)} cfg.SessionSCfg().ChargerSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaChargers)} - cfg.SessionSCfg().ResSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} + cfg.SessionSCfg().ResourceSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} cfg.SessionSCfg().RouteSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaRoutes)} - cfg.SessionSCfg().ThreshSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)} + cfg.SessionSCfg().ThresholdSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)} cfg.SessionSCfg().StatSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaStats)} cfg.CacheCfg().Partitions[utils.CacheRPCResponses].Limit = 0 data, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items) @@ -2919,8 +2919,8 @@ func TestBiRPCv1InitiateSession1(t *testing.T) { chanInternal <- clnt cfg := config.NewDefaultCGRConfig() cfg.CacheCfg().Partitions[utils.CacheRPCResponses].Limit = 1 - cfg.SessionSCfg().AttrSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes)} - cfg.SessionSCfg().ResSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} + cfg.SessionSCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes)} + cfg.SessionSCfg().ResourceSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} cfg.SessionSCfg().ChargerSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaChargers)} data, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items) if err != nil { @@ -2985,12 +2985,12 @@ func TestBiRPCv1InitiateSession1(t *testing.T) { args.AllocateResources = true args.AttributeIDs = []string{} - sessions.cgrCfg.SessionSCfg().ResSConns = []string{} + sessions.cgrCfg.SessionSCfg().ResourceSConns = []string{} expected = "NOT_CONNECTED: ResourceS" if err := sessions.BiRPCv1InitiateSession(context.Background(), args, rply); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } - sessions.cgrCfg.SessionSCfg().ResSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} + sessions.cgrCfg.SessionSCfg().ResourceSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} args = NewV1InitSessionArgs(true, []string{}, false, []string{}, false, []string{}, true, false, @@ -3065,8 +3065,8 @@ func TestBiRPCv1InitiateSession2(t *testing.T) { chanInternal <- clnt cfg := config.NewDefaultCGRConfig() cfg.CacheCfg().Partitions[utils.CacheRPCResponses].Limit = 1 - cfg.SessionSCfg().ThreshSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)} - cfg.SessionSCfg().ResSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} + cfg.SessionSCfg().ThresholdSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)} + cfg.SessionSCfg().ResourceSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} data, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items) if err != nil { t.Error(err) @@ -3204,11 +3204,11 @@ func TestBiRPCv1InitiateSessionWithDigest(t *testing.T) { chanInternal := make(chan birpc.ClientConnector, 1) chanInternal <- clnt cfg := config.NewDefaultCGRConfig() - cfg.SessionSCfg().AttrSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes)} + cfg.SessionSCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes)} cfg.SessionSCfg().ChargerSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaChargers)} - cfg.SessionSCfg().ResSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} + cfg.SessionSCfg().ResourceSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} cfg.SessionSCfg().RouteSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaRoutes)} - cfg.SessionSCfg().ThreshSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)} + cfg.SessionSCfg().ThresholdSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)} cfg.SessionSCfg().StatSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaStats)} cfg.CacheCfg().Partitions[utils.CacheRPCResponses].Limit = 0 data, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items) @@ -3281,7 +3281,7 @@ func TestBiRPCv1UpdateSession1(t *testing.T) { chanInternal <- clnt cfg := config.NewDefaultCGRConfig() cfg.CacheCfg().Partitions[utils.CacheRPCResponses].Limit = 1 - cfg.SessionSCfg().AttrSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes)} + cfg.SessionSCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes)} data, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items) if err != nil { t.Error(err) @@ -3591,7 +3591,7 @@ func TestBiRPCv1TerminateSession2(t *testing.T) { chanInternal := make(chan birpc.ClientConnector, 1) chanInternal <- clnt cfg := config.NewDefaultCGRConfig() - cfg.SessionSCfg().ResSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} + cfg.SessionSCfg().ResourceSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} data, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items) if err != nil { t.Error(err) @@ -3627,11 +3627,11 @@ func TestBiRPCv1TerminateSession2(t *testing.T) { args = NewV1TerminateSessionArgs(false, true, false, nil, false, nil, cgrEvent, true) expected = "NOT_CONNECTED: ResourceS" - sessions.cgrCfg.SessionSCfg().ResSConns = []string{} + sessions.cgrCfg.SessionSCfg().ResourceSConns = []string{} if err := sessions.BiRPCv1TerminateSession(context.Background(), args, &reply); err == nil || err.Error() != expected { t.Errorf("Exepected %+v, received %+v", expected, err) } - sessions.cgrCfg.SessionSCfg().ResSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} + sessions.cgrCfg.SessionSCfg().ResourceSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} cgrEvent.Tenant = "CHANGED_ID" args = NewV1TerminateSessionArgs(false, true, true, nil, true, nil, cgrEvent, true) @@ -3701,7 +3701,7 @@ func TestBiRPCv1ProcessMessage1(t *testing.T) { chanInternal <- clnt cfg := config.NewDefaultCGRConfig() cfg.CacheCfg().Partitions[utils.CacheRPCResponses].Limit = 1 - cfg.SessionSCfg().AttrSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes)} + cfg.SessionSCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes)} data, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items) if err != nil { t.Error(err) @@ -3808,7 +3808,7 @@ func TestBiRPCv1ProcessMessage2(t *testing.T) { chanInternal <- clnt cfg := config.NewDefaultCGRConfig() cfg.CacheCfg().Partitions[utils.CacheRPCResponses].Limit = 1 - cfg.SessionSCfg().ResSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} + cfg.SessionSCfg().ResourceSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} data, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items) if err != nil { t.Error(err) @@ -3989,7 +3989,7 @@ func TestBiRPCv1ProcessEvent(t *testing.T) { args.CGREvent.ID = "TEST_ID" args.Flags = append(args.Flags, utils.MetaAttributes) sessions.cgrCfg.SessionSCfg().ChargerSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaChargers)} - sessions.cgrCfg.SessionSCfg().AttrSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes)} + sessions.cgrCfg.SessionSCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes)} expected = "ATTRIBUTES_ERROR:NOT_IMPLEMENTED" if err := sessions.BiRPCv1ProcessEvent(context.Background(), args, &reply); err == nil || err.Error() != expected { t.Errorf("Exepected %+v, received %+v", expected, err) @@ -4005,14 +4005,14 @@ func TestBiRPCv1ProcessEvent(t *testing.T) { args.Flags = []string{utils.MetaRoutes, "*routes:*event_cost:2", utils.MetaThresholds} args.CGREvent.ID = "SECOND_ID" - sessions.cgrCfg.SessionSCfg().ThreshSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)} + sessions.cgrCfg.SessionSCfg().ThresholdSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)} expected = "PARTIALLY_EXECUTED" if err := sessions.BiRPCv1ProcessEvent(context.Background(), args, &reply); err == nil || err.Error() != expected { t.Errorf("Exepected %+v, received %+v", expected, err) } args.Flags = []string{utils.MetaThresholds, utils.MetaBlockerError} - sessions.cgrCfg.SessionSCfg().ThreshSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)} + sessions.cgrCfg.SessionSCfg().ThresholdSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)} expected = "THRESHOLDS_ERROR:NOT_IMPLEMENTED" if err := sessions.BiRPCv1ProcessEvent(context.Background(), args, &reply); err == nil || err.Error() != expected { t.Errorf("Exepected %+v, received %+v", expected, err) @@ -4157,7 +4157,7 @@ func TestBiRPCv1ProcessEventResources(t *testing.T) { if err := sessions.BiRPCv1ProcessEvent(context.Background(), args, &reply); err == nil || err.Error() != expected { t.Errorf("Exepected %+v, received %+v", expected, err) } - sessions.cgrCfg.SessionSCfg().ResSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} + sessions.cgrCfg.SessionSCfg().ResourceSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} args.Flags = append(args.Flags, utils.MetaResources) expected = "MANDATORY_IE_MISSING: [OriginID]" @@ -4665,7 +4665,7 @@ func TestBiRPCv1GetCost(t *testing.T) { if err := sessions.BiRPCv1GetCost(context.Background(), args, &reply); err == nil || err.Error() != expected { t.Errorf("Exepected %+v, received %+v", expected, err) } - sessions.cgrCfg.SessionSCfg().AttrSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes)} + sessions.cgrCfg.SessionSCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes)} expected = "MANDATORY_IE_MISSING: [connIDs]" if err := sessions.BiRPCv1GetCost(context.Background(), args, &reply); err == nil || err.Error() != expected { @@ -4713,7 +4713,7 @@ func TestSyncSessionsSync(t *testing.T) { tmp := engine.Cache engine.Cache.Clear(nil) cfg := config.NewDefaultCGRConfig() - cfg.SessionSCfg().ResSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} + cfg.SessionSCfg().ResourceSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)} cfg.CacheCfg().ReplicationConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaReplicator)} cfg.CacheCfg().Partitions[utils.CacheClosedSessions] = &config.CacheParamCfg{ Replicate: true,