diff --git a/apis/filter_indexes_it_test.go b/apis/filter_indexes_it_test.go
index 75073fe66..84557b9c4 100644
--- a/apis/filter_indexes_it_test.go
+++ b/apis/filter_indexes_it_test.go
@@ -3603,15 +3603,15 @@ func testV1FIdxSetRouteSProfileWithFltr(t *testing.T) {
{
ID: "local",
RateProfileIDs: []string{"RP_LOCAL"},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
{
ID: "mobile",
RateProfileIDs: []string{"RP_MOBILE"},
- Weight: 30,
+ Weights: utils.DynamicWeights{{Weight: 30}},
},
},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
}
if err := tFIdxRpc.Call(context.Background(), utils.AdminSv1SetRouteProfile,
@@ -3702,15 +3702,15 @@ func testV1FIdxSetRouteSMoreFltrsMoreIndexing(t *testing.T) {
{
ID: "local",
RateProfileIDs: []string{"RP_LOCAL"},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
{
ID: "mobile",
RateProfileIDs: []string{"RP_MOBILE"},
- Weight: 30,
+ Weights: utils.DynamicWeights{{Weight: 30}},
},
},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
}
if err := tFIdxRpc.Call(context.Background(), utils.AdminSv1SetRouteProfile,
@@ -3811,10 +3811,10 @@ func testV1FIdxRouteSMoreProfilesForFltrs(t *testing.T) {
{
ID: "route1",
RateProfileIDs: []string{"RP_LOCAL"},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
}
rtPrf2 := &RouteWithAPIOpts{
@@ -3828,10 +3828,10 @@ func testV1FIdxRouteSMoreProfilesForFltrs(t *testing.T) {
{
ID: "route2",
RateProfileIDs: []string{"RP_LOCAL"},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
}
var reply string
diff --git a/apis/loaders_it_test.go b/apis/loaders_it_test.go
index 9fa79c8c9..ab02f52ce 100644
--- a/apis/loaders_it_test.go
+++ b/apis/loaders_it_test.go
@@ -364,8 +364,8 @@ cgrates.org,RES_ACNT_1001,FLTR_ACCOUNT_1001,10,1h,1,,false,false,`
}
defer csvRoutes.Close()
- data = `#Tenant,ID,FilterIDs,Weight,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters
-cgrates.org,ROUTE_ACNT_1001,FLTR_ACCOUNT_1001,10,*weight,,route1,,,,,,20,,`
+ data = `#Tenant,ID,FilterIDs,Weights,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeights,RouteBlocker,RouteParameters
+cgrates.org,ROUTE_ACNT_1001,FLTR_ACCOUNT_1001,;10,*weight,,route1,,,,,,;20,,`
_, err = csvRoutes.WriteString(data)
if err != nil {
@@ -807,11 +807,11 @@ func testLoadersGetRouteProfile(t *testing.T) {
SortingParameters: []string{},
Routes: []*engine.Route{
{
- ID: "route1",
- Weight: 20,
+ ID: "route1",
+ Weights: utils.DynamicWeights{{Weight: 20}},
},
},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
}
var rplyRtPrf engine.RouteProfile
diff --git a/apis/routes_test.go b/apis/routes_test.go
index 085037b84..85c707c56 100644
--- a/apis/routes_test.go
+++ b/apis/routes_test.go
@@ -51,7 +51,7 @@ func TestRoutesSetGetRemRouteProfile(t *testing.T) {
Tenant: "cgrates.org",
ID: "routeID",
FilterIDs: []string{"*string:~*req.Account:1001"},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
}
@@ -221,9 +221,9 @@ func TestRoutesRemoveRouteProfileCheckErrors(t *testing.T) {
rtPrf := &RouteWithAPIOpts{
RouteProfile: &engine.RouteProfile{
- ID: "TestRoutesRemoveRouteProfileCheckErrors",
- Tenant: "cgrates.org",
- Weight: 10,
+ ID: "TestRoutesRemoveRouteProfileCheckErrors",
+ Tenant: "cgrates.org",
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
}
var reply string
diff --git a/cmd/cgr-console/cgr-console_it_test.go b/cmd/cgr-console/cgr-console_it_test.go
index 227208d11..dddaa9d62 100644
--- a/cmd/cgr-console/cgr-console_it_test.go
+++ b/cmd/cgr-console/cgr-console_it_test.go
@@ -444,7 +444,7 @@ func testConsoleItRoutesProfilesForEvent(t *testing.T) {
RateProfileIDs: nil,
ResourceIDs: nil,
StatIDs: nil,
- Weight: 10.,
+ Weights: utils.DynamicWeights{{Weight: 10.}},
Blocker: false,
RouteParameters: "",
},
@@ -455,12 +455,12 @@ func testConsoleItRoutesProfilesForEvent(t *testing.T) {
RateProfileIDs: nil,
ResourceIDs: nil,
StatIDs: nil,
- Weight: 20.,
+ Weights: utils.DynamicWeights{{Weight: 20.}},
Blocker: false,
RouteParameters: "",
},
},
- Weight: 20.,
+ Weights: utils.DynamicWeights{{Weight: 20.}},
},
}
if err := cmd.Run(); err != nil {
@@ -542,7 +542,7 @@ func testConsoleItRoutesProfile(t *testing.T) {
RateProfileIDs: nil,
ResourceIDs: nil,
StatIDs: nil,
- Weight: 10.,
+ Weights: utils.DynamicWeights{{Weight: 10.}},
Blocker: false,
RouteParameters: "",
},
@@ -553,12 +553,12 @@ func testConsoleItRoutesProfile(t *testing.T) {
RateProfileIDs: nil,
ResourceIDs: nil,
StatIDs: nil,
- Weight: 20.,
+ Weights: utils.DynamicWeights{{Weight: 20.}},
Blocker: false,
RouteParameters: "",
},
},
- Weight: 20.,
+ Weights: utils.DynamicWeights{{Weight: 20.}},
}
if err := cmd.Run(); err != nil {
t.Log(cmd.Args)
diff --git a/cmd/cgr-loader/cgr-loader_remove_it_test.go b/cmd/cgr-loader/cgr-loader_remove_it_test.go
index 98ba98248..66ed64034 100644
--- a/cmd/cgr-loader/cgr-loader_remove_it_test.go
+++ b/cmd/cgr-loader/cgr-loader_remove_it_test.go
@@ -538,17 +538,17 @@ func testCgrLdrGetRouteProfileAfterLoad(t *testing.T) {
ID: "ROUTE_ACNT_1001",
Tenant: "cgrates.org",
FilterIDs: []string{"FLTR_ACCOUNT_1001"},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
Sorting: utils.MetaWeight,
SortingParameters: []string{},
Routes: []*engine.Route{
{
- ID: "route1",
- Weight: 20,
+ ID: "route1",
+ Weights: utils.DynamicWeights{{Weight: 20}},
},
{
- ID: "route2",
- Weight: 10,
+ ID: "route2",
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
},
}
diff --git a/config/config_defaults.go b/config/config_defaults.go
index cc87eca14..4320122be 100644
--- a/config/config_defaults.go
+++ b/config/config_defaults.go
@@ -837,7 +837,7 @@ const CGRATES_CFG_JSON = `
{"tag": "Tenant", "path": "Tenant", "type": "*variable", "value": "~*req.0", "mandatory": true},
{"tag": "ID", "path": "ID", "type": "*variable", "value": "~*req.1", "mandatory": true},
{"tag": "FilterIDs", "path": "FilterIDs", "type": "*variable", "value": "~*req.2"},
- {"tag": "Weight", "path": "Weight", "type": "*variable", "value": "~*req.3"},
+ {"tag": "Weights", "path": "Weights", "type": "*variable", "value": "~*req.3"},
{"tag": "Sorting", "path": "Sorting", "type": "*variable", "value": "~*req.4"},
{"tag": "SortingParameters", "path": "SortingParameters", "type": "*variable", "value": "~*req.5"},
{"tag": "RouteID", "path": "RouteID", "type": "*variable", "value": "~*req.6"},
@@ -846,7 +846,7 @@ const CGRATES_CFG_JSON = `
{"tag": "RouteRateProfileIDs", "path": "RouteRateProfileIDs", "type": "*variable", "value": "~*req.9"},
{"tag": "RouteResourceIDs", "path": "RouteResourceIDs", "type": "*variable", "value": "~*req.10"},
{"tag": "RouteStatIDs", "path": "RouteStatIDs", "type": "*variable", "value": "~*req.11"},
- {"tag": "RouteWeight", "path": "RouteWeight", "type": "*variable", "value": "~*req.12"},
+ {"tag": "RouteWeights", "path": "RouteWeights", "type": "*variable", "value": "~*req.12"},
{"tag": "RouteBlocker", "path": "RouteBlocker", "type": "*variable", "value": "~*req.13"},
{"tag": "RouteParameters", "path": "RouteParameters", "type": "*variable", "value": "~*req.14"},
],
diff --git a/config/config_json_test.go b/config/config_json_test.go
index 431861fc8..39233d095 100644
--- a/config/config_json_test.go
+++ b/config/config_json_test.go
@@ -1159,8 +1159,8 @@ func TestDfLoaderJsonCfg(t *testing.T) {
Path: utils.StringPointer("FilterIDs"),
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer("~*req.2")},
- {Tag: utils.StringPointer("Weight"),
- Path: utils.StringPointer("Weight"),
+ {Tag: utils.StringPointer("Weights"),
+ Path: utils.StringPointer("Weights"),
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer("~*req.3")},
{Tag: utils.StringPointer("Sorting"),
@@ -1195,8 +1195,8 @@ func TestDfLoaderJsonCfg(t *testing.T) {
Path: utils.StringPointer("RouteStatIDs"),
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer("~*req.11")},
- {Tag: utils.StringPointer("RouteWeight"),
- Path: utils.StringPointer("RouteWeight"),
+ {Tag: utils.StringPointer("RouteWeights"),
+ Path: utils.StringPointer("RouteWeights"),
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer("~*req.12")},
{Tag: utils.StringPointer("RouteBlocker"),
diff --git a/config/config_test.go b/config/config_test.go
index eb2a58b70..8d6bcb5e8 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -2800,8 +2800,8 @@ func TestCgrLoaderCfgITDefaults(t *testing.T) {
Type: utils.MetaVariable,
Value: NewRSRParsersMustCompile("~*req.2", utils.InfieldSep),
Layout: time.RFC3339},
- {Tag: "Weight",
- Path: "Weight",
+ {Tag: "Weights",
+ Path: "Weights",
Type: utils.MetaVariable,
Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep),
Layout: time.RFC3339},
@@ -2845,8 +2845,8 @@ func TestCgrLoaderCfgITDefaults(t *testing.T) {
Type: utils.MetaVariable,
Value: NewRSRParsersMustCompile("~*req.11", utils.InfieldSep),
Layout: time.RFC3339},
- {Tag: "RouteWeight",
- Path: "RouteWeight",
+ {Tag: "RouteWeights",
+ Path: "RouteWeights",
Type: utils.MetaVariable,
Value: NewRSRParsersMustCompile("~*req.12", utils.InfieldSep),
Layout: time.RFC3339},
@@ -5118,7 +5118,7 @@ func TestV1GetConfigAsJSONDispatcherH(t *testing.T) {
func TestV1GetConfigAsJSONLoaders(t *testing.T) {
var reply string
- expected := `{"loaders":[{"caches_conns":["*internal"],"data":[{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Type","tag":"Type","type":"*variable","value":"~*req.2"},{"path":"Element","tag":"Element","type":"*variable","value":"~*req.3"},{"path":"Values","tag":"Values","type":"*variable","value":"~*req.4"}],"file_name":"Filters.csv","flags":null,"type":"*filters"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"TenantID","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ProfileID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"AttributeFilterIDs","tag":"AttributeFilterIDs","type":"*variable","value":"~*req.4"},{"path":"Path","tag":"Path","type":"*variable","value":"~*req.5"},{"path":"Type","tag":"Type","type":"*variable","value":"~*req.6"},{"path":"Value","tag":"Value","type":"*variable","value":"~*req.7"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.8"}],"file_name":"Attributes.csv","flags":null,"type":"*attributes"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"UsageTTL","tag":"TTL","type":"*variable","value":"~*req.4"},{"path":"Limit","tag":"Limit","type":"*variable","value":"~*req.5"},{"path":"AllocationMessage","tag":"AllocationMessage","type":"*variable","value":"~*req.6"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.7"},{"path":"Stored","tag":"Stored","type":"*variable","value":"~*req.8"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.9"}],"file_name":"Resources.csv","flags":null,"type":"*resources"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"QueueLength","tag":"QueueLength","type":"*variable","value":"~*req.4"},{"path":"TTL","tag":"TTL","type":"*variable","value":"~*req.5"},{"path":"MinItems","tag":"MinItems","type":"*variable","value":"~*req.6"},{"path":"MetricIDs","tag":"MetricIDs","type":"*variable","value":"~*req.7"},{"path":"MetricFilterIDs","tag":"MetricFilterIDs","type":"*variable","value":"~*req.8"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.9"},{"path":"Stored","tag":"Stored","type":"*variable","value":"~*req.10"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.11"}],"file_name":"Stats.csv","flags":null,"type":"*stats"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"MaxHits","tag":"MaxHits","type":"*variable","value":"~*req.4"},{"path":"MinHits","tag":"MinHits","type":"*variable","value":"~*req.5"},{"path":"MinSleep","tag":"MinSleep","type":"*variable","value":"~*req.6"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.7"},{"path":"ActionProfileIDs","tag":"ActionProfileIDs","type":"*variable","value":"~*req.8"},{"path":"Async","tag":"Async","type":"*variable","value":"~*req.9"}],"file_name":"Thresholds.csv","flags":null,"type":"*thresholds"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"Sorting","tag":"Sorting","type":"*variable","value":"~*req.4"},{"path":"SortingParameters","tag":"SortingParameters","type":"*variable","value":"~*req.5"},{"path":"RouteID","tag":"RouteID","type":"*variable","value":"~*req.6"},{"path":"RouteFilterIDs","tag":"RouteFilterIDs","type":"*variable","value":"~*req.7"},{"path":"RouteAccountIDs","tag":"RouteAccountIDs","type":"*variable","value":"~*req.8"},{"path":"RouteRateProfileIDs","tag":"RouteRateProfileIDs","type":"*variable","value":"~*req.9"},{"path":"RouteResourceIDs","tag":"RouteResourceIDs","type":"*variable","value":"~*req.10"},{"path":"RouteStatIDs","tag":"RouteStatIDs","type":"*variable","value":"~*req.11"},{"path":"RouteWeight","tag":"RouteWeight","type":"*variable","value":"~*req.12"},{"path":"RouteBlocker","tag":"RouteBlocker","type":"*variable","value":"~*req.13"},{"path":"RouteParameters","tag":"RouteParameters","type":"*variable","value":"~*req.14"}],"file_name":"Routes.csv","flags":null,"type":"*routes"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"RunID","tag":"RunID","type":"*variable","value":"~*req.4"},{"path":"AttributeIDs","tag":"AttributeIDs","type":"*variable","value":"~*req.5"}],"file_name":"Chargers.csv","flags":null,"type":"*chargers"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"Strategy","tag":"Strategy","type":"*variable","value":"~*req.4"},{"path":"StrategyParameters","tag":"StrategyParameters","type":"*variable","value":"~*req.5"},{"path":"ConnID","tag":"ConnID","type":"*variable","value":"~*req.6"},{"path":"ConnFilterIDs","tag":"ConnFilterIDs","type":"*variable","value":"~*req.7"},{"path":"ConnWeight","tag":"ConnWeight","type":"*variable","value":"~*req.8"},{"path":"ConnBlocker","tag":"ConnBlocker","type":"*variable","value":"~*req.9"},{"path":"ConnParameters","tag":"ConnParameters","type":"*variable","value":"~*req.10"}],"file_name":"DispatcherProfiles.csv","flags":null,"type":"*dispatchers"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Address","tag":"Address","type":"*variable","value":"~*req.2"},{"path":"Transport","tag":"Transport","type":"*variable","value":"~*req.3"},{"path":"ConnectAttempts","tag":"ConnectAttempts","type":"*variable","value":"~*req.4"},{"path":"Reconnects","tag":"Reconnects","type":"*variable","value":"~*req.5"},{"path":"ConnectTimeout","tag":"ConnectTimeout","type":"*variable","value":"~*req.6"},{"path":"ReplyTimeout","tag":"ReplyTimeout","type":"*variable","value":"~*req.7"},{"path":"TLS","tag":"TLS","type":"*variable","value":"~*req.8"},{"path":"ClientKey","tag":"ClientKey","type":"*variable","value":"~*req.9"},{"path":"ClientCertificate","tag":"ClientCertificate","type":"*variable","value":"~*req.10"},{"path":"CaCertificate","tag":"CaCertificate","type":"*variable","value":"~*req.11"}],"file_name":"DispatcherHosts.csv","flags":null,"type":"*dispatcher_hosts"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"MinCost","tag":"MinCost","type":"*variable","value":"~*req.4"},{"path":"MaxCost","tag":"MaxCost","type":"*variable","value":"~*req.5"},{"path":"MaxCostStrategy","tag":"MaxCostStrategy","type":"*variable","value":"~*req.6"},{"path":"RateID","tag":"RateID","type":"*variable","value":"~*req.7"},{"path":"RateFilterIDs","tag":"RateFilterIDs","type":"*variable","value":"~*req.8"},{"path":"RateActivationTimes","tag":"RateActivationTimes","type":"*variable","value":"~*req.9"},{"path":"RateWeight","tag":"RateWeight","type":"*variable","value":"~*req.10"},{"path":"RateBlocker","tag":"RateBlocker","type":"*variable","value":"~*req.11"},{"path":"RateIntervalStart","tag":"RateIntervalStart","type":"*variable","value":"~*req.12"},{"path":"RateFixedFee","tag":"RateFixedFee","type":"*variable","value":"~*req.13"},{"path":"RateRecurrentFee","tag":"RateRecurrentFee","type":"*variable","value":"~*req.14"},{"path":"RateUnit","tag":"RateUnit","type":"*variable","value":"~*req.15"},{"path":"RateIncrement","tag":"RateIncrement","type":"*variable","value":"~*req.16"}],"file_name":"RateProfiles.csv","flags":null,"type":"*rate_profiles"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"Schedule","tag":"Schedule","type":"*variable","value":"~*req.4"},{"path":"TargetType","tag":"TargetType","type":"*variable","value":"~*req.5"},{"path":"TargetIDs","tag":"TargetIDs","type":"*variable","value":"~*req.6"},{"path":"ActionID","tag":"ActionID","type":"*variable","value":"~*req.7"},{"path":"ActionFilterIDs","tag":"ActionFilterIDs","type":"*variable","value":"~*req.8"},{"path":"ActionBlocker","tag":"ActionBlocker","type":"*variable","value":"~*req.9"},{"path":"ActionTTL","tag":"ActionTTL","type":"*variable","value":"~*req.10"},{"path":"ActionType","tag":"ActionType","type":"*variable","value":"~*req.11"},{"path":"ActionOpts","tag":"ActionOpts","type":"*variable","value":"~*req.12"},{"path":"ActionPath","tag":"ActionPath","type":"*variable","value":"~*req.13"},{"path":"ActionValue","tag":"ActionValue","type":"*variable","value":"~*req.14"}],"file_name":"ActionProfiles.csv","flags":null,"type":"*action_profiles"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"BalanceID","tag":"BalanceID","type":"*variable","value":"~*req.4"},{"path":"BalanceFilterIDs","tag":"BalanceFilterIDs","type":"*variable","value":"~*req.5"},{"path":"BalanceWeight","tag":"BalanceWeight","type":"*variable","value":"~*req.6"},{"path":"BalanceBlocker","tag":"BalanceBlocker","type":"*variable","value":"~*req.7"},{"path":"BalanceType","tag":"BalanceType","type":"*variable","value":"~*req.8"},{"path":"BalanceOpts","tag":"BalanceOpts","type":"*variable","value":"~*req.9"},{"path":"BalanceCostIncrements","tag":"BalanceCostIncrements","type":"*variable","value":"~*req.10"},{"path":"BalanceAttributeIDs","tag":"BalanceAttributeIDs","type":"*variable","value":"~*req.11"},{"path":"BalanceRateProfileIDs","tag":"BalanceRateProfileIDs","type":"*variable","value":"~*req.12"},{"path":"BalanceUnitFactors","tag":"BalanceUnitFactors","type":"*variable","value":"~*req.13"},{"path":"BalanceUnits","tag":"BalanceUnits","type":"*variable","value":"~*req.14"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.15"}],"file_name":"Accounts.csv","flags":null,"type":"*accounts"}],"dry_run":false,"enabled":false,"field_separator":",","id":"*default","lock_filename":".cgr.lck","run_delay":"0","tenant":"","tp_in_dir":"/var/spool/cgrates/loader/in","tp_out_dir":"/var/spool/cgrates/loader/out"}]}`
+ expected := `{"loaders":[{"caches_conns":["*internal"],"data":[{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Type","tag":"Type","type":"*variable","value":"~*req.2"},{"path":"Element","tag":"Element","type":"*variable","value":"~*req.3"},{"path":"Values","tag":"Values","type":"*variable","value":"~*req.4"}],"file_name":"Filters.csv","flags":null,"type":"*filters"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"TenantID","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ProfileID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"AttributeFilterIDs","tag":"AttributeFilterIDs","type":"*variable","value":"~*req.4"},{"path":"Path","tag":"Path","type":"*variable","value":"~*req.5"},{"path":"Type","tag":"Type","type":"*variable","value":"~*req.6"},{"path":"Value","tag":"Value","type":"*variable","value":"~*req.7"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.8"}],"file_name":"Attributes.csv","flags":null,"type":"*attributes"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"UsageTTL","tag":"TTL","type":"*variable","value":"~*req.4"},{"path":"Limit","tag":"Limit","type":"*variable","value":"~*req.5"},{"path":"AllocationMessage","tag":"AllocationMessage","type":"*variable","value":"~*req.6"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.7"},{"path":"Stored","tag":"Stored","type":"*variable","value":"~*req.8"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.9"}],"file_name":"Resources.csv","flags":null,"type":"*resources"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"QueueLength","tag":"QueueLength","type":"*variable","value":"~*req.4"},{"path":"TTL","tag":"TTL","type":"*variable","value":"~*req.5"},{"path":"MinItems","tag":"MinItems","type":"*variable","value":"~*req.6"},{"path":"MetricIDs","tag":"MetricIDs","type":"*variable","value":"~*req.7"},{"path":"MetricFilterIDs","tag":"MetricFilterIDs","type":"*variable","value":"~*req.8"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.9"},{"path":"Stored","tag":"Stored","type":"*variable","value":"~*req.10"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.11"}],"file_name":"Stats.csv","flags":null,"type":"*stats"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"MaxHits","tag":"MaxHits","type":"*variable","value":"~*req.4"},{"path":"MinHits","tag":"MinHits","type":"*variable","value":"~*req.5"},{"path":"MinSleep","tag":"MinSleep","type":"*variable","value":"~*req.6"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.7"},{"path":"ActionProfileIDs","tag":"ActionProfileIDs","type":"*variable","value":"~*req.8"},{"path":"Async","tag":"Async","type":"*variable","value":"~*req.9"}],"file_name":"Thresholds.csv","flags":null,"type":"*thresholds"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weights","tag":"Weights","type":"*variable","value":"~*req.3"},{"path":"Sorting","tag":"Sorting","type":"*variable","value":"~*req.4"},{"path":"SortingParameters","tag":"SortingParameters","type":"*variable","value":"~*req.5"},{"path":"RouteID","tag":"RouteID","type":"*variable","value":"~*req.6"},{"path":"RouteFilterIDs","tag":"RouteFilterIDs","type":"*variable","value":"~*req.7"},{"path":"RouteAccountIDs","tag":"RouteAccountIDs","type":"*variable","value":"~*req.8"},{"path":"RouteRateProfileIDs","tag":"RouteRateProfileIDs","type":"*variable","value":"~*req.9"},{"path":"RouteResourceIDs","tag":"RouteResourceIDs","type":"*variable","value":"~*req.10"},{"path":"RouteStatIDs","tag":"RouteStatIDs","type":"*variable","value":"~*req.11"},{"path":"RouteWeights","tag":"RouteWeights","type":"*variable","value":"~*req.12"},{"path":"RouteBlocker","tag":"RouteBlocker","type":"*variable","value":"~*req.13"},{"path":"RouteParameters","tag":"RouteParameters","type":"*variable","value":"~*req.14"}],"file_name":"Routes.csv","flags":null,"type":"*routes"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"RunID","tag":"RunID","type":"*variable","value":"~*req.4"},{"path":"AttributeIDs","tag":"AttributeIDs","type":"*variable","value":"~*req.5"}],"file_name":"Chargers.csv","flags":null,"type":"*chargers"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"Strategy","tag":"Strategy","type":"*variable","value":"~*req.4"},{"path":"StrategyParameters","tag":"StrategyParameters","type":"*variable","value":"~*req.5"},{"path":"ConnID","tag":"ConnID","type":"*variable","value":"~*req.6"},{"path":"ConnFilterIDs","tag":"ConnFilterIDs","type":"*variable","value":"~*req.7"},{"path":"ConnWeight","tag":"ConnWeight","type":"*variable","value":"~*req.8"},{"path":"ConnBlocker","tag":"ConnBlocker","type":"*variable","value":"~*req.9"},{"path":"ConnParameters","tag":"ConnParameters","type":"*variable","value":"~*req.10"}],"file_name":"DispatcherProfiles.csv","flags":null,"type":"*dispatchers"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Address","tag":"Address","type":"*variable","value":"~*req.2"},{"path":"Transport","tag":"Transport","type":"*variable","value":"~*req.3"},{"path":"ConnectAttempts","tag":"ConnectAttempts","type":"*variable","value":"~*req.4"},{"path":"Reconnects","tag":"Reconnects","type":"*variable","value":"~*req.5"},{"path":"ConnectTimeout","tag":"ConnectTimeout","type":"*variable","value":"~*req.6"},{"path":"ReplyTimeout","tag":"ReplyTimeout","type":"*variable","value":"~*req.7"},{"path":"TLS","tag":"TLS","type":"*variable","value":"~*req.8"},{"path":"ClientKey","tag":"ClientKey","type":"*variable","value":"~*req.9"},{"path":"ClientCertificate","tag":"ClientCertificate","type":"*variable","value":"~*req.10"},{"path":"CaCertificate","tag":"CaCertificate","type":"*variable","value":"~*req.11"}],"file_name":"DispatcherHosts.csv","flags":null,"type":"*dispatcher_hosts"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"MinCost","tag":"MinCost","type":"*variable","value":"~*req.4"},{"path":"MaxCost","tag":"MaxCost","type":"*variable","value":"~*req.5"},{"path":"MaxCostStrategy","tag":"MaxCostStrategy","type":"*variable","value":"~*req.6"},{"path":"RateID","tag":"RateID","type":"*variable","value":"~*req.7"},{"path":"RateFilterIDs","tag":"RateFilterIDs","type":"*variable","value":"~*req.8"},{"path":"RateActivationTimes","tag":"RateActivationTimes","type":"*variable","value":"~*req.9"},{"path":"RateWeight","tag":"RateWeight","type":"*variable","value":"~*req.10"},{"path":"RateBlocker","tag":"RateBlocker","type":"*variable","value":"~*req.11"},{"path":"RateIntervalStart","tag":"RateIntervalStart","type":"*variable","value":"~*req.12"},{"path":"RateFixedFee","tag":"RateFixedFee","type":"*variable","value":"~*req.13"},{"path":"RateRecurrentFee","tag":"RateRecurrentFee","type":"*variable","value":"~*req.14"},{"path":"RateUnit","tag":"RateUnit","type":"*variable","value":"~*req.15"},{"path":"RateIncrement","tag":"RateIncrement","type":"*variable","value":"~*req.16"}],"file_name":"RateProfiles.csv","flags":null,"type":"*rate_profiles"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"Schedule","tag":"Schedule","type":"*variable","value":"~*req.4"},{"path":"TargetType","tag":"TargetType","type":"*variable","value":"~*req.5"},{"path":"TargetIDs","tag":"TargetIDs","type":"*variable","value":"~*req.6"},{"path":"ActionID","tag":"ActionID","type":"*variable","value":"~*req.7"},{"path":"ActionFilterIDs","tag":"ActionFilterIDs","type":"*variable","value":"~*req.8"},{"path":"ActionBlocker","tag":"ActionBlocker","type":"*variable","value":"~*req.9"},{"path":"ActionTTL","tag":"ActionTTL","type":"*variable","value":"~*req.10"},{"path":"ActionType","tag":"ActionType","type":"*variable","value":"~*req.11"},{"path":"ActionOpts","tag":"ActionOpts","type":"*variable","value":"~*req.12"},{"path":"ActionPath","tag":"ActionPath","type":"*variable","value":"~*req.13"},{"path":"ActionValue","tag":"ActionValue","type":"*variable","value":"~*req.14"}],"file_name":"ActionProfiles.csv","flags":null,"type":"*action_profiles"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"BalanceID","tag":"BalanceID","type":"*variable","value":"~*req.4"},{"path":"BalanceFilterIDs","tag":"BalanceFilterIDs","type":"*variable","value":"~*req.5"},{"path":"BalanceWeight","tag":"BalanceWeight","type":"*variable","value":"~*req.6"},{"path":"BalanceBlocker","tag":"BalanceBlocker","type":"*variable","value":"~*req.7"},{"path":"BalanceType","tag":"BalanceType","type":"*variable","value":"~*req.8"},{"path":"BalanceOpts","tag":"BalanceOpts","type":"*variable","value":"~*req.9"},{"path":"BalanceCostIncrements","tag":"BalanceCostIncrements","type":"*variable","value":"~*req.10"},{"path":"BalanceAttributeIDs","tag":"BalanceAttributeIDs","type":"*variable","value":"~*req.11"},{"path":"BalanceRateProfileIDs","tag":"BalanceRateProfileIDs","type":"*variable","value":"~*req.12"},{"path":"BalanceUnitFactors","tag":"BalanceUnitFactors","type":"*variable","value":"~*req.13"},{"path":"BalanceUnits","tag":"BalanceUnits","type":"*variable","value":"~*req.14"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.15"}],"file_name":"Accounts.csv","flags":null,"type":"*accounts"}],"dry_run":false,"enabled":false,"field_separator":",","id":"*default","lock_filename":".cgr.lck","run_delay":"0","tenant":"","tp_in_dir":"/var/spool/cgrates/loader/in","tp_out_dir":"/var/spool/cgrates/loader/out"}]}`
cgrCfg := NewDefaultCGRConfig()
if err := cgrCfg.V1GetConfigAsJSON(context.Background(), &SectionWithAPIOpts{Sections: []string{LoaderSJSON}}, &reply); err != nil {
t.Error(err)
@@ -5341,7 +5341,7 @@ func TestV1GetConfigAsJSONAllConfig(t *testing.T) {
}
}`
var reply string
- expected := `{"accounts":{"attributes_conns":[],"enabled":false,"indexed_selects":true,"max_iterations":1000,"max_usage":"259200000000000","nested_fields":false,"prefix_indexed_fields":[],"rates_conns":[],"suffix_indexed_fields":[],"thresholds_conns":[]},"actions":{"accounts_conns":[],"cdrs_conns":[],"dynaprepaid_actionprofile":[],"ees_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"stats_conns":[],"suffix_indexed_fields":[],"tenants":[],"thresholds_conns":[]},"admins":{"actions_conns":[],"attributes_conns":[],"caches_conns":["*internal"],"ees_conns":[],"enabled":false},"analyzers":{"cleanup_interval":"1h0m0s","db_path":"/var/spool/cgrates/analyzers","enabled":false,"index_type":"*scorch","ttl":"24h0m0s"},"apiban":{"enabled":false,"keys":[]},"asterisk_agent":{"asterisk_conns":[{"address":"127.0.0.1:8088","alias":"","connect_attempts":3,"password":"CGRateS.org","reconnects":5,"user":"cgrates"}],"create_cdr":false,"enabled":false,"sessions_conns":["*birpc_internal"]},"attributes":{"accounts_conns":[],"default_opts":{"*processRuns":1},"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"resources_conns":[],"stats_conns":[],"suffix_indexed_fields":[]},"caches":{"partitions":{"*account_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*accounts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*action_profile_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*action_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*apiban":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"2m0s"},"*attribute_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*attribute_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*caps_events":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*cdr_ids":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10m0s"},"*cdrs":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*charger_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*charger_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*closed_sessions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10s"},"*diameter_messages":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*dispatcher_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_hosts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_loads":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_routes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatchers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*event_charges":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10s"},"*event_resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*filters":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*load_ids":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rate_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rate_profile_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rate_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*replication_hosts":{"limit":0,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*resource_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*resource_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*reverse_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*route_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*route_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rpc_connections":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rpc_responses":{"limit":0,"precache":false,"replicate":false,"static_ttl":false,"ttl":"2s"},"*session_costs":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*stat_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*statqueue_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*statqueues":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*stir":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*threshold_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*threshold_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*thresholds":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_accounts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_action_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_attributes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_chargers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_dispatcher_hosts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_dispatcher_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_filters":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_rate_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_routes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_stats":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_thresholds":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*uch":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*versions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""}},"replication_conns":[]},"cdrs":{"accounts_conns":[],"actions_conns":[],"attributes_conns":[],"chargers_conns":[],"ees_conns":[],"enabled":false,"extra_fields":[],"online_cdr_exports":[],"rates_conns":[],"session_cost_retries":5,"stats_conns":[],"store_cdrs":true,"thresholds_conns":[]},"chargers":{"attributes_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"suffix_indexed_fields":[]},"config_db":{"db_host":"","db_name":"","db_password":"","db_port":0,"db_type":"*internal","db_user":"","items":{},"opts":{"mongoQueryTimeout":"10s","redisCACertificate":"","redisClientCertificate":"","redisClientKey":"","redisCluster":false,"redisClusterOndownDelay":"0","redisClusterSync":"5s","redisSentinel":"","redisTLS":false},"remote_conn_id":"","remote_conns":null,"replication_cache":"","replication_conns":null,"replication_filtered":false},"configs":{"enabled":false,"root_dir":"/var/spool/cgrates/configs","url":"/configs/"},"cores":{"caps":0,"caps_stats_interval":"0","caps_strategy":"*busy","shutdown_timeout":"1s"},"data_db":{"db_host":"127.0.0.1","db_name":"10","db_password":"","db_port":6379,"db_type":"*redis","db_user":"cgrates","items":{"*accounts":{"remote":false,"replicate":false},"*action_profiles":{"remote":false,"replicate":false},"*actions":{"remote":false,"replicate":false},"*attribute_profiles":{"remote":false,"replicate":false},"*charger_profiles":{"remote":false,"replicate":false},"*dispatcher_hosts":{"remote":false,"replicate":false},"*dispatcher_profiles":{"remote":false,"replicate":false},"*filters":{"remote":false,"replicate":false},"*indexes":{"remote":false,"replicate":false},"*load_ids":{"remote":false,"replicate":false},"*rate_profiles":{"remote":false,"replicate":false},"*resource_profiles":{"remote":false,"replicate":false},"*resources":{"remote":false,"replicate":false},"*route_profiles":{"remote":false,"replicate":false},"*statqueue_profiles":{"remote":false,"replicate":false},"*statqueues":{"remote":false,"replicate":false},"*threshold_profiles":{"remote":false,"replicate":false},"*thresholds":{"remote":false,"replicate":false}},"opts":{"mongoQueryTimeout":"10s","redisCACertificate":"","redisClientCertificate":"","redisClientKey":"","redisCluster":false,"redisClusterOndownDelay":"0","redisClusterSync":"5s","redisSentinel":"","redisTLS":false},"remote_conn_id":"","remote_conns":[],"replication_cache":"","replication_conns":[],"replication_filtered":false},"diameter_agent":{"asr_template":"","concurrent_requests":-1,"dictionaries_path":"/usr/share/cgrates/diameter/dict/","enabled":false,"forced_disconnect":"*none","listen":"127.0.0.1:3868","listen_net":"tcp","origin_host":"CGR-DA","origin_realm":"cgrates.org","product_name":"CGRateS","rar_template":"","request_processors":[],"sessions_conns":["*birpc_internal"],"synced_conn_requests":false,"vendor_id":0},"dispatchers":{"attributes_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"suffix_indexed_fields":[]},"dns_agent":{"enabled":false,"listen":"127.0.0.1:2053","listen_net":"udp","request_processors":[],"sessions_conns":["*internal"],"timezone":""},"ees":{"attributes_conns":[],"cache":{"*fileCSV":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"5s"}},"enabled":false,"exporters":[{"attempts":1,"attribute_context":"","attribute_ids":[],"concurrent_requests":0,"export_path":"/var/spool/cgrates/ees","failed_posts_dir":"/var/spool/cgrates/failed_posts","fields":[],"filters":[],"flags":[],"id":"*default","opts":{},"synchronous":false,"timezone":"","type":"*none"}]},"ers":{"enabled":false,"partial_cache_ttl":"1s","readers":[{"cache_dump_fields":[],"concurrent_requests":1024,"fields":[{"mandatory":true,"path":"*cgreq.ToR","tag":"ToR","type":"*variable","value":"~*req.2"},{"mandatory":true,"path":"*cgreq.OriginID","tag":"OriginID","type":"*variable","value":"~*req.3"},{"mandatory":true,"path":"*cgreq.RequestType","tag":"RequestType","type":"*variable","value":"~*req.4"},{"mandatory":true,"path":"*cgreq.Tenant","tag":"Tenant","type":"*variable","value":"~*req.6"},{"mandatory":true,"path":"*cgreq.Category","tag":"Category","type":"*variable","value":"~*req.7"},{"mandatory":true,"path":"*cgreq.Account","tag":"Account","type":"*variable","value":"~*req.8"},{"mandatory":true,"path":"*cgreq.Subject","tag":"Subject","type":"*variable","value":"~*req.9"},{"mandatory":true,"path":"*cgreq.Destination","tag":"Destination","type":"*variable","value":"~*req.10"},{"mandatory":true,"path":"*cgreq.SetupTime","tag":"SetupTime","type":"*variable","value":"~*req.11"},{"mandatory":true,"path":"*cgreq.AnswerTime","tag":"AnswerTime","type":"*variable","value":"~*req.12"},{"mandatory":true,"path":"*cgreq.Usage","tag":"Usage","type":"*variable","value":"~*req.13"}],"filters":[],"flags":[],"id":"*default","opts":{"csvFieldSeparator":",","csvHeaderDefineChar":":","csvRowLength":0,"natsSubject":"cgrates_cdrs","partialCacheAction":"*none","partialOrderField":"~*req.AnswerTime","xmlRootPath":""},"partial_commit_fields":[],"processed_path":"/var/spool/cgrates/ers/out","run_delay":"0","source_path":"/var/spool/cgrates/ers/in","tenant":"","timezone":"","type":"*none"}],"sessions_conns":["*internal"]},"filters":{"accounts_conns":[],"resources_conns":[],"stats_conns":[]},"freeswitch_agent":{"create_cdr":false,"empty_balance_ann_file":"","empty_balance_context":"","enabled":false,"event_socket_conns":[{"address":"127.0.0.1:8021","alias":"127.0.0.1:8021","password":"ClueCon","reconnects":5}],"extra_fields":[],"low_balance_ann_file":"","max_wait_connection":"2s","sessions_conns":["*birpc_internal"],"subscribe_park":true},"general":{"connect_attempts":5,"connect_timeout":"1s","dbdata_encoding":"*msgpack","default_caching":"*reload","default_category":"call","default_request_type":"*rated","default_tenant":"cgrates.org","default_timezone":"Local","digest_equal":":","digest_separator":",","failed_posts_dir":"/var/spool/cgrates/failed_posts","failed_posts_ttl":"5s","locking_timeout":"0","log_level":6,"logger":"*syslog","max_parallel_conns":100,"node_id":"ENGINE1","poster_attempts":3,"reconnects":-1,"reply_timeout":"2s","rounding_decimals":5,"rsr_separator":";","tpexport_dir":"/var/spool/cgrates/tpe"},"http":{"auth_users":{},"client_opts":{"dialFallbackDelay":"300ms","dialKeepAlive":"30s","dialTimeout":"30s","disableCompression":false,"disableKeepAlives":false,"expectContinueTimeout":"0","forceAttemptHttp2":true,"idleConnTimeout":"90s","maxConnsPerHost":0,"maxIdleConns":100,"maxIdleConnsPerHost":2,"responseHeaderTimeout":"0","skipTlsVerify":false,"tlsHandshakeTimeout":"10s"},"freeswitch_cdrs_url":"/freeswitch_json","http_cdrs":"/cdr_http","json_rpc_url":"/jsonrpc","registrars_url":"/registrar","use_basic_auth":false,"ws_url":"/ws"},"http_agent":[],"kamailio_agent":{"create_cdr":false,"enabled":false,"evapi_conns":[{"address":"127.0.0.1:8448","alias":"","reconnects":5}],"sessions_conns":["*birpc_internal"],"timezone":""},"listen":{"http":"127.0.0.1:2080","http_tls":"127.0.0.1:2280","rpc_gob":"127.0.0.1:2013","rpc_gob_tls":"127.0.0.1:2023","rpc_json":"127.0.0.1:2012","rpc_json_tls":"127.0.0.1:2022"},"loader":{"actions_conns":["*localhost"],"caches_conns":["*localhost"],"data_path":"./","disable_reverse":false,"field_separator":",","gapi_credentials":".gapi/credentials.json","gapi_token":".gapi/token.json","tpid":""},"loaders":[{"caches_conns":["*internal"],"data":[{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Type","tag":"Type","type":"*variable","value":"~*req.2"},{"path":"Element","tag":"Element","type":"*variable","value":"~*req.3"},{"path":"Values","tag":"Values","type":"*variable","value":"~*req.4"}],"file_name":"Filters.csv","flags":null,"type":"*filters"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"TenantID","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ProfileID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"AttributeFilterIDs","tag":"AttributeFilterIDs","type":"*variable","value":"~*req.4"},{"path":"Path","tag":"Path","type":"*variable","value":"~*req.5"},{"path":"Type","tag":"Type","type":"*variable","value":"~*req.6"},{"path":"Value","tag":"Value","type":"*variable","value":"~*req.7"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.8"}],"file_name":"Attributes.csv","flags":null,"type":"*attributes"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"UsageTTL","tag":"TTL","type":"*variable","value":"~*req.4"},{"path":"Limit","tag":"Limit","type":"*variable","value":"~*req.5"},{"path":"AllocationMessage","tag":"AllocationMessage","type":"*variable","value":"~*req.6"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.7"},{"path":"Stored","tag":"Stored","type":"*variable","value":"~*req.8"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.9"}],"file_name":"Resources.csv","flags":null,"type":"*resources"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"QueueLength","tag":"QueueLength","type":"*variable","value":"~*req.4"},{"path":"TTL","tag":"TTL","type":"*variable","value":"~*req.5"},{"path":"MinItems","tag":"MinItems","type":"*variable","value":"~*req.6"},{"path":"MetricIDs","tag":"MetricIDs","type":"*variable","value":"~*req.7"},{"path":"MetricFilterIDs","tag":"MetricFilterIDs","type":"*variable","value":"~*req.8"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.9"},{"path":"Stored","tag":"Stored","type":"*variable","value":"~*req.10"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.11"}],"file_name":"Stats.csv","flags":null,"type":"*stats"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"MaxHits","tag":"MaxHits","type":"*variable","value":"~*req.4"},{"path":"MinHits","tag":"MinHits","type":"*variable","value":"~*req.5"},{"path":"MinSleep","tag":"MinSleep","type":"*variable","value":"~*req.6"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.7"},{"path":"ActionProfileIDs","tag":"ActionProfileIDs","type":"*variable","value":"~*req.8"},{"path":"Async","tag":"Async","type":"*variable","value":"~*req.9"}],"file_name":"Thresholds.csv","flags":null,"type":"*thresholds"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"Sorting","tag":"Sorting","type":"*variable","value":"~*req.4"},{"path":"SortingParameters","tag":"SortingParameters","type":"*variable","value":"~*req.5"},{"path":"RouteID","tag":"RouteID","type":"*variable","value":"~*req.6"},{"path":"RouteFilterIDs","tag":"RouteFilterIDs","type":"*variable","value":"~*req.7"},{"path":"RouteAccountIDs","tag":"RouteAccountIDs","type":"*variable","value":"~*req.8"},{"path":"RouteRateProfileIDs","tag":"RouteRateProfileIDs","type":"*variable","value":"~*req.9"},{"path":"RouteResourceIDs","tag":"RouteResourceIDs","type":"*variable","value":"~*req.10"},{"path":"RouteStatIDs","tag":"RouteStatIDs","type":"*variable","value":"~*req.11"},{"path":"RouteWeight","tag":"RouteWeight","type":"*variable","value":"~*req.12"},{"path":"RouteBlocker","tag":"RouteBlocker","type":"*variable","value":"~*req.13"},{"path":"RouteParameters","tag":"RouteParameters","type":"*variable","value":"~*req.14"}],"file_name":"Routes.csv","flags":null,"type":"*routes"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"RunID","tag":"RunID","type":"*variable","value":"~*req.4"},{"path":"AttributeIDs","tag":"AttributeIDs","type":"*variable","value":"~*req.5"}],"file_name":"Chargers.csv","flags":null,"type":"*chargers"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"Strategy","tag":"Strategy","type":"*variable","value":"~*req.4"},{"path":"StrategyParameters","tag":"StrategyParameters","type":"*variable","value":"~*req.5"},{"path":"ConnID","tag":"ConnID","type":"*variable","value":"~*req.6"},{"path":"ConnFilterIDs","tag":"ConnFilterIDs","type":"*variable","value":"~*req.7"},{"path":"ConnWeight","tag":"ConnWeight","type":"*variable","value":"~*req.8"},{"path":"ConnBlocker","tag":"ConnBlocker","type":"*variable","value":"~*req.9"},{"path":"ConnParameters","tag":"ConnParameters","type":"*variable","value":"~*req.10"}],"file_name":"DispatcherProfiles.csv","flags":null,"type":"*dispatchers"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Address","tag":"Address","type":"*variable","value":"~*req.2"},{"path":"Transport","tag":"Transport","type":"*variable","value":"~*req.3"},{"path":"ConnectAttempts","tag":"ConnectAttempts","type":"*variable","value":"~*req.4"},{"path":"Reconnects","tag":"Reconnects","type":"*variable","value":"~*req.5"},{"path":"ConnectTimeout","tag":"ConnectTimeout","type":"*variable","value":"~*req.6"},{"path":"ReplyTimeout","tag":"ReplyTimeout","type":"*variable","value":"~*req.7"},{"path":"TLS","tag":"TLS","type":"*variable","value":"~*req.8"},{"path":"ClientKey","tag":"ClientKey","type":"*variable","value":"~*req.9"},{"path":"ClientCertificate","tag":"ClientCertificate","type":"*variable","value":"~*req.10"},{"path":"CaCertificate","tag":"CaCertificate","type":"*variable","value":"~*req.11"}],"file_name":"DispatcherHosts.csv","flags":null,"type":"*dispatcher_hosts"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"MinCost","tag":"MinCost","type":"*variable","value":"~*req.4"},{"path":"MaxCost","tag":"MaxCost","type":"*variable","value":"~*req.5"},{"path":"MaxCostStrategy","tag":"MaxCostStrategy","type":"*variable","value":"~*req.6"},{"path":"RateID","tag":"RateID","type":"*variable","value":"~*req.7"},{"path":"RateFilterIDs","tag":"RateFilterIDs","type":"*variable","value":"~*req.8"},{"path":"RateActivationTimes","tag":"RateActivationTimes","type":"*variable","value":"~*req.9"},{"path":"RateWeight","tag":"RateWeight","type":"*variable","value":"~*req.10"},{"path":"RateBlocker","tag":"RateBlocker","type":"*variable","value":"~*req.11"},{"path":"RateIntervalStart","tag":"RateIntervalStart","type":"*variable","value":"~*req.12"},{"path":"RateFixedFee","tag":"RateFixedFee","type":"*variable","value":"~*req.13"},{"path":"RateRecurrentFee","tag":"RateRecurrentFee","type":"*variable","value":"~*req.14"},{"path":"RateUnit","tag":"RateUnit","type":"*variable","value":"~*req.15"},{"path":"RateIncrement","tag":"RateIncrement","type":"*variable","value":"~*req.16"}],"file_name":"RateProfiles.csv","flags":null,"type":"*rate_profiles"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"Schedule","tag":"Schedule","type":"*variable","value":"~*req.4"},{"path":"TargetType","tag":"TargetType","type":"*variable","value":"~*req.5"},{"path":"TargetIDs","tag":"TargetIDs","type":"*variable","value":"~*req.6"},{"path":"ActionID","tag":"ActionID","type":"*variable","value":"~*req.7"},{"path":"ActionFilterIDs","tag":"ActionFilterIDs","type":"*variable","value":"~*req.8"},{"path":"ActionBlocker","tag":"ActionBlocker","type":"*variable","value":"~*req.9"},{"path":"ActionTTL","tag":"ActionTTL","type":"*variable","value":"~*req.10"},{"path":"ActionType","tag":"ActionType","type":"*variable","value":"~*req.11"},{"path":"ActionOpts","tag":"ActionOpts","type":"*variable","value":"~*req.12"},{"path":"ActionPath","tag":"ActionPath","type":"*variable","value":"~*req.13"},{"path":"ActionValue","tag":"ActionValue","type":"*variable","value":"~*req.14"}],"file_name":"ActionProfiles.csv","flags":null,"type":"*action_profiles"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"BalanceID","tag":"BalanceID","type":"*variable","value":"~*req.4"},{"path":"BalanceFilterIDs","tag":"BalanceFilterIDs","type":"*variable","value":"~*req.5"},{"path":"BalanceWeight","tag":"BalanceWeight","type":"*variable","value":"~*req.6"},{"path":"BalanceBlocker","tag":"BalanceBlocker","type":"*variable","value":"~*req.7"},{"path":"BalanceType","tag":"BalanceType","type":"*variable","value":"~*req.8"},{"path":"BalanceOpts","tag":"BalanceOpts","type":"*variable","value":"~*req.9"},{"path":"BalanceCostIncrements","tag":"BalanceCostIncrements","type":"*variable","value":"~*req.10"},{"path":"BalanceAttributeIDs","tag":"BalanceAttributeIDs","type":"*variable","value":"~*req.11"},{"path":"BalanceRateProfileIDs","tag":"BalanceRateProfileIDs","type":"*variable","value":"~*req.12"},{"path":"BalanceUnitFactors","tag":"BalanceUnitFactors","type":"*variable","value":"~*req.13"},{"path":"BalanceUnits","tag":"BalanceUnits","type":"*variable","value":"~*req.14"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.15"}],"file_name":"Accounts.csv","flags":null,"type":"*accounts"}],"dry_run":false,"enabled":false,"field_separator":",","id":"*default","lock_filename":".cgr.lck","run_delay":"0","tenant":"","tp_in_dir":"/var/spool/cgrates/loader/in","tp_out_dir":"/var/spool/cgrates/loader/out"}],"migrator":{"out_datadb_encoding":"msgpack","out_datadb_host":"127.0.0.1","out_datadb_name":"10","out_datadb_opts":{"redisCACertificate":"","redisClientCertificate":"","redisClientKey":"","redisCluster":false,"redisClusterOndownDelay":"0","redisClusterSync":"5s","redisSentinel":"","redisTLS":false},"out_datadb_password":"","out_datadb_port":"6379","out_datadb_type":"redis","out_datadb_user":"cgrates","out_stordb_host":"127.0.0.1","out_stordb_name":"cgrates","out_stordb_opts":{},"out_stordb_password":"","out_stordb_port":"3306","out_stordb_type":"mysql","out_stordb_user":"cgrates","users_filters":[]},"radius_agent":{"client_dictionaries":{"*default":"/usr/share/cgrates/radius/dict/"},"client_secrets":{"*default":"CGRateS.org"},"enabled":false,"listen_acct":"127.0.0.1:1813","listen_auth":"127.0.0.1:1812","listen_net":"udp","request_processors":[],"sessions_conns":["*internal"]},"rates":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"rate_indexed_selects":true,"rate_nested_fields":false,"rate_prefix_indexed_fields":[],"rate_suffix_indexed_fields":[],"suffix_indexed_fields":[],"verbosity":1000},"registrarc":{"dispatchers":{"hosts":[],"refresh_interval":"5m0s","registrars_conns":[]},"rpc":{"hosts":[],"refresh_interval":"5m0s","registrars_conns":[]}},"resources":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"store_interval":"","suffix_indexed_fields":[],"thresholds_conns":[]},"routes":{"accounts_conns":[],"attributes_conns":[],"default_opts":{"*context":"*routes","*routesProfilesCount":1},"default_ratio":1,"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"rates_conns":[],"resources_conns":[],"stats_conns":[],"suffix_indexed_fields":[]},"rpc_conns":{"*bijson_localhost":{"conns":[{"address":"127.0.0.1:2014","transport":"*birpc_json"}],"poolSize":0,"strategy":"*first"},"*birpc_internal":{"conns":[{"address":"*birpc_internal","transport":""}],"poolSize":0,"strategy":"*first"},"*internal":{"conns":[{"address":"*internal","transport":""}],"poolSize":0,"strategy":"*first"},"*localhost":{"conns":[{"address":"127.0.0.1:2012","transport":"*json"}],"poolSize":0,"strategy":"*first"}},"sessions":{"actions_conns":[],"alterable_fields":[],"attributes_conns":[],"cdrs_conns":[],"channel_sync_interval":"0","chargers_conns":[],"client_protocol":1,"debit_interval":"0","default_usage":{"*any":"3h0m0s","*data":"1048576","*sms":"1","*voice":"3h0m0s"},"enabled":false,"listen_bigob":"","listen_bijson":"127.0.0.1:2014","min_dur_low_balance":"0","replication_conns":[],"resources_conns":[],"routes_conns":[],"session_indexes":[],"session_ttl":"0","stats_conns":[],"stir":{"allowed_attest":["*any"],"default_attest":"A","payload_maxduration":"-1","privatekey_path":"","publickey_path":""},"store_session_costs":false,"terminate_attempts":5,"thresholds_conns":[]},"sip_agent":{"enabled":false,"listen":"127.0.0.1:5060","listen_net":"udp","request_processors":[],"retransmission_timer":"1s","sessions_conns":["*internal"],"timezone":""},"stats":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"store_interval":"","store_uncompressed_limit":0,"suffix_indexed_fields":[],"thresholds_conns":[]},"stor_db":{"db_host":"127.0.0.1","db_name":"cgrates","db_password":"","db_port":3306,"db_type":"*mysql","db_user":"cgrates","items":{"*cdrs":{"remote":false,"replicate":false},"*session_costs":{"remote":false,"replicate":false},"*tp_accounts":{"remote":false,"replicate":false},"*tp_action_profiles":{"remote":false,"replicate":false},"*tp_attributes":{"remote":false,"replicate":false},"*tp_chargers":{"remote":false,"replicate":false},"*tp_dispatcher_hosts":{"remote":false,"replicate":false},"*tp_dispatcher_profiles":{"remote":false,"replicate":false},"*tp_filters":{"remote":false,"replicate":false},"*tp_rate_profiles":{"remote":false,"replicate":false},"*tp_resources":{"remote":false,"replicate":false},"*tp_routes":{"remote":false,"replicate":false},"*tp_stats":{"remote":false,"replicate":false},"*tp_thresholds":{"remote":false,"replicate":false},"*versions":{"remote":false,"replicate":false}},"opts":{"mongoQueryTimeout":"10s","mysqlLocation":"Local","sqlConnMaxLifetime":0,"sqlMaxIdleConns":10,"sqlMaxOpenConns":100,"sslMode":"disable"},"prefix_indexed_fields":[],"remote_conns":null,"replication_conns":null,"string_indexed_fields":[]},"suretax":{"bill_to_number":"","business_unit":"","client_number":"","client_tracking":"~*req.CGRID","customer_number":"~*req.Subject","include_local_cost":false,"orig_number":"~*req.Subject","p2pplus4":"","p2pzipcode":"","plus4":"","regulatory_code":"03","response_group":"03","response_type":"D4","return_file_code":"0","sales_type_code":"R","tax_exemption_code_list":"","tax_included":"0","tax_situs_rule":"04","term_number":"~*req.Destination","timezone":"UTC","trans_type_code":"010101","unit_type":"00","units":"1","url":"","validation_key":"","zipcode":""},"templates":{"*asr":[{"mandatory":true,"path":"*diamreq.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*diamreq.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*req.Destination-Host"},{"mandatory":true,"path":"*diamreq.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*req.Destination-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Realm","tag":"DestinationRealm","type":"*variable","value":"~*req.Origin-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Host","tag":"DestinationHost","type":"*variable","value":"~*req.Origin-Host"},{"mandatory":true,"path":"*diamreq.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"}],"*cca":[{"mandatory":true,"path":"*rep.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"path":"*rep.Result-Code","tag":"ResultCode","type":"*constant","value":"2001"},{"mandatory":true,"path":"*rep.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*vars.OriginHost"},{"mandatory":true,"path":"*rep.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*vars.OriginRealm"},{"mandatory":true,"path":"*rep.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"},{"mandatory":true,"path":"*rep.CC-Request-Type","tag":"CCRequestType","type":"*variable","value":"~*req.CC-Request-Type"},{"mandatory":true,"path":"*rep.CC-Request-Number","tag":"CCRequestNumber","type":"*variable","value":"~*req.CC-Request-Number"}],"*cdrLog":[{"mandatory":true,"path":"*cdr.ToR","tag":"ToR","type":"*variable","value":"~*req.BalanceType"},{"mandatory":true,"path":"*cdr.OriginHost","tag":"OriginHost","type":"*constant","value":"127.0.0.1"},{"mandatory":true,"path":"*cdr.RequestType","tag":"RequestType","type":"*constant","value":"*none"},{"mandatory":true,"path":"*cdr.Tenant","tag":"Tenant","type":"*variable","value":"~*req.Tenant"},{"mandatory":true,"path":"*cdr.Account","tag":"Account","type":"*variable","value":"~*req.Account"},{"mandatory":true,"path":"*cdr.Subject","tag":"Subject","type":"*variable","value":"~*req.Account"},{"mandatory":true,"path":"*cdr.Cost","tag":"Cost","type":"*variable","value":"~*req.Cost"},{"mandatory":true,"path":"*cdr.Source","tag":"Source","type":"*constant","value":"*cdrLog"},{"mandatory":true,"path":"*cdr.Usage","tag":"Usage","type":"*constant","value":"1"},{"mandatory":true,"path":"*cdr.RunID","tag":"RunID","type":"*variable","value":"~*req.ActionType"},{"mandatory":true,"path":"*cdr.SetupTime","tag":"SetupTime","type":"*constant","value":"*now"},{"mandatory":true,"path":"*cdr.AnswerTime","tag":"AnswerTime","type":"*constant","value":"*now"},{"mandatory":true,"path":"*cdr.PreRated","tag":"PreRated","type":"*constant","value":"true"}],"*err":[{"mandatory":true,"path":"*rep.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*rep.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*vars.OriginHost"},{"mandatory":true,"path":"*rep.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*vars.OriginRealm"}],"*errSip":[{"mandatory":true,"path":"*rep.Request","tag":"Request","type":"*constant","value":"SIP/2.0 500 Internal Server Error"}],"*rar":[{"mandatory":true,"path":"*diamreq.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*diamreq.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*req.Destination-Host"},{"mandatory":true,"path":"*diamreq.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*req.Destination-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Realm","tag":"DestinationRealm","type":"*variable","value":"~*req.Origin-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Host","tag":"DestinationHost","type":"*variable","value":"~*req.Origin-Host"},{"mandatory":true,"path":"*diamreq.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"},{"path":"*diamreq.Re-Auth-Request-Type","tag":"ReAuthRequestType","type":"*constant","value":"0"}]},"thresholds":{"actions_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"store_interval":"","suffix_indexed_fields":[]},"tls":{"ca_certificate":"","client_certificate":"","client_key":"","server_certificate":"","server_key":"","server_name":"","server_policy":4}}`
+ expected := `{"accounts":{"attributes_conns":[],"enabled":false,"indexed_selects":true,"max_iterations":1000,"max_usage":"259200000000000","nested_fields":false,"prefix_indexed_fields":[],"rates_conns":[],"suffix_indexed_fields":[],"thresholds_conns":[]},"actions":{"accounts_conns":[],"cdrs_conns":[],"dynaprepaid_actionprofile":[],"ees_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"stats_conns":[],"suffix_indexed_fields":[],"tenants":[],"thresholds_conns":[]},"admins":{"actions_conns":[],"attributes_conns":[],"caches_conns":["*internal"],"ees_conns":[],"enabled":false},"analyzers":{"cleanup_interval":"1h0m0s","db_path":"/var/spool/cgrates/analyzers","enabled":false,"index_type":"*scorch","ttl":"24h0m0s"},"apiban":{"enabled":false,"keys":[]},"asterisk_agent":{"asterisk_conns":[{"address":"127.0.0.1:8088","alias":"","connect_attempts":3,"password":"CGRateS.org","reconnects":5,"user":"cgrates"}],"create_cdr":false,"enabled":false,"sessions_conns":["*birpc_internal"]},"attributes":{"accounts_conns":[],"default_opts":{"*processRuns":1},"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"resources_conns":[],"stats_conns":[],"suffix_indexed_fields":[]},"caches":{"partitions":{"*account_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*accounts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*action_profile_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*action_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*apiban":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"2m0s"},"*attribute_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*attribute_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*caps_events":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*cdr_ids":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10m0s"},"*cdrs":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*charger_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*charger_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*closed_sessions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10s"},"*diameter_messages":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*dispatcher_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_hosts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_loads":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_routes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatchers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*event_charges":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10s"},"*event_resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*filters":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*load_ids":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rate_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rate_profile_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rate_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*replication_hosts":{"limit":0,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*resource_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*resource_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*reverse_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*route_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*route_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rpc_connections":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rpc_responses":{"limit":0,"precache":false,"replicate":false,"static_ttl":false,"ttl":"2s"},"*session_costs":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*stat_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*statqueue_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*statqueues":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*stir":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*threshold_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*threshold_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*thresholds":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_accounts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_action_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_attributes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_chargers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_dispatcher_hosts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_dispatcher_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_filters":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_rate_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_routes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_stats":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_thresholds":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*uch":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*versions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""}},"replication_conns":[]},"cdrs":{"accounts_conns":[],"actions_conns":[],"attributes_conns":[],"chargers_conns":[],"ees_conns":[],"enabled":false,"extra_fields":[],"online_cdr_exports":[],"rates_conns":[],"session_cost_retries":5,"stats_conns":[],"store_cdrs":true,"thresholds_conns":[]},"chargers":{"attributes_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"suffix_indexed_fields":[]},"config_db":{"db_host":"","db_name":"","db_password":"","db_port":0,"db_type":"*internal","db_user":"","items":{},"opts":{"mongoQueryTimeout":"10s","redisCACertificate":"","redisClientCertificate":"","redisClientKey":"","redisCluster":false,"redisClusterOndownDelay":"0","redisClusterSync":"5s","redisSentinel":"","redisTLS":false},"remote_conn_id":"","remote_conns":null,"replication_cache":"","replication_conns":null,"replication_filtered":false},"configs":{"enabled":false,"root_dir":"/var/spool/cgrates/configs","url":"/configs/"},"cores":{"caps":0,"caps_stats_interval":"0","caps_strategy":"*busy","shutdown_timeout":"1s"},"data_db":{"db_host":"127.0.0.1","db_name":"10","db_password":"","db_port":6379,"db_type":"*redis","db_user":"cgrates","items":{"*accounts":{"remote":false,"replicate":false},"*action_profiles":{"remote":false,"replicate":false},"*actions":{"remote":false,"replicate":false},"*attribute_profiles":{"remote":false,"replicate":false},"*charger_profiles":{"remote":false,"replicate":false},"*dispatcher_hosts":{"remote":false,"replicate":false},"*dispatcher_profiles":{"remote":false,"replicate":false},"*filters":{"remote":false,"replicate":false},"*indexes":{"remote":false,"replicate":false},"*load_ids":{"remote":false,"replicate":false},"*rate_profiles":{"remote":false,"replicate":false},"*resource_profiles":{"remote":false,"replicate":false},"*resources":{"remote":false,"replicate":false},"*route_profiles":{"remote":false,"replicate":false},"*statqueue_profiles":{"remote":false,"replicate":false},"*statqueues":{"remote":false,"replicate":false},"*threshold_profiles":{"remote":false,"replicate":false},"*thresholds":{"remote":false,"replicate":false}},"opts":{"mongoQueryTimeout":"10s","redisCACertificate":"","redisClientCertificate":"","redisClientKey":"","redisCluster":false,"redisClusterOndownDelay":"0","redisClusterSync":"5s","redisSentinel":"","redisTLS":false},"remote_conn_id":"","remote_conns":[],"replication_cache":"","replication_conns":[],"replication_filtered":false},"diameter_agent":{"asr_template":"","concurrent_requests":-1,"dictionaries_path":"/usr/share/cgrates/diameter/dict/","enabled":false,"forced_disconnect":"*none","listen":"127.0.0.1:3868","listen_net":"tcp","origin_host":"CGR-DA","origin_realm":"cgrates.org","product_name":"CGRateS","rar_template":"","request_processors":[],"sessions_conns":["*birpc_internal"],"synced_conn_requests":false,"vendor_id":0},"dispatchers":{"attributes_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"suffix_indexed_fields":[]},"dns_agent":{"enabled":false,"listen":"127.0.0.1:2053","listen_net":"udp","request_processors":[],"sessions_conns":["*internal"],"timezone":""},"ees":{"attributes_conns":[],"cache":{"*fileCSV":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"5s"}},"enabled":false,"exporters":[{"attempts":1,"attribute_context":"","attribute_ids":[],"concurrent_requests":0,"export_path":"/var/spool/cgrates/ees","failed_posts_dir":"/var/spool/cgrates/failed_posts","fields":[],"filters":[],"flags":[],"id":"*default","opts":{},"synchronous":false,"timezone":"","type":"*none"}]},"ers":{"enabled":false,"partial_cache_ttl":"1s","readers":[{"cache_dump_fields":[],"concurrent_requests":1024,"fields":[{"mandatory":true,"path":"*cgreq.ToR","tag":"ToR","type":"*variable","value":"~*req.2"},{"mandatory":true,"path":"*cgreq.OriginID","tag":"OriginID","type":"*variable","value":"~*req.3"},{"mandatory":true,"path":"*cgreq.RequestType","tag":"RequestType","type":"*variable","value":"~*req.4"},{"mandatory":true,"path":"*cgreq.Tenant","tag":"Tenant","type":"*variable","value":"~*req.6"},{"mandatory":true,"path":"*cgreq.Category","tag":"Category","type":"*variable","value":"~*req.7"},{"mandatory":true,"path":"*cgreq.Account","tag":"Account","type":"*variable","value":"~*req.8"},{"mandatory":true,"path":"*cgreq.Subject","tag":"Subject","type":"*variable","value":"~*req.9"},{"mandatory":true,"path":"*cgreq.Destination","tag":"Destination","type":"*variable","value":"~*req.10"},{"mandatory":true,"path":"*cgreq.SetupTime","tag":"SetupTime","type":"*variable","value":"~*req.11"},{"mandatory":true,"path":"*cgreq.AnswerTime","tag":"AnswerTime","type":"*variable","value":"~*req.12"},{"mandatory":true,"path":"*cgreq.Usage","tag":"Usage","type":"*variable","value":"~*req.13"}],"filters":[],"flags":[],"id":"*default","opts":{"csvFieldSeparator":",","csvHeaderDefineChar":":","csvRowLength":0,"natsSubject":"cgrates_cdrs","partialCacheAction":"*none","partialOrderField":"~*req.AnswerTime","xmlRootPath":""},"partial_commit_fields":[],"processed_path":"/var/spool/cgrates/ers/out","run_delay":"0","source_path":"/var/spool/cgrates/ers/in","tenant":"","timezone":"","type":"*none"}],"sessions_conns":["*internal"]},"filters":{"accounts_conns":[],"resources_conns":[],"stats_conns":[]},"freeswitch_agent":{"create_cdr":false,"empty_balance_ann_file":"","empty_balance_context":"","enabled":false,"event_socket_conns":[{"address":"127.0.0.1:8021","alias":"127.0.0.1:8021","password":"ClueCon","reconnects":5}],"extra_fields":[],"low_balance_ann_file":"","max_wait_connection":"2s","sessions_conns":["*birpc_internal"],"subscribe_park":true},"general":{"connect_attempts":5,"connect_timeout":"1s","dbdata_encoding":"*msgpack","default_caching":"*reload","default_category":"call","default_request_type":"*rated","default_tenant":"cgrates.org","default_timezone":"Local","digest_equal":":","digest_separator":",","failed_posts_dir":"/var/spool/cgrates/failed_posts","failed_posts_ttl":"5s","locking_timeout":"0","log_level":6,"logger":"*syslog","max_parallel_conns":100,"node_id":"ENGINE1","poster_attempts":3,"reconnects":-1,"reply_timeout":"2s","rounding_decimals":5,"rsr_separator":";","tpexport_dir":"/var/spool/cgrates/tpe"},"http":{"auth_users":{},"client_opts":{"dialFallbackDelay":"300ms","dialKeepAlive":"30s","dialTimeout":"30s","disableCompression":false,"disableKeepAlives":false,"expectContinueTimeout":"0","forceAttemptHttp2":true,"idleConnTimeout":"90s","maxConnsPerHost":0,"maxIdleConns":100,"maxIdleConnsPerHost":2,"responseHeaderTimeout":"0","skipTlsVerify":false,"tlsHandshakeTimeout":"10s"},"freeswitch_cdrs_url":"/freeswitch_json","http_cdrs":"/cdr_http","json_rpc_url":"/jsonrpc","registrars_url":"/registrar","use_basic_auth":false,"ws_url":"/ws"},"http_agent":[],"kamailio_agent":{"create_cdr":false,"enabled":false,"evapi_conns":[{"address":"127.0.0.1:8448","alias":"","reconnects":5}],"sessions_conns":["*birpc_internal"],"timezone":""},"listen":{"http":"127.0.0.1:2080","http_tls":"127.0.0.1:2280","rpc_gob":"127.0.0.1:2013","rpc_gob_tls":"127.0.0.1:2023","rpc_json":"127.0.0.1:2012","rpc_json_tls":"127.0.0.1:2022"},"loader":{"actions_conns":["*localhost"],"caches_conns":["*localhost"],"data_path":"./","disable_reverse":false,"field_separator":",","gapi_credentials":".gapi/credentials.json","gapi_token":".gapi/token.json","tpid":""},"loaders":[{"caches_conns":["*internal"],"data":[{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Type","tag":"Type","type":"*variable","value":"~*req.2"},{"path":"Element","tag":"Element","type":"*variable","value":"~*req.3"},{"path":"Values","tag":"Values","type":"*variable","value":"~*req.4"}],"file_name":"Filters.csv","flags":null,"type":"*filters"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"TenantID","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ProfileID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"AttributeFilterIDs","tag":"AttributeFilterIDs","type":"*variable","value":"~*req.4"},{"path":"Path","tag":"Path","type":"*variable","value":"~*req.5"},{"path":"Type","tag":"Type","type":"*variable","value":"~*req.6"},{"path":"Value","tag":"Value","type":"*variable","value":"~*req.7"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.8"}],"file_name":"Attributes.csv","flags":null,"type":"*attributes"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"UsageTTL","tag":"TTL","type":"*variable","value":"~*req.4"},{"path":"Limit","tag":"Limit","type":"*variable","value":"~*req.5"},{"path":"AllocationMessage","tag":"AllocationMessage","type":"*variable","value":"~*req.6"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.7"},{"path":"Stored","tag":"Stored","type":"*variable","value":"~*req.8"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.9"}],"file_name":"Resources.csv","flags":null,"type":"*resources"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"QueueLength","tag":"QueueLength","type":"*variable","value":"~*req.4"},{"path":"TTL","tag":"TTL","type":"*variable","value":"~*req.5"},{"path":"MinItems","tag":"MinItems","type":"*variable","value":"~*req.6"},{"path":"MetricIDs","tag":"MetricIDs","type":"*variable","value":"~*req.7"},{"path":"MetricFilterIDs","tag":"MetricFilterIDs","type":"*variable","value":"~*req.8"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.9"},{"path":"Stored","tag":"Stored","type":"*variable","value":"~*req.10"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.11"}],"file_name":"Stats.csv","flags":null,"type":"*stats"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"MaxHits","tag":"MaxHits","type":"*variable","value":"~*req.4"},{"path":"MinHits","tag":"MinHits","type":"*variable","value":"~*req.5"},{"path":"MinSleep","tag":"MinSleep","type":"*variable","value":"~*req.6"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.7"},{"path":"ActionProfileIDs","tag":"ActionProfileIDs","type":"*variable","value":"~*req.8"},{"path":"Async","tag":"Async","type":"*variable","value":"~*req.9"}],"file_name":"Thresholds.csv","flags":null,"type":"*thresholds"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weights","tag":"Weights","type":"*variable","value":"~*req.3"},{"path":"Sorting","tag":"Sorting","type":"*variable","value":"~*req.4"},{"path":"SortingParameters","tag":"SortingParameters","type":"*variable","value":"~*req.5"},{"path":"RouteID","tag":"RouteID","type":"*variable","value":"~*req.6"},{"path":"RouteFilterIDs","tag":"RouteFilterIDs","type":"*variable","value":"~*req.7"},{"path":"RouteAccountIDs","tag":"RouteAccountIDs","type":"*variable","value":"~*req.8"},{"path":"RouteRateProfileIDs","tag":"RouteRateProfileIDs","type":"*variable","value":"~*req.9"},{"path":"RouteResourceIDs","tag":"RouteResourceIDs","type":"*variable","value":"~*req.10"},{"path":"RouteStatIDs","tag":"RouteStatIDs","type":"*variable","value":"~*req.11"},{"path":"RouteWeights","tag":"RouteWeights","type":"*variable","value":"~*req.12"},{"path":"RouteBlocker","tag":"RouteBlocker","type":"*variable","value":"~*req.13"},{"path":"RouteParameters","tag":"RouteParameters","type":"*variable","value":"~*req.14"}],"file_name":"Routes.csv","flags":null,"type":"*routes"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"RunID","tag":"RunID","type":"*variable","value":"~*req.4"},{"path":"AttributeIDs","tag":"AttributeIDs","type":"*variable","value":"~*req.5"}],"file_name":"Chargers.csv","flags":null,"type":"*chargers"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"Strategy","tag":"Strategy","type":"*variable","value":"~*req.4"},{"path":"StrategyParameters","tag":"StrategyParameters","type":"*variable","value":"~*req.5"},{"path":"ConnID","tag":"ConnID","type":"*variable","value":"~*req.6"},{"path":"ConnFilterIDs","tag":"ConnFilterIDs","type":"*variable","value":"~*req.7"},{"path":"ConnWeight","tag":"ConnWeight","type":"*variable","value":"~*req.8"},{"path":"ConnBlocker","tag":"ConnBlocker","type":"*variable","value":"~*req.9"},{"path":"ConnParameters","tag":"ConnParameters","type":"*variable","value":"~*req.10"}],"file_name":"DispatcherProfiles.csv","flags":null,"type":"*dispatchers"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Address","tag":"Address","type":"*variable","value":"~*req.2"},{"path":"Transport","tag":"Transport","type":"*variable","value":"~*req.3"},{"path":"ConnectAttempts","tag":"ConnectAttempts","type":"*variable","value":"~*req.4"},{"path":"Reconnects","tag":"Reconnects","type":"*variable","value":"~*req.5"},{"path":"ConnectTimeout","tag":"ConnectTimeout","type":"*variable","value":"~*req.6"},{"path":"ReplyTimeout","tag":"ReplyTimeout","type":"*variable","value":"~*req.7"},{"path":"TLS","tag":"TLS","type":"*variable","value":"~*req.8"},{"path":"ClientKey","tag":"ClientKey","type":"*variable","value":"~*req.9"},{"path":"ClientCertificate","tag":"ClientCertificate","type":"*variable","value":"~*req.10"},{"path":"CaCertificate","tag":"CaCertificate","type":"*variable","value":"~*req.11"}],"file_name":"DispatcherHosts.csv","flags":null,"type":"*dispatcher_hosts"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"MinCost","tag":"MinCost","type":"*variable","value":"~*req.4"},{"path":"MaxCost","tag":"MaxCost","type":"*variable","value":"~*req.5"},{"path":"MaxCostStrategy","tag":"MaxCostStrategy","type":"*variable","value":"~*req.6"},{"path":"RateID","tag":"RateID","type":"*variable","value":"~*req.7"},{"path":"RateFilterIDs","tag":"RateFilterIDs","type":"*variable","value":"~*req.8"},{"path":"RateActivationTimes","tag":"RateActivationTimes","type":"*variable","value":"~*req.9"},{"path":"RateWeight","tag":"RateWeight","type":"*variable","value":"~*req.10"},{"path":"RateBlocker","tag":"RateBlocker","type":"*variable","value":"~*req.11"},{"path":"RateIntervalStart","tag":"RateIntervalStart","type":"*variable","value":"~*req.12"},{"path":"RateFixedFee","tag":"RateFixedFee","type":"*variable","value":"~*req.13"},{"path":"RateRecurrentFee","tag":"RateRecurrentFee","type":"*variable","value":"~*req.14"},{"path":"RateUnit","tag":"RateUnit","type":"*variable","value":"~*req.15"},{"path":"RateIncrement","tag":"RateIncrement","type":"*variable","value":"~*req.16"}],"file_name":"RateProfiles.csv","flags":null,"type":"*rate_profiles"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"Schedule","tag":"Schedule","type":"*variable","value":"~*req.4"},{"path":"TargetType","tag":"TargetType","type":"*variable","value":"~*req.5"},{"path":"TargetIDs","tag":"TargetIDs","type":"*variable","value":"~*req.6"},{"path":"ActionID","tag":"ActionID","type":"*variable","value":"~*req.7"},{"path":"ActionFilterIDs","tag":"ActionFilterIDs","type":"*variable","value":"~*req.8"},{"path":"ActionBlocker","tag":"ActionBlocker","type":"*variable","value":"~*req.9"},{"path":"ActionTTL","tag":"ActionTTL","type":"*variable","value":"~*req.10"},{"path":"ActionType","tag":"ActionType","type":"*variable","value":"~*req.11"},{"path":"ActionOpts","tag":"ActionOpts","type":"*variable","value":"~*req.12"},{"path":"ActionPath","tag":"ActionPath","type":"*variable","value":"~*req.13"},{"path":"ActionValue","tag":"ActionValue","type":"*variable","value":"~*req.14"}],"file_name":"ActionProfiles.csv","flags":null,"type":"*action_profiles"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.3"},{"path":"BalanceID","tag":"BalanceID","type":"*variable","value":"~*req.4"},{"path":"BalanceFilterIDs","tag":"BalanceFilterIDs","type":"*variable","value":"~*req.5"},{"path":"BalanceWeight","tag":"BalanceWeight","type":"*variable","value":"~*req.6"},{"path":"BalanceBlocker","tag":"BalanceBlocker","type":"*variable","value":"~*req.7"},{"path":"BalanceType","tag":"BalanceType","type":"*variable","value":"~*req.8"},{"path":"BalanceOpts","tag":"BalanceOpts","type":"*variable","value":"~*req.9"},{"path":"BalanceCostIncrements","tag":"BalanceCostIncrements","type":"*variable","value":"~*req.10"},{"path":"BalanceAttributeIDs","tag":"BalanceAttributeIDs","type":"*variable","value":"~*req.11"},{"path":"BalanceRateProfileIDs","tag":"BalanceRateProfileIDs","type":"*variable","value":"~*req.12"},{"path":"BalanceUnitFactors","tag":"BalanceUnitFactors","type":"*variable","value":"~*req.13"},{"path":"BalanceUnits","tag":"BalanceUnits","type":"*variable","value":"~*req.14"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.15"}],"file_name":"Accounts.csv","flags":null,"type":"*accounts"}],"dry_run":false,"enabled":false,"field_separator":",","id":"*default","lock_filename":".cgr.lck","run_delay":"0","tenant":"","tp_in_dir":"/var/spool/cgrates/loader/in","tp_out_dir":"/var/spool/cgrates/loader/out"}],"migrator":{"out_datadb_encoding":"msgpack","out_datadb_host":"127.0.0.1","out_datadb_name":"10","out_datadb_opts":{"redisCACertificate":"","redisClientCertificate":"","redisClientKey":"","redisCluster":false,"redisClusterOndownDelay":"0","redisClusterSync":"5s","redisSentinel":"","redisTLS":false},"out_datadb_password":"","out_datadb_port":"6379","out_datadb_type":"redis","out_datadb_user":"cgrates","out_stordb_host":"127.0.0.1","out_stordb_name":"cgrates","out_stordb_opts":{},"out_stordb_password":"","out_stordb_port":"3306","out_stordb_type":"mysql","out_stordb_user":"cgrates","users_filters":[]},"radius_agent":{"client_dictionaries":{"*default":"/usr/share/cgrates/radius/dict/"},"client_secrets":{"*default":"CGRateS.org"},"enabled":false,"listen_acct":"127.0.0.1:1813","listen_auth":"127.0.0.1:1812","listen_net":"udp","request_processors":[],"sessions_conns":["*internal"]},"rates":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"rate_indexed_selects":true,"rate_nested_fields":false,"rate_prefix_indexed_fields":[],"rate_suffix_indexed_fields":[],"suffix_indexed_fields":[],"verbosity":1000},"registrarc":{"dispatchers":{"hosts":[],"refresh_interval":"5m0s","registrars_conns":[]},"rpc":{"hosts":[],"refresh_interval":"5m0s","registrars_conns":[]}},"resources":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"store_interval":"","suffix_indexed_fields":[],"thresholds_conns":[]},"routes":{"accounts_conns":[],"attributes_conns":[],"default_opts":{"*context":"*routes","*routesProfilesCount":1},"default_ratio":1,"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"rates_conns":[],"resources_conns":[],"stats_conns":[],"suffix_indexed_fields":[]},"rpc_conns":{"*bijson_localhost":{"conns":[{"address":"127.0.0.1:2014","transport":"*birpc_json"}],"poolSize":0,"strategy":"*first"},"*birpc_internal":{"conns":[{"address":"*birpc_internal","transport":""}],"poolSize":0,"strategy":"*first"},"*internal":{"conns":[{"address":"*internal","transport":""}],"poolSize":0,"strategy":"*first"},"*localhost":{"conns":[{"address":"127.0.0.1:2012","transport":"*json"}],"poolSize":0,"strategy":"*first"}},"sessions":{"actions_conns":[],"alterable_fields":[],"attributes_conns":[],"cdrs_conns":[],"channel_sync_interval":"0","chargers_conns":[],"client_protocol":1,"debit_interval":"0","default_usage":{"*any":"3h0m0s","*data":"1048576","*sms":"1","*voice":"3h0m0s"},"enabled":false,"listen_bigob":"","listen_bijson":"127.0.0.1:2014","min_dur_low_balance":"0","replication_conns":[],"resources_conns":[],"routes_conns":[],"session_indexes":[],"session_ttl":"0","stats_conns":[],"stir":{"allowed_attest":["*any"],"default_attest":"A","payload_maxduration":"-1","privatekey_path":"","publickey_path":""},"store_session_costs":false,"terminate_attempts":5,"thresholds_conns":[]},"sip_agent":{"enabled":false,"listen":"127.0.0.1:5060","listen_net":"udp","request_processors":[],"retransmission_timer":"1s","sessions_conns":["*internal"],"timezone":""},"stats":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"store_interval":"","store_uncompressed_limit":0,"suffix_indexed_fields":[],"thresholds_conns":[]},"stor_db":{"db_host":"127.0.0.1","db_name":"cgrates","db_password":"","db_port":3306,"db_type":"*mysql","db_user":"cgrates","items":{"*cdrs":{"remote":false,"replicate":false},"*session_costs":{"remote":false,"replicate":false},"*tp_accounts":{"remote":false,"replicate":false},"*tp_action_profiles":{"remote":false,"replicate":false},"*tp_attributes":{"remote":false,"replicate":false},"*tp_chargers":{"remote":false,"replicate":false},"*tp_dispatcher_hosts":{"remote":false,"replicate":false},"*tp_dispatcher_profiles":{"remote":false,"replicate":false},"*tp_filters":{"remote":false,"replicate":false},"*tp_rate_profiles":{"remote":false,"replicate":false},"*tp_resources":{"remote":false,"replicate":false},"*tp_routes":{"remote":false,"replicate":false},"*tp_stats":{"remote":false,"replicate":false},"*tp_thresholds":{"remote":false,"replicate":false},"*versions":{"remote":false,"replicate":false}},"opts":{"mongoQueryTimeout":"10s","mysqlLocation":"Local","sqlConnMaxLifetime":0,"sqlMaxIdleConns":10,"sqlMaxOpenConns":100,"sslMode":"disable"},"prefix_indexed_fields":[],"remote_conns":null,"replication_conns":null,"string_indexed_fields":[]},"suretax":{"bill_to_number":"","business_unit":"","client_number":"","client_tracking":"~*req.CGRID","customer_number":"~*req.Subject","include_local_cost":false,"orig_number":"~*req.Subject","p2pplus4":"","p2pzipcode":"","plus4":"","regulatory_code":"03","response_group":"03","response_type":"D4","return_file_code":"0","sales_type_code":"R","tax_exemption_code_list":"","tax_included":"0","tax_situs_rule":"04","term_number":"~*req.Destination","timezone":"UTC","trans_type_code":"010101","unit_type":"00","units":"1","url":"","validation_key":"","zipcode":""},"templates":{"*asr":[{"mandatory":true,"path":"*diamreq.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*diamreq.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*req.Destination-Host"},{"mandatory":true,"path":"*diamreq.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*req.Destination-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Realm","tag":"DestinationRealm","type":"*variable","value":"~*req.Origin-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Host","tag":"DestinationHost","type":"*variable","value":"~*req.Origin-Host"},{"mandatory":true,"path":"*diamreq.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"}],"*cca":[{"mandatory":true,"path":"*rep.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"path":"*rep.Result-Code","tag":"ResultCode","type":"*constant","value":"2001"},{"mandatory":true,"path":"*rep.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*vars.OriginHost"},{"mandatory":true,"path":"*rep.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*vars.OriginRealm"},{"mandatory":true,"path":"*rep.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"},{"mandatory":true,"path":"*rep.CC-Request-Type","tag":"CCRequestType","type":"*variable","value":"~*req.CC-Request-Type"},{"mandatory":true,"path":"*rep.CC-Request-Number","tag":"CCRequestNumber","type":"*variable","value":"~*req.CC-Request-Number"}],"*cdrLog":[{"mandatory":true,"path":"*cdr.ToR","tag":"ToR","type":"*variable","value":"~*req.BalanceType"},{"mandatory":true,"path":"*cdr.OriginHost","tag":"OriginHost","type":"*constant","value":"127.0.0.1"},{"mandatory":true,"path":"*cdr.RequestType","tag":"RequestType","type":"*constant","value":"*none"},{"mandatory":true,"path":"*cdr.Tenant","tag":"Tenant","type":"*variable","value":"~*req.Tenant"},{"mandatory":true,"path":"*cdr.Account","tag":"Account","type":"*variable","value":"~*req.Account"},{"mandatory":true,"path":"*cdr.Subject","tag":"Subject","type":"*variable","value":"~*req.Account"},{"mandatory":true,"path":"*cdr.Cost","tag":"Cost","type":"*variable","value":"~*req.Cost"},{"mandatory":true,"path":"*cdr.Source","tag":"Source","type":"*constant","value":"*cdrLog"},{"mandatory":true,"path":"*cdr.Usage","tag":"Usage","type":"*constant","value":"1"},{"mandatory":true,"path":"*cdr.RunID","tag":"RunID","type":"*variable","value":"~*req.ActionType"},{"mandatory":true,"path":"*cdr.SetupTime","tag":"SetupTime","type":"*constant","value":"*now"},{"mandatory":true,"path":"*cdr.AnswerTime","tag":"AnswerTime","type":"*constant","value":"*now"},{"mandatory":true,"path":"*cdr.PreRated","tag":"PreRated","type":"*constant","value":"true"}],"*err":[{"mandatory":true,"path":"*rep.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*rep.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*vars.OriginHost"},{"mandatory":true,"path":"*rep.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*vars.OriginRealm"}],"*errSip":[{"mandatory":true,"path":"*rep.Request","tag":"Request","type":"*constant","value":"SIP/2.0 500 Internal Server Error"}],"*rar":[{"mandatory":true,"path":"*diamreq.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*diamreq.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*req.Destination-Host"},{"mandatory":true,"path":"*diamreq.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*req.Destination-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Realm","tag":"DestinationRealm","type":"*variable","value":"~*req.Origin-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Host","tag":"DestinationHost","type":"*variable","value":"~*req.Origin-Host"},{"mandatory":true,"path":"*diamreq.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"},{"path":"*diamreq.Re-Auth-Request-Type","tag":"ReAuthRequestType","type":"*constant","value":"0"}]},"thresholds":{"actions_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"store_interval":"","suffix_indexed_fields":[]},"tls":{"ca_certificate":"","client_certificate":"","client_key":"","server_certificate":"","server_key":"","server_name":"","server_policy":4}}`
cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(cfgJSON)
if err != nil {
t.Fatal(err)
diff --git a/config/loaderscfg_test.go b/config/loaderscfg_test.go
index c715d7114..bc6ec4301 100644
--- a/config/loaderscfg_test.go
+++ b/config/loaderscfg_test.go
@@ -477,9 +477,9 @@ func TestLoaderSCfgloadFromJsonCfgCase1(t *testing.T) {
Layout: time.RFC3339,
},
{
- Tag: "Weight",
- Path: "Weight",
- pathSlice: []string{"Weight"},
+ Tag: "Weights",
+ Path: "Weights",
+ pathSlice: []string{"Weights"},
Type: utils.MetaVariable,
Value: NewRSRParsersMustCompile("~*req.3", utils.InfieldSep),
Mandatory: false,
@@ -558,9 +558,9 @@ func TestLoaderSCfgloadFromJsonCfgCase1(t *testing.T) {
Layout: time.RFC3339,
},
{
- Tag: "RouteWeight",
- Path: "RouteWeight",
- pathSlice: []string{"RouteWeight"},
+ Tag: "RouteWeights",
+ Path: "RouteWeights",
+ pathSlice: []string{"RouteWeights"},
Type: utils.MetaVariable,
Value: NewRSRParsersMustCompile("~*req.12", utils.InfieldSep),
Mandatory: false,
@@ -1827,8 +1827,8 @@ func TestLoaderCfgAsMapInterfaceCase1(t *testing.T) {
utils.ValueCfg: "~*req.2",
},
{
- utils.TagCfg: "Weight",
- utils.PathCfg: "Weight",
+ utils.TagCfg: "Weights",
+ utils.PathCfg: "Weights",
utils.TypeCfg: "*variable",
utils.ValueCfg: "~*req.3",
},
@@ -1881,8 +1881,8 @@ func TestLoaderCfgAsMapInterfaceCase1(t *testing.T) {
utils.ValueCfg: "~*req.11",
},
{
- utils.TagCfg: "RouteWeight",
- utils.PathCfg: "RouteWeight",
+ utils.TagCfg: "RouteWeights",
+ utils.PathCfg: "RouteWeights",
utils.TypeCfg: "*variable",
utils.ValueCfg: "~*req.12",
},
diff --git a/data/storage/mysql/create_tariffplan_tables.sql b/data/storage/mysql/create_tariffplan_tables.sql
index 8eb9a2e94..82d4c34e1 100644
--- a/data/storage/mysql/create_tariffplan_tables.sql
+++ b/data/storage/mysql/create_tariffplan_tables.sql
@@ -118,10 +118,10 @@ CREATE TABLE tp_routes (
`route_rate_profile_ids` varchar(64) NOT NULL,
`route_resource_ids` varchar(64) NOT NULL,
`route_stat_ids` varchar(64) NOT NULL,
- `route_weight` decimal(8,2) NOT NULL,
+ `route_weights` varchar(64) NOT NULL,
`route_blocker` BOOLEAN NOT NULL,
`route_parameters` varchar(64) NOT NULL,
- `weight` decimal(8,2) NOT NULL,
+ `weights` varchar(64) NOT NULL,
`created_at` TIMESTAMP,
PRIMARY KEY (`pk`),
KEY `tpid` (`tpid`),
diff --git a/data/storage/postgres/create_tariffplan_tables.sql b/data/storage/postgres/create_tariffplan_tables.sql
index 3fd24f317..61cd34c38 100644
--- a/data/storage/postgres/create_tariffplan_tables.sql
+++ b/data/storage/postgres/create_tariffplan_tables.sql
@@ -113,10 +113,10 @@ CREATE TABLE tp_routes (
"route_ratingplan_ids" varchar(64) NOT NULL,
"route_resource_ids" varchar(64) NOT NULL,
"route_stat_ids" varchar(64) NOT NULL,
- "route_weight" decimal(8,2) NOT NULL,
+ "route_weights" varchar(64) NOT NULL,
"route_blocker" BOOLEAN NOT NULL,
"route_parameters" varchar(64) NOT NULL,
- "weight" decimal(8,2) NOT NULL,
+ "weights" varchar(64) NOT NULL,
"created_at" TIMESTAMP WITH TIME ZONE
);
CREATE INDEX tp_routes_idx ON tp_routes (tpid);
diff --git a/data/tariffplans/cluelrn/Routes.csv b/data/tariffplans/cluelrn/Routes.csv
index a5638f595..c4b1e0661 100644
--- a/data/tariffplans/cluelrn/Routes.csv
+++ b/data/tariffplans/cluelrn/Routes.csv
@@ -1,4 +1,4 @@
-#Tenant,ID,FilterIDs,Weight,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters
-cgrates.org,ROUTE_CLUELRN_INTER,*string:~*req.Account:9174269000;*string:~*req.LRNJurisdiction:INTER,10,*lc,,LEVEL3,,,RP_LEVEL3_INTER,,,,false,
+#Tenant,ID,FilterIDs,Weights,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeights,RouteBlocker,RouteParameters
+cgrates.org,ROUTE_CLUELRN_INTER,*string:~*req.Account:9174269000;*string:~*req.LRNJurisdiction:INTER,;10,*lc,,LEVEL3,,,RP_LEVEL3_INTER,,,,false,
cgrates.org,ROUTE_CLUELRN_INTER,,,,,TMOBILE,,,RP_TMOBILE_INTER,,,,false,
cgrates.org,ROUTE_CLUELRN_INTER,,,,,COMCAST,,,RP_COMCAST_INTER,,,,false,
diff --git a/data/tariffplans/dnsagent/Routes.csv b/data/tariffplans/dnsagent/Routes.csv
index 8395eb0e5..73eeebd61 100644
--- a/data/tariffplans/dnsagent/Routes.csv
+++ b/data/tariffplans/dnsagent/Routes.csv
@@ -1,4 +1,4 @@
-#Tenant,ID,FilterIDs,Weight,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters
-cgrates.org,ROUTE_ACNT_1001,*string:~*req.Account:1001,10,*weight,,route1,,,,,,10,,!^(.*)$!sip:\1@172.16.1.11!
-cgrates.org,ROUTE_ACNT_1001,,10,,,route2,,,,,,5,,!^(.*)$!sip:\1@172.16.1.12!
+#Tenant,ID,FilterIDs,Weights,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeights,RouteBlocker,RouteParameters
+cgrates.org,ROUTE_ACNT_1001,*string:~*req.Account:1001,;10,*weight,,route1,,,,,,;10,,!^(.*)$!sip:\1@172.16.1.11!
+cgrates.org,ROUTE_ACNT_1001,,;10,,,route2,,,,,,;5,,!^(.*)$!sip:\1@172.16.1.12!
diff --git a/data/tariffplans/oldtutorial/Routes.csv b/data/tariffplans/oldtutorial/Routes.csv
index 973077648..f8d57f1b5 100644
--- a/data/tariffplans/oldtutorial/Routes.csv
+++ b/data/tariffplans/oldtutorial/Routes.csv
@@ -1,8 +1,8 @@
-#Tenant,ID,FilterIDs,Weight,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters
-cgrates.org,ROUTE_WEIGHT_2,,5,*weight,,route1,,,,,,10,,
-cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE;FLTR_ACNT_1007,10,*weight,,route1,,,,,,10,,
-cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE,,,,route2,,,,,,20,,
-cgrates.org,ROUTE_WEIGHT_1,FLTR_ACNT_1007,,,,route3,FLTR_ACNT_dan,,,,,15,,
-cgrates.org,ROUTE_LEASTCOST_1,FLTR_1,10,*lc,,route1,,,RP_SPECIAL_1002,,,10,false,
-cgrates.org,ROUTE_LEASTCOST_1,,,,,route2,,,RP_RETAIL1,,,20,,
-cgrates.org,ROUTE_LEASTCOST_1,,,,,route3,,,RP_SPECIAL_1002,,,15,,
+#Tenant,ID,FilterIDs,Weights,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeights,RouteBlocker,RouteParameters
+cgrates.org,ROUTE_WEIGHT_2,,;5,*weight,,route1,,,,,,;10,,
+cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE;FLTR_ACNT_1007,;10,*weight,,route1,,,,,,;10,,
+cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE,,,,route2,,,,,,;20,,
+cgrates.org,ROUTE_WEIGHT_1,FLTR_ACNT_1007,,,,route3,FLTR_ACNT_dan,,,,,;15,,
+cgrates.org,ROUTE_LEASTCOST_1,FLTR_1,;10,*lc,,route1,,,RP_SPECIAL_1002,,,;10,false,
+cgrates.org,ROUTE_LEASTCOST_1,,,,,route2,,,RP_RETAIL1,,,;20,,
+cgrates.org,ROUTE_LEASTCOST_1,,,,,route3,,,RP_SPECIAL_1002,,,;15,,
diff --git a/data/tariffplans/precache/Routes.csv b/data/tariffplans/precache/Routes.csv
index 973077648..f8d57f1b5 100644
--- a/data/tariffplans/precache/Routes.csv
+++ b/data/tariffplans/precache/Routes.csv
@@ -1,8 +1,8 @@
-#Tenant,ID,FilterIDs,Weight,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters
-cgrates.org,ROUTE_WEIGHT_2,,5,*weight,,route1,,,,,,10,,
-cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE;FLTR_ACNT_1007,10,*weight,,route1,,,,,,10,,
-cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE,,,,route2,,,,,,20,,
-cgrates.org,ROUTE_WEIGHT_1,FLTR_ACNT_1007,,,,route3,FLTR_ACNT_dan,,,,,15,,
-cgrates.org,ROUTE_LEASTCOST_1,FLTR_1,10,*lc,,route1,,,RP_SPECIAL_1002,,,10,false,
-cgrates.org,ROUTE_LEASTCOST_1,,,,,route2,,,RP_RETAIL1,,,20,,
-cgrates.org,ROUTE_LEASTCOST_1,,,,,route3,,,RP_SPECIAL_1002,,,15,,
+#Tenant,ID,FilterIDs,Weights,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeights,RouteBlocker,RouteParameters
+cgrates.org,ROUTE_WEIGHT_2,,;5,*weight,,route1,,,,,,;10,,
+cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE;FLTR_ACNT_1007,;10,*weight,,route1,,,,,,;10,,
+cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE,,,,route2,,,,,,;20,,
+cgrates.org,ROUTE_WEIGHT_1,FLTR_ACNT_1007,,,,route3,FLTR_ACNT_dan,,,,,;15,,
+cgrates.org,ROUTE_LEASTCOST_1,FLTR_1,;10,*lc,,route1,,,RP_SPECIAL_1002,,,;10,false,
+cgrates.org,ROUTE_LEASTCOST_1,,,,,route2,,,RP_RETAIL1,,,;20,,
+cgrates.org,ROUTE_LEASTCOST_1,,,,,route3,,,RP_SPECIAL_1002,,,;15,,
diff --git a/data/tariffplans/testit/Routes.csv b/data/tariffplans/testit/Routes.csv
index e54f75939..271045f0a 100644
--- a/data/tariffplans/testit/Routes.csv
+++ b/data/tariffplans/testit/Routes.csv
@@ -1,33 +1,33 @@
-#Tenant,ID,FilterIDs,Weight,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters
-cgrates.org,ROUTE_ACNT_1001,FLTR_ACCOUNT_1001,10,*weight,,route1,,,,,,20,,
-cgrates.org,ROUTE_ACNT_1001,,,,,route2,,,,,,10,,
-cgrates.org,ROUTE_WEIGHT_2,,5,*weight,,route1,,,,,,10,,
-cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE;FLTR_ACNT_1007,10,*weight,,route1,,,,,,10,,
-cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE,,,,route2,,,,,,20,,
-cgrates.org,ROUTE_WEIGHT_1,FLTR_ACNT_1007,,,,route3,FLTR_SPP_ACNT_dan,,,,,15,,
-cgrates.org,ROUTE_LEASTCOST_1,FLTR_1,10,*lc,,route1,,,RP_SPECIAL_1002,,,10,false,
-cgrates.org,ROUTE_LEASTCOST_1,,,,,route2,,,RP_RETAIL1,,,20,,
-cgrates.org,ROUTE_LEASTCOST_1,,,,,route3,,,RP_SPECIAL_1002,,,15,,
-cgrates.org,ROUTE_HIGHESTCOST_1,FLTR_SPP_2,20,*hc,,route1,,,RP_SPECIAL_1002,,,10,false,
-cgrates.org,ROUTE_HIGHESTCOST_1,,,,,route2,,,RP_RETAIL1,,,20,,
-cgrates.org,ROUTE_HIGHESTCOST_1,,,,,route3,,,RP_SPECIAL_1002,,,15,,
-cgrates.org,ROUTE_QOS_1,FLTR_SPP_3,20,*qos,*acd;*tcd;*asr,route1,,,,,Stat_1;Stat_1_1,10,false,
-cgrates.org,ROUTE_QOS_1,,,,,route2,,,,,Stat_2,20,,
-cgrates.org,ROUTE_QOS_1,,,,,route3,,,,,Stat_3,35,,
-cgrates.org,ROUTE_QOS_2,FLTR_SPP_4,20,*qos,*dcc,route1,,,,,Stat_1;Stat_1_1,10,false,
-cgrates.org,ROUTE_QOS_2,,,,,route2,,,,,Stat_2,20,,
-cgrates.org,ROUTE_QOS_2,,,,,route3,,,,,Stat_3,35,,
-cgrates.org,ROUTE_QOS_3,FLTR_SPP_5,20,*qos,*pdd,route1,,,,,Stat_1;Stat_1_1,10,false,
-cgrates.org,ROUTE_QOS_3,,,,,route2,,,,,Stat_2,20,,
-cgrates.org,ROUTE_QOS_3,,,,,route3,,,,,Stat_3,35,,
-cgrates.org,ROUTE_QOS_FILTRED,FLTR_SPP_6,20,*qos,*pdd,route1,FLTR_QOS_SP1,,,,Stat_1;Stat_1_1,10,false,
-cgrates.org,ROUTE_QOS_FILTRED,,,,,route2,FLTR_QOS_SP2,,,,Stat_2,20,,
-cgrates.org,ROUTE_QOS_FILTRED,,,,,route3,,,,,Stat_3,35,,
-cgrates.org,ROUTE_QOS_FILTRED2,FLTR_SPP_QOS_2,20,*qos,*acd;*tcd;*asr,route1,FLTR_QOS_SP1_2,,RP_SPECIAL_1002,,Stat_1;Stat_1_1,10,false,
-cgrates.org,ROUTE_QOS_FILTRED2,,,,,route2,FLTR_QOS_SP2_2,,RP_RETAIL1,,Stat_2,20,,
-cgrates.org,ROUTE_QOS_FILTRED2,,,,,route3,,,,,Stat_3,35,,
-cgrates.org,ROUTE_LCR,FLTR_TEST,50,*lc,,route_1,,,RP_TEST_1,,,10,,
+#Tenant,ID,FilterIDs,Weights,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeights,RouteBlocker,RouteParameters
+cgrates.org,ROUTE_ACNT_1001,FLTR_ACCOUNT_1001,;10,*weight,,route1,,,,,,;20,,
+cgrates.org,ROUTE_ACNT_1001,,,,,route2,,,,,,;10,,
+cgrates.org,ROUTE_WEIGHT_2,,;5,*weight,,route1,,,,,,;10,,
+cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE;FLTR_ACNT_1007,;10,*weight,,route1,,,,,,;10,,
+cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE,,,,route2,,,,,,;20,,
+cgrates.org,ROUTE_WEIGHT_1,FLTR_ACNT_1007,,,,route3,FLTR_SPP_ACNT_dan,,,,,;15,,
+cgrates.org,ROUTE_LEASTCOST_1,FLTR_1,;10,*lc,,route1,,,RP_SPECIAL_1002,,,;10,false,
+cgrates.org,ROUTE_LEASTCOST_1,,,,,route2,,,RP_RETAIL1,,,;20,,
+cgrates.org,ROUTE_LEASTCOST_1,,,,,route3,,,RP_SPECIAL_1002,,,;15,,
+cgrates.org,ROUTE_HIGHESTCOST_1,FLTR_SPP_2,;20,*hc,,route1,,,RP_SPECIAL_1002,,,;10,false,
+cgrates.org,ROUTE_HIGHESTCOST_1,,,,,route2,,,RP_RETAIL1,,,;20,,
+cgrates.org,ROUTE_HIGHESTCOST_1,,,,,route3,,,RP_SPECIAL_1002,,,;15,,
+cgrates.org,ROUTE_QOS_1,FLTR_SPP_3,;20,*qos,*acd;*tcd;*asr,route1,,,,,Stat_1;Stat_1_1,;10,false,
+cgrates.org,ROUTE_QOS_1,,,,,route2,,,,,Stat_2,;20,,
+cgrates.org,ROUTE_QOS_1,,,,,route3,,,,,Stat_3,;35,,
+cgrates.org,ROUTE_QOS_2,FLTR_SPP_4,;20,*qos,*dcc,route1,,,,,Stat_1;Stat_1_1,;10,false,
+cgrates.org,ROUTE_QOS_2,,,,,route2,,,,,Stat_2,;20,,
+cgrates.org,ROUTE_QOS_2,,,,,route3,,,,,Stat_3,;35,,
+cgrates.org,ROUTE_QOS_3,FLTR_SPP_5,;20,*qos,*pdd,route1,,,,,Stat_1;Stat_1_1,;10,false,
+cgrates.org,ROUTE_QOS_3,,,,,route2,,,,,Stat_2,;20,,
+cgrates.org,ROUTE_QOS_3,,,,,route3,,,,,Stat_3,;35,,
+cgrates.org,ROUTE_QOS_FILTRED,FLTR_SPP_6,;20,*qos,*pdd,route1,FLTR_QOS_SP1,,,,Stat_1;Stat_1_1,;10,false,
+cgrates.org,ROUTE_QOS_FILTRED,,,,,route2,FLTR_QOS_SP2,,,,Stat_2,;20,,
+cgrates.org,ROUTE_QOS_FILTRED,,,,,route3,,,,,Stat_3,;35,,
+cgrates.org,ROUTE_QOS_FILTRED2,FLTR_SPP_QOS_2,;20,*qos,*acd;*tcd;*asr,route1,FLTR_QOS_SP1_2,,RP_SPECIAL_1002,,Stat_1;Stat_1_1,;10,false,
+cgrates.org,ROUTE_QOS_FILTRED2,,,,,route2,FLTR_QOS_SP2_2,,RP_RETAIL1,,Stat_2,;20,,
+cgrates.org,ROUTE_QOS_FILTRED2,,,,,route3,,,,,Stat_3,;35,,
+cgrates.org,ROUTE_LCR,FLTR_TEST,;50,*lc,,route_1,,,RP_TEST_1,,,;10,,
cgrates.org,ROUTE_LCR,,,,,route_2,,,RP_TEST_2,,,,,
-cgrates.org,ROUTE_LOAD_DIST,FLTR_SPP_LOAD_DIST,20,*load,route1:2;route2:7;*default:5,route1,,,,,Stat_Supplier1:*sum#~*req.LoadReq,10,false,
-cgrates.org,ROUTE_LOAD_DIST,,,,,route2,,,,,Stat_Supplier2:*sum#~*req.LoadReq,20,,
-cgrates.org,ROUTE_LOAD_DIST,,,,,route3,,,,,Stat_Supplier3:*sum#~*req.LoadReq,35,,
\ No newline at end of file
+cgrates.org,ROUTE_LOAD_DIST,FLTR_SPP_LOAD_DIST,;20,*load,route1:2;route2:7;*default:5,route1,,,,,Stat_Supplier1:*sum#~*req.LoadReq,;10,false,
+cgrates.org,ROUTE_LOAD_DIST,,,,,route2,,,,,Stat_Supplier2:*sum#~*req.LoadReq,;20,,
+cgrates.org,ROUTE_LOAD_DIST,,,,,route3,,,,,Stat_Supplier3:*sum#~*req.LoadReq,;35,,
\ No newline at end of file
diff --git a/data/tariffplans/testtp/Routes.csv b/data/tariffplans/testtp/Routes.csv
index 238f105db..1d7bc2f79 100644
--- a/data/tariffplans/testtp/Routes.csv
+++ b/data/tariffplans/testtp/Routes.csv
@@ -1,5 +1,5 @@
-#Tenant,ID,FilterIDs,Weight,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters
-cgrates.org,ROUTE_1,FLTR_ACNT_dan;FLTR_DST_DE,10,*lc,,route1,FLTR_ACNT_dan,,RPL_1,ResGroup1,Stat1,10,false,SortingParameter1
-cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE;FLTR_ACNT_1007,10,*weight,,route1,,,,,,10,,
-cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE,,,,route2,,,,,,20,,
-cgrates.org,ROUTE_WEIGHT_1,FLTR_ACNT_1007,,,,route3,FLTR_ACNT_dan,,,,,15,,
+#Tenant,ID,FilterIDs,Weights,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeights,RouteBlocker,RouteParameters
+cgrates.org,ROUTE_1,FLTR_ACNT_dan;FLTR_DST_DE,;10,*lc,,route1,FLTR_ACNT_dan,,RPL_1,ResGroup1,Stat1,;10,false,SortingParameter1
+cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE;FLTR_ACNT_1007,;10,*weight,,route1,,,,,,;10,,
+cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE,,,,route2,,,,,,;20,,
+cgrates.org,ROUTE_WEIGHT_1,FLTR_ACNT_1007,,,,route3,FLTR_ACNT_dan,,,,,;15,,
diff --git a/data/tariffplans/tut_sip_redirect/Routes.csv b/data/tariffplans/tut_sip_redirect/Routes.csv
index 16b777819..a20cbf733 100644
--- a/data/tariffplans/tut_sip_redirect/Routes.csv
+++ b/data/tariffplans/tut_sip_redirect/Routes.csv
@@ -1,7 +1,7 @@
-#Tenant,ID,FilterIDs,Weight,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters
-cgrates.org,ROUTE_ACNT_1001,*string:~*req.Account:1001,20,*weight,,route1,,1001,RP_10CNT,,,20,,cgrates.org
-cgrates.org,ROUTE_ACNT_1001,,10,,,route2,,1001,RP_20CNT,,,10,,cgrates.net
-cgrates.org,ROUTE_ACNT_1001,,5,,,route3,,1001,RP_1CNT,,,5,,cgrates.com
-cgrates.org,ROUTE_ACNT_1002,*string:~*req.Account:1002,20,*weight,,route1,,1002,RP_10CNT,,,20,,1003@192.168.56.203
-cgrates.org,ROUTE_ACNT_1002,,10,,,route2,,1002,RP_20CNT,,,10,,1004@192.168.57.203
-cgrates.org,ROUTE_ACNT_1002,,5,,,route3,,1002,RP_1CNT,,,5,,1005@192.168.58.203
+#Tenant,ID,FilterIDs,Weights,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeights,RouteBlocker,RouteParameters
+cgrates.org,ROUTE_ACNT_1001,*string:~*req.Account:1001,;20,*weight,,route1,,1001,RP_10CNT,,,;20,,cgrates.org
+cgrates.org,ROUTE_ACNT_1001,,;10,,,route2,,1001,RP_20CNT,,,;10,,cgrates.net
+cgrates.org,ROUTE_ACNT_1001,,;5,,,route3,,1001,RP_1CNT,,,;5,,cgrates.com
+cgrates.org,ROUTE_ACNT_1002,*string:~*req.Account:1002,;20,*weight,,route1,,1002,RP_10CNT,,,;20,,1003@192.168.56.203
+cgrates.org,ROUTE_ACNT_1002,,;10,,,route2,,1002,RP_20CNT,,,;10,,1004@192.168.57.203
+cgrates.org,ROUTE_ACNT_1002,,;5,,,route3,,1002,RP_1CNT,,,;5,,1005@192.168.58.203
diff --git a/data/tariffplans/tutorial/Routes.csv b/data/tariffplans/tutorial/Routes.csv
index f841f378b..6f6bc071a 100644
--- a/data/tariffplans/tutorial/Routes.csv
+++ b/data/tariffplans/tutorial/Routes.csv
@@ -1,8 +1,8 @@
-#Tenant,ID,FilterIDs,Weight,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters
-cgrates.org,ROUTE_ACNT_1001,FLTR_ACNT_1001,10,*weight,,route1,,,,,,10,,
-cgrates.org,ROUTE_ACNT_1001,,20,,,route2,,,,,,20,,
-cgrates.org,ROUTE_ACNT_1002,FLTR_ACNT_1002,10,*lc,,route1,,,RP_1002_LOW,,,10,false,
-cgrates.org,ROUTE_ACNT_1002,,,,,route2,,,RP_1002,,,20,,
-cgrates.org,ROUTE_ACNT_1003,FLTR_ACNT_1003,10,*qos,*tcc;*tcd,route1,,,,,Stats2,10,false,
-cgrates.org,ROUTE_ACNT_1003,,,,,route2,,,,,Stats2_1,20,,
+#Tenant,ID,FilterIDs,Weights,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeights,RouteBlocker,RouteParameters
+cgrates.org,ROUTE_ACNT_1001,FLTR_ACNT_1001,;10,*weight,,route1,,,,,,;10,,
+cgrates.org,ROUTE_ACNT_1001,,;20,,,route2,,,,,,;20,,
+cgrates.org,ROUTE_ACNT_1002,FLTR_ACNT_1002,;10,*lc,,route1,,,RP_1002_LOW,,,;10,false,
+cgrates.org,ROUTE_ACNT_1002,,,,,route2,,,RP_1002,,,;20,,
+cgrates.org,ROUTE_ACNT_1003,FLTR_ACNT_1003,;10,*qos,*tcc;*tcd,route1,,,,,Stats2,;10,false,
+cgrates.org,ROUTE_ACNT_1003,,,,,route2,,,,,Stats2_1,;20,,
diff --git a/data/tariffplans/tutroutes/Routes.csv b/data/tariffplans/tutroutes/Routes.csv
index 4cb24af12..6479a98bf 100644
--- a/data/tariffplans/tutroutes/Routes.csv
+++ b/data/tariffplans/tutroutes/Routes.csv
@@ -1,27 +1,27 @@
-#Tenant,ID,FilterIDs,ActivationInterval,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters,Weight
+#Tenant,ID,FilterIDs,Weights,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeights,RouteBlocker,RouteParameters
-cgrates.org,ROUTE_ACNT_1001,*string:~*req.Account:1001,,*weight,,vendor1,FLTR_DEST_1003,,,,,10,,,
-cgrates.org,ROUTE_ACNT_1001,,,,,vendor2,*gte:~*accounts.1001.BalanceMap.*monetary[0].Value:10,,,,,20,,,
-cgrates.org,ROUTE_ACNT_1001,,,,,vendor3,FLTR_DEST_1003;*prefix:~*req.Account:10,,,,,40,,,
-cgrates.org,ROUTE_ACNT_1001,,,,,vendor4,,,,,,35,,,
+cgrates.org,ROUTE_ACNT_1001,*string:~*req.Account:1001,,*weight,,vendor1,FLTR_DEST_1003,,,,,;10,,,
+cgrates.org,ROUTE_ACNT_1001,,,,,vendor2,*gte:~*accounts.1001.BalanceMap.*monetary[0].Value:10,,,,,;20,,,
+cgrates.org,ROUTE_ACNT_1001,,,,,vendor3,FLTR_DEST_1003;*prefix:~*req.Account:10,,,,,;40,,,
+cgrates.org,ROUTE_ACNT_1001,,,,,vendor4,,,,,,;35,,,
-cgrates.org,ROUTE_ACNT_1002,*string:~*req.Account:1002,,*lc,,vendor1,*lte:~*resources.RES_GRP1.TotalUsage:5,,RP_VENDOR1,,,0,,,
-cgrates.org,ROUTE_ACNT_1002,,,,,vendor2,*gte:~*stats.STATS_VENDOR_2.*acd:1m,,RP_VENDOR2,,,0,,,
-cgrates.org,ROUTE_ACNT_1002,,,,,vendor3,,,RP_VENDOR2,,,10,,,
-cgrates.org,ROUTE_ACNT_1002,,,,,vendor4,*ai:~*req.AnswerTime:2013-06-01T00:00:00Z|2013-06-01T10:00:00Z,,RP_STANDARD,,,30,,,
+cgrates.org,ROUTE_ACNT_1002,*string:~*req.Account:1002,,*lc,,vendor1,*lte:~*resources.RES_GRP1.TotalUsage:5,,RP_VENDOR1,,,;0,,,
+cgrates.org,ROUTE_ACNT_1002,,,,,vendor2,*gte:~*stats.STATS_VENDOR_2.*acd:1m,,RP_VENDOR2,,,;0,,,
+cgrates.org,ROUTE_ACNT_1002,,,,,vendor3,,,RP_VENDOR2,,,;10,,,
+cgrates.org,ROUTE_ACNT_1002,,,,,vendor4,*ai:~*req.AnswerTime:2013-06-01T00:00:00Z|2013-06-01T10:00:00Z,,RP_STANDARD,,,;30,,,
-cgrates.org,ROUTE_ACNT_1003,*string:~*req.Account:1003,,*qos,*acd;*tcc,vendor1,,,,,STATS_VENDOR_1,0,,,
-cgrates.org,ROUTE_ACNT_1003,,,,,vendor2,*prefix:~*req.Destination:10,,,,STATS_VENDOR_2,0,,,
-cgrates.org,ROUTE_ACNT_1003,,,,,vendor3,*gte:~*stats.STATS_VENDOR_1.*tcc:6,,,,STATS_VENDOR_1,20,,,
+cgrates.org,ROUTE_ACNT_1003,*string:~*req.Account:1003,,*qos,*acd;*tcc,vendor1,,,,,STATS_VENDOR_1,;0,,,
+cgrates.org,ROUTE_ACNT_1003,,,,,vendor2,*prefix:~*req.Destination:10,,,,STATS_VENDOR_2,;0,,,
+cgrates.org,ROUTE_ACNT_1003,,,,,vendor3,*gte:~*stats.STATS_VENDOR_1.*tcc:6,,,,STATS_VENDOR_1,;20,,,
-cgrates.org,ROUTE_ACNT_1004,*string:~*req.Account:1004,,*reas,,vendor1,,,,RES_GRP1,,0,,,
-cgrates.org,ROUTE_ACNT_1004,,,,,vendor2,,,,RES_GRP2,,0,,,
-cgrates.org,ROUTE_ACNT_1004,,,,,vendor3,*gte:~*resources.RES_GRP1.TotalUsage:9,,,RES_GRP2,,10,,,
+cgrates.org,ROUTE_ACNT_1004,*string:~*req.Account:1004,,*reas,,vendor1,,,,RES_GRP1,,;0,,,
+cgrates.org,ROUTE_ACNT_1004,,,,,vendor2,,,,RES_GRP2,,;0,,,
+cgrates.org,ROUTE_ACNT_1004,,,,,vendor3,*gte:~*resources.RES_GRP1.TotalUsage:9,,,RES_GRP2,,;10,,,
cgrates.org,ROUTE_ACNT_1005,*string:~*req.Account:1005,,*load,vendor1:3;*default:2,vendor1,,,,,STATS_VENDOR_1:*sum#1,,,,
-cgrates.org,ROUTE_ACNT_1005,,,,,vendor2,,,,,STATS_VENDOR_2:*sum#1,10,,,
+cgrates.org,ROUTE_ACNT_1005,,,,,vendor2,,,,,STATS_VENDOR_2:*sum#1,;10,,,
cgrates.org,ROUTE_ACNT_1005,,,,,vendor3,,,,,STATS_VENDOR_2:*distinct#~*req.Usage,,,,
-cgrates.org,ROUTE_HC1,Fltr_tcc,,*hc,,route1,*gte:~*resources.RES_GRP2.Available:6,,RP_VENDOR2,RES_GRP2,,20,,,
-cgrates.org,ROUTE_HC1,,,,,route2,*gte:~*resources.RES_GRP1.TotalUsage:9,,RP_VENDOR1,RES_GRP1,,20,,,
-cgrates.org,ROUTE_HC1,,,,,route3,,,RP_VENDOR1,RES_GRP2,,10,,,
+cgrates.org,ROUTE_HC1,Fltr_tcc,,*hc,,route1,*gte:~*resources.RES_GRP2.Available:6,,RP_VENDOR2,RES_GRP2,,;20,,,
+cgrates.org,ROUTE_HC1,,,,,route2,*gte:~*resources.RES_GRP1.TotalUsage:9,,RP_VENDOR1,RES_GRP1,,;20,,,
+cgrates.org,ROUTE_HC1,,,,,route3,,,RP_VENDOR1,RES_GRP2,,;10,,,
diff --git a/dispatchers/cdrs_it_test.go b/dispatchers/cdrs_it_test.go
index b4043a076..06eab7e5e 100644
--- a/dispatchers/cdrs_it_test.go
+++ b/dispatchers/cdrs_it_test.go
@@ -119,7 +119,7 @@ func testDspCDRsPing(t *testing.T) {
func testDspCDRsProcessEvent(t *testing.T) {
var reply string
args := &engine.ArgV1ProcessEvent{
- Flags: []string{utils.MetaStore},
+ // Flags: []string{utils.MetaStore},
CGREvent: utils.CGREvent{
Tenant: "cgrates.org",
Event: map[string]interface{}{
diff --git a/dispatchers/routes_it_test.go b/dispatchers/routes_it_test.go
index 7e14bf903..892fae395 100644
--- a/dispatchers/routes_it_test.go
+++ b/dispatchers/routes_it_test.go
@@ -372,7 +372,7 @@ func testDspSupGetSupplierForEvent(t *testing.T) {
RateProfileIDs: []string{"RP_1002_LOW"},
ResourceIDs: nil,
StatIDs: nil,
- Weight: 10,
+ Weights: 10,
Blocker: false,
RouteParameters: "",
},
@@ -383,12 +383,12 @@ func testDspSupGetSupplierForEvent(t *testing.T) {
RateProfileIDs: []string{"RP_1002"},
ResourceIDs: nil,
StatIDs: nil,
- Weight: 20,
+ Weights: 20,
Blocker: false,
RouteParameters: "",
},
},
- Weight: 10,
+ Weights: 10,
}
if *encoding == utils.MetaGOB {
expected.SortingParameters = nil // empty slices are nil in gob
@@ -399,10 +399,10 @@ func testDspSupGetSupplierForEvent(t *testing.T) {
t.Fatal(err)
}
sort.Slice(expected.Routes, func(i, j int) bool {
- return expected.Routes[i].Weight < expected.Routes[j].Weight
+ return expected.Routes[i].Weights < expected.Routes[j].Weights
})
sort.Slice(supProf[0].Routes, func(i, j int) bool {
- return supProf[0].Routes[i].Weight < supProf[0].Routes[j].Weight
+ return supProf[0].Routes[i].Weights < supProf[0].Routes[j].Weights
})
if !reflect.DeepEqual(expected, *supProf[0]) {
t.Errorf("Expected: %s ,received: %s", utils.ToJSON(expected), utils.ToJSON(supProf))
diff --git a/engine/libroutes.go b/engine/libroutes.go
index 0d542d36a..8be20d800 100644
--- a/engine/libroutes.go
+++ b/engine/libroutes.go
@@ -219,20 +219,7 @@ func (sRoutes *SortedRoutes) AsNavigableMap() (nm *utils.DataNode) {
// RoutesSorter is the interface which needs to be implemented by routes sorters
type RoutesSorter interface {
- SortRoutes(*context.Context, string, map[string]*Route, *utils.CGREvent, *optsGetRoutes) (*SortedRoutes, error)
-}
-
-// NewRouteSortDispatcher constructs RouteSortDispatcher
-func NewRouteSortDispatcher(lcrS *RouteService) (rsd RouteSortDispatcher) {
- rsd = make(map[string]RoutesSorter)
- rsd[utils.MetaWeight] = NewWeightSorter(lcrS)
- rsd[utils.MetaLC] = NewLeastCostSorter(lcrS)
- rsd[utils.MetaHC] = NewHighestCostSorter(lcrS)
- rsd[utils.MetaQOS] = NewQOSRouteSorter(lcrS)
- rsd[utils.MetaReas] = NewResourceAscendetSorter(lcrS)
- rsd[utils.MetaReds] = NewResourceDescendentSorter(lcrS)
- rsd[utils.MetaLoad] = NewLoadDistributionSorter(lcrS)
- return
+ SortRoutes(*context.Context, string, map[string]*RouteWithWeight, *utils.CGREvent, *optsGetRoutes) (*SortedRoutes, error)
}
// RouteSortDispatcher will initialize strategies
@@ -240,10 +227,11 @@ func NewRouteSortDispatcher(lcrS *RouteService) (rsd RouteSortDispatcher) {
type RouteSortDispatcher map[string]RoutesSorter
func (ssd RouteSortDispatcher) SortRoutes(ctx *context.Context, prflID, strategy string,
- suppls map[string]*Route, suplEv *utils.CGREvent, extraOpts *optsGetRoutes) (sortedRoutes *SortedRoutes, err error) {
+ suppls map[string]*RouteWithWeight, suplEv *utils.CGREvent, extraOpts *optsGetRoutes) (_ *SortedRoutes, err error) {
sd, has := ssd[strategy]
if !has {
- return nil, fmt.Errorf("unsupported sorting strategy: %s", strategy)
+ err = fmt.Errorf("unsupported sorting strategy: %s", strategy)
+ return
}
return sd.SortRoutes(ctx, prflID, suppls, suplEv, extraOpts)
}
@@ -289,3 +277,46 @@ func (sRs SortedRoutesList) AsNavigableMap() (nm *utils.DataNode) {
}
return
}
+
+// RouteProfileWithWeight attaches static weight to RouteProfile
+type RouteProfileWithWeight struct {
+ *RouteProfile
+ Weight float64
+}
+
+// RouteProfiles is a sortable list of RouteProfile
+type RouteProfilesWithWeight []*RouteProfileWithWeight
+
+// Sort is part of sort interface, sort based on Weight
+func (lps RouteProfilesWithWeight) Sort() {
+ sort.Slice(lps, func(i, j int) bool { return lps[i].Weight > lps[j].Weight })
+}
+
+//routeLazyPass filters the route based on
+func routeLazyPass(ctx *context.Context, filters []*FilterRule, ev *utils.CGREvent, data utils.MapStorage,
+ resConns, statConns, acntConns []string) (pass bool, err error) {
+ if len(filters) == 0 {
+ return true, nil
+ }
+
+ dynDP := newDynamicDP(ctx, resConns, statConns, acntConns, //construct the DP and pass it to filterS
+ ev.Tenant, utils.MapStorage{
+ utils.MetaReq: ev.Event,
+ utils.MetaOpts: ev.APIOpts,
+ utils.MetaVars: data,
+ })
+
+ for _, rule := range filters { // verify the rules remaining from PartialPass
+ if pass, err = rule.Pass(ctx, dynDP); err != nil || !pass {
+ return
+ }
+ }
+ return true, nil
+}
+
+// RouteWithWeight attaches static weight to Route
+type RouteWithWeight struct {
+ *Route
+ Weight float64
+ lazyCheckRules []*FilterRule
+}
diff --git a/engine/libtest.go b/engine/libtest.go
index 8dbaa9005..db2180a56 100644
--- a/engine/libtest.go
+++ b/engine/libtest.go
@@ -114,11 +114,11 @@ cgrates.org,FLTR_DST_DE,*destinations,~*req.Destination,DST_DE
cgrates.org,FLTR_DST_NL,*destinations,~*req.Destination,DST_NL
`
RoutesCSVContent = `
-#Tenant[0],ID[1],FilterIDs[2],Weight[3],Sorting[4],SortingParameters[5],RouteID[6],RouteFilterIDs[7],RouteAccountIDs[8],RouteRateProfileIDs[9],RouteResourceIDs[10],RouteStatIDs[11],RouteWeight[12],RouteBlocker[13],RouteParameters[14]
-cgrates.org,RoutePrf1,*string:~*req.Account:dan,20,*lc,,route1,FLTR_ACNT_dan,Account1;Account1_1,RPL_1,ResGroup1,Stat1,10,true,param1
-cgrates.org,RoutePrf1,,,,,route1,,,RPL_2,ResGroup2,,10,,
-cgrates.org,RoutePrf1,,,,,route1,FLTR_DST_DE,Account2,RPL_3,ResGroup3,Stat2,10,,
-cgrates.org,RoutePrf1,,,,,route1,,,,ResGroup4,Stat3,10,,
+#Tenant[0],ID[1],FilterIDs[2],Weights[3],Sorting[4],SortingParameters[5],RouteID[6],RouteFilterIDs[7],RouteAccountIDs[8],RouteRateProfileIDs[9],RouteResourceIDs[10],RouteStatIDs[11],RouteWeights[12],RouteBlocker[13],RouteParameters[14]
+cgrates.org,RoutePrf1,*string:~*req.Account:dan,;20,*lc,,route1,FLTR_ACNT_dan,Account1;Account1_1,RPL_1,ResGroup1,Stat1,;10,true,param1
+cgrates.org,RoutePrf1,,,,,route1,,,RPL_2,ResGroup2,,;10,,
+cgrates.org,RoutePrf1,,,,,route1,FLTR_DST_DE,Account2,RPL_3,ResGroup3,Stat2,;10,,
+cgrates.org,RoutePrf1,,,,,route1,,,,ResGroup4,Stat3,;10,,
`
AttributesCSVContent = `
#Tenant,ID,FilterIDs,Weight,AttributeFilterIDs,Path,Type,Value,Blocker
diff --git a/engine/loader_csv_test.go b/engine/loader_csv_test.go
index a0b76dc20..be7e468ce 100644
--- a/engine/loader_csv_test.go
+++ b/engine/loader_csv_test.go
@@ -339,7 +339,7 @@ func TestLoadRouteProfiles(t *testing.T) {
RateProfileIDs: []string{"RPL_1"},
ResourceIDs: []string{"ResGroup1"},
StatIDs: []string{"Stat1"},
- Weight: 10,
+ Weights: ";10",
Blocker: true,
RouteParameters: "param1",
},
@@ -348,7 +348,7 @@ func TestLoadRouteProfiles(t *testing.T) {
RateProfileIDs: []string{"RPL_2"},
ResourceIDs: []string{"ResGroup2", "ResGroup4"},
StatIDs: []string{"Stat3"},
- Weight: 10,
+ Weights: ";10",
Blocker: false,
RouteParameters: utils.EmptyString,
},
@@ -359,12 +359,12 @@ func TestLoadRouteProfiles(t *testing.T) {
RateProfileIDs: []string{"RPL_3"},
ResourceIDs: []string{"ResGroup3"},
StatIDs: []string{"Stat2"},
- Weight: 10,
+ Weights: ";10",
Blocker: false,
RouteParameters: utils.EmptyString,
},
},
- Weight: 20,
+ Weights: ";20",
}
sort.Slice(eSppProfile.Routes, func(i, j int) bool {
return strings.Compare(eSppProfile.Routes[i].ID+strings.Join(eSppProfile.Routes[i].FilterIDs, utils.ConcatenatedKeySep),
diff --git a/engine/model_helpers.go b/engine/model_helpers.go
index a1556a754..604e85964 100644
--- a/engine/model_helpers.go
+++ b/engine/model_helpers.go
@@ -795,10 +795,10 @@ type RouteMdls []*RouteMdl
// CSVHeader return the header for csv fields as a slice of string
func (tps RouteMdls) CSVHeader() (result []string) {
- return []string{"#" + utils.Tenant, utils.ID, utils.FilterIDs, utils.Weight,
+ return []string{"#" + utils.Tenant, utils.ID, utils.FilterIDs, utils.Weights,
utils.Sorting, utils.SortingParameters, utils.RouteID, utils.RouteFilterIDs,
utils.RouteAccountIDs, utils.RouteRateProfileIDs, utils.RouteRateProfileIDs,
- utils.RouteResourceIDs, utils.RouteStatIDs, utils.RouteWeight, utils.RouteBlocker,
+ utils.RouteResourceIDs, utils.RouteStatIDs, utils.RouteWeights, utils.RouteBlocker,
utils.RouteParameters,
}
}
@@ -832,7 +832,7 @@ func (tps RouteMdls) AsTPRouteProfile() (result []*utils.TPRouteProfile) {
if !found {
sup = &utils.TPRoute{
ID: tp.RouteID,
- Weight: tp.RouteWeight,
+ Weights: tp.RouteWeights,
Blocker: tp.RouteBlocker,
RouteParameters: tp.RouteParameters,
}
@@ -868,8 +868,8 @@ func (tps RouteMdls) AsTPRouteProfile() (result []*utils.TPRouteProfile) {
}
sortingParameterMap[tenID].AddSlice(strings.Split(tp.SortingParameters, utils.InfieldSep))
}
- if tp.Weight != 0 {
- th.Weight = tp.Weight
+ if tp.Weights != utils.EmptyString {
+ th.Weights = tp.Weights
}
if tp.FilterIDs != utils.EmptyString {
if _, has := filterMap[tenID]; !has {
@@ -905,7 +905,7 @@ func APItoModelTPRoutes(st *utils.TPRouteProfile) (mdls RouteMdls) {
}
if i == 0 {
mdl.Sorting = st.Sorting
- mdl.Weight = st.Weight
+ mdl.Weights = st.Weights
for i, val := range st.FilterIDs {
if i != 0 {
mdl.FilterIDs += utils.InfieldSep
@@ -950,7 +950,7 @@ func APItoModelTPRoutes(st *utils.TPRouteProfile) (mdls RouteMdls) {
}
mdl.RouteStatIDs += val
}
- mdl.RouteWeight = supl.Weight
+ mdl.RouteWeights = supl.Weights
mdl.RouteParameters = supl.RouteParameters
mdl.RouteBlocker = supl.Blocker
mdls = append(mdls, mdl)
@@ -963,11 +963,17 @@ func APItoRouteProfile(tpRp *utils.TPRouteProfile, timezone string) (rp *RoutePr
Tenant: tpRp.Tenant,
ID: tpRp.ID,
Sorting: tpRp.Sorting,
- Weight: tpRp.Weight,
Routes: make([]*Route, len(tpRp.Routes)),
SortingParameters: make([]string, len(tpRp.SortingParameters)),
FilterIDs: make([]string, len(tpRp.FilterIDs)),
}
+ if tpRp.Weights != utils.EmptyString {
+ weight, err := utils.NewDynamicWeightsFromString(tpRp.Weights, utils.InfieldSep, utils.ANDSep)
+ if err != nil {
+ return nil, err
+ }
+ rp.Weights = weight
+ }
for i, stp := range tpRp.SortingParameters {
rp.SortingParameters[i] = stp
}
@@ -977,7 +983,6 @@ func APItoRouteProfile(tpRp *utils.TPRouteProfile, timezone string) (rp *RoutePr
for i, route := range tpRp.Routes {
rp.Routes[i] = &Route{
ID: route.ID,
- Weight: route.Weight,
Blocker: route.Blocker,
RateProfileIDs: route.RateProfileIDs,
AccountIDs: route.AccountIDs,
@@ -986,6 +991,13 @@ func APItoRouteProfile(tpRp *utils.TPRouteProfile, timezone string) (rp *RoutePr
StatIDs: route.StatIDs,
RouteParameters: route.RouteParameters,
}
+ if route.Weights != utils.EmptyString {
+ weight, err := utils.NewDynamicWeightsFromString(route.Weights, utils.InfieldSep, utils.ANDSep)
+ if err != nil {
+ return nil, err
+ }
+ rp.Routes[i].Weights = weight
+ }
}
return rp, nil
}
@@ -998,7 +1010,7 @@ func RouteProfileToAPI(rp *RouteProfile) (tpRp *utils.TPRouteProfile) {
Sorting: rp.Sorting,
SortingParameters: make([]string, len(rp.SortingParameters)),
Routes: make([]*utils.TPRoute, len(rp.Routes)),
- Weight: rp.Weight,
+ Weights: rp.Weights.String(utils.InfieldSep, utils.ANDSep),
}
for i, route := range rp.Routes {
@@ -1009,7 +1021,7 @@ func RouteProfileToAPI(rp *RouteProfile) (tpRp *utils.TPRouteProfile) {
RateProfileIDs: route.RateProfileIDs,
ResourceIDs: route.ResourceIDs,
StatIDs: route.StatIDs,
- Weight: route.Weight,
+ Weights: route.Weights.String(utils.InfieldSep, utils.ANDSep),
Blocker: route.Blocker,
RouteParameters: route.RouteParameters,
}
@@ -1863,7 +1875,7 @@ func APItoRateProfile(tpRp *utils.TPRateProfile, timezone string) (rp *utils.Rat
MaxCost: utils.NewDecimalFromFloat64(tpRp.MaxCost),
}
if tpRp.Weights != utils.EmptyString {
- weight, err := utils.NewDynamicWeightsFromString(tpRp.Weights, ";", "&")
+ weight, err := utils.NewDynamicWeightsFromString(tpRp.Weights, utils.InfieldSep, utils.ANDSep)
if err != nil {
return nil, err
}
@@ -1881,7 +1893,7 @@ func APItoRateProfile(tpRp *utils.TPRateProfile, timezone string) (rp *utils.Rat
IntervalRates: make([]*utils.IntervalRate, len(rate.IntervalRates)),
}
if rate.Weights != utils.EmptyString {
- weight, err := utils.NewDynamicWeightsFromString(rate.Weights, ";", "&")
+ weight, err := utils.NewDynamicWeightsFromString(rate.Weights, utils.InfieldSep, utils.ANDSep)
if err != nil {
return nil, err
}
@@ -1910,7 +1922,7 @@ func RateProfileToAPI(rp *utils.RateProfile) (tpRp *utils.TPRateProfile) {
Tenant: rp.Tenant,
ID: rp.ID,
FilterIDs: make([]string, len(rp.FilterIDs)),
- Weights: rp.Weights.String(";", "&"),
+ Weights: rp.Weights.String(utils.InfieldSep, utils.ANDSep),
MaxCostStrategy: rp.MaxCostStrategy,
Rates: make(map[string]*utils.TPRate),
}
@@ -1928,7 +1940,7 @@ func RateProfileToAPI(rp *utils.RateProfile) (tpRp *utils.TPRateProfile) {
for key, rate := range rp.Rates {
tpRp.Rates[key] = &utils.TPRate{
ID: rate.ID,
- Weights: rate.Weights.String(";", "&"),
+ Weights: rate.Weights.String(utils.InfieldSep, utils.ANDSep),
Blocker: rate.Blocker,
FilterIDs: rate.FilterIDs,
ActivationTimes: rate.ActivationTimes,
@@ -2367,7 +2379,7 @@ func APItoAccount(tpAp *utils.TPAccount, timezone string) (ap *utils.Account, er
ThresholdIDs: make([]string, len(tpAp.ThresholdIDs)),
}
if tpAp.Weights != utils.EmptyString {
- weight, err := utils.NewDynamicWeightsFromString(tpAp.Weights, ";", "&")
+ weight, err := utils.NewDynamicWeightsFromString(tpAp.Weights, utils.InfieldSep, utils.ANDSep)
if err != nil {
return nil, err
}
@@ -2384,7 +2396,7 @@ func APItoAccount(tpAp *utils.TPAccount, timezone string) (ap *utils.Account, er
Units: utils.NewDecimalFromFloat64(bal.Units),
}
if bal.Weights != utils.EmptyString {
- weight, err := utils.NewDynamicWeightsFromString(bal.Weights, ";", "&")
+ weight, err := utils.NewDynamicWeightsFromString(bal.Weights, utils.InfieldSep, utils.ANDSep)
if err != nil {
return nil, err
}
@@ -2450,7 +2462,7 @@ func AccountToAPI(ap *utils.Account) (tpAp *utils.TPAccount) {
tpAp = &utils.TPAccount{
Tenant: ap.Tenant,
ID: ap.ID,
- Weights: ap.Weights.String(";", "&"),
+ Weights: ap.Weights.String(utils.InfieldSep, utils.ANDSep),
FilterIDs: make([]string, len(ap.FilterIDs)),
Balances: make(map[string]*utils.TPAccountBalance, len(ap.Balances)),
ThresholdIDs: make([]string, len(ap.ThresholdIDs)),
@@ -2462,7 +2474,7 @@ func AccountToAPI(ap *utils.Account) (tpAp *utils.TPAccount) {
tpAp.Balances[i] = &utils.TPAccountBalance{
ID: bal.ID,
FilterIDs: make([]string, len(bal.FilterIDs)),
- Weights: bal.Weights.String(";", "&"),
+ Weights: bal.Weights.String(utils.InfieldSep, utils.ANDSep),
Type: bal.Type,
CostIncrement: make([]*utils.TPBalanceCostIncrement, len(bal.CostIncrements)),
AttributeIDs: make([]string, len(bal.AttributeIDs)),
diff --git a/engine/model_helpers_test.go b/engine/model_helpers_test.go
index eb4bdd75d..e0e34fb7e 100644
--- a/engine/model_helpers_test.go
+++ b/engine/model_helpers_test.go
@@ -963,10 +963,10 @@ func TestFilterToTPFilter(t *testing.T) {
func TestCsvHeader(t *testing.T) {
var tps RouteMdls
eOut := []string{
- "#" + utils.Tenant, utils.ID, utils.FilterIDs, utils.Weight,
+ "#" + utils.Tenant, utils.ID, utils.FilterIDs, utils.Weights,
utils.Sorting, utils.SortingParameters, utils.RouteID, utils.RouteFilterIDs,
utils.RouteAccountIDs, utils.RouteRateProfileIDs, utils.RouteRateProfileIDs, utils.RouteResourceIDs,
- utils.RouteStatIDs, utils.RouteWeight, utils.RouteBlocker,
+ utils.RouteStatIDs, utils.RouteWeights, utils.RouteBlocker,
utils.RouteParameters,
}
if rcv := tps.CSVHeader(); !reflect.DeepEqual(eOut, rcv) {
@@ -2065,10 +2065,10 @@ func TestTPRoutesAsTPRouteProfile(t *testing.T) {
RouteRateProfileIDs: "",
RouteResourceIDs: "",
RouteStatIDs: "",
- RouteWeight: 10.0,
+ RouteWeights: ";10.0",
RouteBlocker: false,
RouteParameters: "",
- Weight: 10.0,
+ Weights: ";10",
CreatedAt: time.Time{},
},
&RouteMdl{
@@ -2085,10 +2085,9 @@ func TestTPRoutesAsTPRouteProfile(t *testing.T) {
RouteRateProfileIDs: "",
RouteResourceIDs: "",
RouteStatIDs: "",
- RouteWeight: 20.0,
+ RouteWeights: ";20.0",
RouteBlocker: false,
RouteParameters: "",
- Weight: 0,
CreatedAt: time.Time{},
},
}
@@ -2102,15 +2101,15 @@ func TestTPRoutesAsTPRouteProfile(t *testing.T) {
FilterIDs: []string{"*ai:~*req.AnswerTime:2017-11-27T00:00:00Z", "FltrRoute"},
Routes: []*utils.TPRoute{
{
- ID: "route1",
- Weight: 10.0,
+ ID: "route1",
+ Weights: ";10.0",
},
{
- ID: "route2",
- Weight: 20.0,
+ ID: "route2",
+ Weights: ";20.0",
},
},
- Weight: 10,
+ Weights: ";10",
},
}
rcv := mdl.AsTPRouteProfile()
@@ -2137,10 +2136,10 @@ func TestTPRoutesAsTPRouteProfile(t *testing.T) {
RouteRateProfileIDs: "",
RouteResourceIDs: "",
RouteStatIDs: "",
- RouteWeight: 20.0,
+ RouteWeights: ";20.0",
RouteBlocker: false,
RouteParameters: "",
- Weight: 0,
+ Weights: ";0",
CreatedAt: time.Time{},
},
&RouteMdl{
@@ -2157,10 +2156,10 @@ func TestTPRoutesAsTPRouteProfile(t *testing.T) {
RouteRateProfileIDs: "",
RouteResourceIDs: "",
RouteStatIDs: "",
- RouteWeight: 10.0,
+ RouteWeights: ";10.0",
RouteBlocker: false,
RouteParameters: "",
- Weight: 10.0,
+ Weights: ";10",
CreatedAt: time.Time{},
},
}
@@ -2174,15 +2173,15 @@ func TestTPRoutesAsTPRouteProfile(t *testing.T) {
FilterIDs: []string{"*ai:~*req.AnswerTime:2017-11-27T00:00:00Z", "FltrRoute"},
Routes: []*utils.TPRoute{
{
- ID: "route1",
- Weight: 10.0,
+ ID: "route1",
+ Weights: ";10.0",
},
{
- ID: "route2",
- Weight: 20.0,
+ ID: "route2",
+ Weights: ";20.0",
},
},
- Weight: 10,
+ Weights: ";10",
},
}
rcvRev := mdlReverse.AsTPRouteProfile()
@@ -2212,10 +2211,10 @@ func TestTPRoutesAsTPRouteProfile2(t *testing.T) {
RouteRateProfileIDs: "",
RouteResourceIDs: "",
RouteStatIDs: "",
- RouteWeight: 10.0,
+ RouteWeights: ";10.0",
RouteBlocker: false,
RouteParameters: "",
- Weight: 10.0,
+ Weights: ";10",
CreatedAt: time.Time{},
},
&RouteMdl{
@@ -2232,10 +2231,9 @@ func TestTPRoutesAsTPRouteProfile2(t *testing.T) {
RouteRateProfileIDs: "",
RouteResourceIDs: "",
RouteStatIDs: "",
- RouteWeight: 20.0,
+ RouteWeights: ";20.0",
RouteBlocker: false,
RouteParameters: "",
- Weight: 0,
CreatedAt: time.Time{},
},
}
@@ -2249,15 +2247,15 @@ func TestTPRoutesAsTPRouteProfile2(t *testing.T) {
FilterIDs: []string{"*ai:~*req.AnswerTime:2017-11-27T00:00:00Z|2017-11-28T00:00:00Z", "FltrRoute"},
Routes: []*utils.TPRoute{
{
- ID: "route1",
- Weight: 10.0,
+ ID: "route1",
+ Weights: ";10.0",
},
{
- ID: "route2",
- Weight: 20.0,
+ ID: "route2",
+ Weights: ";20.0",
},
},
- Weight: 10,
+ Weights: ";10",
},
}
rcv := mdl.AsTPRouteProfile()
@@ -2284,10 +2282,10 @@ func TestTPRoutesAsTPRouteProfile2(t *testing.T) {
RouteRateProfileIDs: "",
RouteResourceIDs: "",
RouteStatIDs: "",
- RouteWeight: 20.0,
+ RouteWeights: ";20.0",
RouteBlocker: false,
RouteParameters: "",
- Weight: 0,
+ Weights: ";0",
CreatedAt: time.Time{},
},
&RouteMdl{
@@ -2304,10 +2302,10 @@ func TestTPRoutesAsTPRouteProfile2(t *testing.T) {
RouteRateProfileIDs: "",
RouteResourceIDs: "",
RouteStatIDs: "",
- RouteWeight: 10.0,
+ RouteWeights: ";10.0",
RouteBlocker: false,
RouteParameters: "",
- Weight: 10.0,
+ Weights: ";10",
CreatedAt: time.Time{},
},
}
@@ -2321,15 +2319,15 @@ func TestTPRoutesAsTPRouteProfile2(t *testing.T) {
FilterIDs: []string{"*ai:~*req.AnswerTime:2017-11-27T00:00:00Z|2017-11-28T00:00:00Z", "FltrRoute"},
Routes: []*utils.TPRoute{
{
- ID: "route1",
- Weight: 10.0,
+ ID: "route1",
+ Weights: ";10.0",
},
{
- ID: "route2",
- Weight: 20.0,
+ ID: "route2",
+ Weights: ";20.0",
},
},
- Weight: 10,
+ Weights: ";10",
},
}
rcvRev := mdlReverse.AsTPRouteProfile()
@@ -2986,12 +2984,12 @@ func TestAPItoModelTPRoutesEmptySlice(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{"Stat1", "Stat2"},
- Weight: 10,
+ Weights: ";10",
Blocker: false,
RouteParameters: "SortingParam1",
},
},
- Weight: 20,
+ Weights: ";20",
},
}
expMdl := RouteMdls{
@@ -3007,10 +3005,10 @@ func TestAPItoModelTPRoutesEmptySlice(t *testing.T) {
RouteRateProfileIDs: "",
RouteResourceIDs: "",
RouteStatIDs: "Stat1;Stat2",
- RouteWeight: 10,
+ RouteWeights: ";10",
RouteBlocker: false,
RouteParameters: "SortingParam1",
- Weight: 20,
+ Weights: ";20",
},
}
var mdl RouteMdls
@@ -3047,12 +3045,12 @@ func TestAPItoModelTPRoutesCase2(t *testing.T) {
RateProfileIDs: []string{"RPL_1", "RPL_2"},
ResourceIDs: []string{"ResGroup1", "ResGroup2"},
StatIDs: []string{"Stat1", "Stat2"},
- Weight: 10,
+ Weights: ";10",
Blocker: false,
RouteParameters: "SortingParam1",
},
},
- Weight: 20,
+ Weights: ";20",
}
expStructTest := RouteMdls{{
Tpid: "TP1",
@@ -3067,10 +3065,10 @@ func TestAPItoModelTPRoutesCase2(t *testing.T) {
RouteRateProfileIDs: "RPL_1;RPL_2",
RouteResourceIDs: "ResGroup1;ResGroup2",
RouteStatIDs: "Stat1;Stat2",
- RouteWeight: 10,
+ RouteWeights: ";10",
RouteBlocker: false,
RouteParameters: "SortingParam1",
- Weight: 20,
+ Weights: ";20",
},
}
sort.Strings(structTest.FilterIDs)
diff --git a/engine/models.go b/engine/models.go
index c6d8a2461..3624112d9 100644
--- a/engine/models.go
+++ b/engine/models.go
@@ -195,21 +195,21 @@ func (t TBLVersion) TableName() string {
type RouteMdl struct {
PK uint `gorm:"primary_key"`
Tpid string
- Tenant string `index:"0" re:""`
- ID string `index:"1" re:""`
- FilterIDs string `index:"2" re:""`
- Weight float64 `index:"3" re:"\d+\.?\d*"`
- Sorting string `index:"4" re:""`
- SortingParameters string `index:"5" re:""`
- RouteID string `index:"6" re:""`
- RouteFilterIDs string `index:"7" re:""`
- RouteAccountIDs string `index:"8" re:""`
- RouteRateProfileIDs string `index:"9" re:""`
- RouteResourceIDs string `index:"10" re:""`
- RouteStatIDs string `index:"11" re:""`
- RouteWeight float64 `index:"12" re:"\d+\.?\d*"`
- RouteBlocker bool `index:"13" re:""`
- RouteParameters string `index:"14" re:""`
+ Tenant string `index:"0" re:""`
+ ID string `index:"1" re:""`
+ FilterIDs string `index:"2" re:""`
+ Weights string `index:"3" re:""`
+ Sorting string `index:"4" re:""`
+ SortingParameters string `index:"5" re:""`
+ RouteID string `index:"6" re:""`
+ RouteFilterIDs string `index:"7" re:""`
+ RouteAccountIDs string `index:"8" re:""`
+ RouteRateProfileIDs string `index:"9" re:""`
+ RouteResourceIDs string `index:"10" re:""`
+ RouteStatIDs string `index:"11" re:""`
+ RouteWeights string `index:"12" re:""`
+ RouteBlocker bool `index:"13" re:""`
+ RouteParameters string `index:"14" re:""`
CreatedAt time.Time
}
diff --git a/engine/route_cost_sort.go b/engine/route_cost_sort.go
new file mode 100644
index 000000000..85b72d4e8
--- /dev/null
+++ b/engine/route_cost_sort.go
@@ -0,0 +1,135 @@
+/*
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
+Copyright (C) ITsysCOM GmbH
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see
+*/
+
+package engine
+
+import (
+ "fmt"
+
+ "github.com/cgrates/birpc/context"
+
+ "github.com/cgrates/cgrates/config"
+ "github.com/cgrates/cgrates/utils"
+)
+
+func populateCostForRoutes(ctx *context.Context, cfg *config.CGRConfig,
+ connMgr *ConnManager, routes map[string]*RouteWithWeight,
+ ev *utils.CGREvent, extraOpts *optsGetRoutes) (sortedRoutes []*SortedRoute, err error) {
+ if len(cfg.RouteSCfg().RateSConns) == 0 {
+ return nil, utils.NewErrMandatoryIeMissing("connIDs")
+ }
+ sortedRoutes = make([]*SortedRoute, 0, len(routes))
+ for _, route := range routes {
+ if len(route.RateProfileIDs) == 0 && len(route.AccountIDs) == 0 {
+ utils.Logger.Warning(
+ fmt.Sprintf("<%s> supplier: <%s> - empty RateProfileIDs or AccountIDs",
+ utils.RouteS, route.ID))
+ return nil, utils.NewErrMandatoryIeMissing("RateProfileIDs or AccountIDs")
+ }
+ srtRoute := &SortedRoute{
+ RouteID: route.ID,
+ SortingData: map[string]interface{}{
+ utils.Weight: route.Weight,
+ },
+ sortingDataF64: map[string]float64{
+ utils.Weight: route.Weight,
+ },
+ RouteParameters: route.RouteParameters,
+ }
+ var rpCost utils.RateProfileCost
+ if err = connMgr.Call(ctx, cfg.RouteSCfg().RateSConns,
+ utils.RateSv1CostForEvent,
+ &utils.ArgsCostForEvent{
+ RateProfileIDs: route.RateProfileIDs,
+ CGREvent: ev,
+ }, &rpCost); err != nil {
+ if extraOpts.ignoreErrors {
+ utils.Logger.Warning(
+ fmt.Sprintf("<%s> ignoring route with ID: %s, err: %s",
+ utils.RouteS, route.ID, err.Error()))
+ continue
+ }
+ return
+ }
+ cost, _ := rpCost.Cost.Float64()
+ srtRoute.sortingDataF64[utils.Cost] = cost
+ srtRoute.SortingData[utils.Cost] = cost
+ srtRoute.SortingData[utils.RatingPlanID] = rpCost.ID
+ var pass bool
+ if pass, err = routeLazyPass(ctx, route.lazyCheckRules, ev, srtRoute.SortingData,
+ cfg.FilterSCfg().ResourceSConns,
+ cfg.FilterSCfg().StatSConns,
+ cfg.FilterSCfg().AccountSConns); err != nil {
+ return
+ } else if pass {
+ sortedRoutes = append(sortedRoutes, srtRoute)
+ }
+ }
+ return
+}
+
+func NewHighestCostSorter(cfg *config.CGRConfig, connMgr *ConnManager) *HightCostSorter {
+ return &HightCostSorter{cfg: cfg, connMgr: connMgr}
+}
+
+// HightCostSorter sorts routes based on their cost
+type HightCostSorter struct {
+ cfg *config.CGRConfig
+ connMgr *ConnManager
+}
+
+func (hcs *HightCostSorter) SortRoutes(ctx *context.Context, prflID string, routes map[string]*RouteWithWeight,
+ ev *utils.CGREvent, extraOpts *optsGetRoutes) (sortedRoutes *SortedRoutes, err error) {
+ var sRoutes []*SortedRoute
+ if sRoutes, err = populateCostForRoutes(ctx, hcs.cfg, hcs.connMgr, routes, ev, extraOpts); err != nil {
+ return
+ }
+
+ sortedRoutes = &SortedRoutes{
+ ProfileID: prflID,
+ Sorting: utils.MetaHC,
+ Routes: sRoutes,
+ }
+ sortedRoutes.SortHighestCost()
+ return
+}
+
+func NewLeastCostSorter(cfg *config.CGRConfig, connMgr *ConnManager) *LeastCostSorter {
+ return &LeastCostSorter{cfg: cfg, connMgr: connMgr}
+}
+
+// LeastCostSorter sorts routes based on their cost
+type LeastCostSorter struct {
+ cfg *config.CGRConfig
+ connMgr *ConnManager
+}
+
+func (lcs *LeastCostSorter) SortRoutes(ctx *context.Context, prflID string, routes map[string]*RouteWithWeight,
+ ev *utils.CGREvent, extraOpts *optsGetRoutes) (sortedRoutes *SortedRoutes, err error) {
+ var sRoutes []*SortedRoute
+ if sRoutes, err = populateCostForRoutes(ctx, lcs.cfg, lcs.connMgr, routes, ev, extraOpts); err != nil {
+ return
+ }
+ sortedRoutes = &SortedRoutes{
+ ProfileID: prflID,
+ Sorting: utils.MetaLC,
+ Routes: sRoutes,
+ }
+ sortedRoutes.SortLeastCost()
+ return
+}
diff --git a/engine/route_highestcost.go b/engine/route_highestcost.go
deleted file mode 100644
index 3c984de78..000000000
--- a/engine/route_highestcost.go
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
-Copyright (C) ITsysCOM GmbH
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see
-*/
-
-package engine
-
-import (
- "fmt"
-
- "github.com/cgrates/birpc/context"
-
- "github.com/cgrates/cgrates/utils"
-)
-
-func NewHighestCostSorter(rS *RouteService) *HightCostSorter {
- return &HightCostSorter{rS: rS,
- sorting: utils.MetaHC}
-}
-
-// HightCostSorter sorts routes based on their cost
-type HightCostSorter struct {
- sorting string
- rS *RouteService
-}
-
-func (hcs *HightCostSorter) SortRoutes(ctx *context.Context, prflID string, routes map[string]*Route,
- ev *utils.CGREvent, extraOpts *optsGetRoutes) (sortedRoutes *SortedRoutes, err error) {
- sortedRoutes = &SortedRoutes{ProfileID: prflID,
- Sorting: hcs.sorting,
- Routes: make([]*SortedRoute, 0)}
- for _, route := range routes {
- if len(route.RateProfileIDs) == 0 && len(route.AccountIDs) == 0 {
- utils.Logger.Warning(
- fmt.Sprintf("<%s> supplier: <%s> - empty RateProfileIDs or AccountIDs",
- utils.RouteS, route.ID))
- return nil, utils.NewErrMandatoryIeMissing("RateProfileIDs or AccountIDs")
- }
- if srtSpl, pass, err := hcs.rS.populateSortingData(ctx, ev, route, extraOpts); err != nil {
- return nil, err
- } else if pass && srtSpl != nil {
- sortedRoutes.Routes = append(sortedRoutes.Routes, srtSpl)
- }
- }
- sortedRoutes.SortHighestCost()
- return
-}
diff --git a/engine/route_leastcost.go b/engine/route_leastcost.go
deleted file mode 100644
index 5572c38be..000000000
--- a/engine/route_leastcost.go
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
-Copyright (C) ITsysCOM GmbH
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see
-*/
-
-package engine
-
-import (
- "fmt"
-
- "github.com/cgrates/birpc/context"
-
- "github.com/cgrates/cgrates/utils"
-)
-
-func NewLeastCostSorter(rS *RouteService) *LeastCostSorter {
- return &LeastCostSorter{rS: rS,
- sorting: utils.MetaLC}
-}
-
-// LeastCostSorter sorts routes based on their cost
-type LeastCostSorter struct {
- sorting string
- rS *RouteService
-}
-
-func (lcs *LeastCostSorter) SortRoutes(ctx *context.Context, prflID string, routes map[string]*Route,
- ev *utils.CGREvent, extraOpts *optsGetRoutes) (sortedRoutes *SortedRoutes, err error) {
- sortedRoutes = &SortedRoutes{ProfileID: prflID,
- Sorting: lcs.sorting,
- Routes: make([]*SortedRoute, 0)}
- for _, s := range routes {
- if len(s.RateProfileIDs) == 0 && len(s.AccountIDs) == 0 {
- utils.Logger.Warning(
- fmt.Sprintf("<%s> supplier: <%s> - empty RateProfileIDs or AccountIDs",
- utils.RouteS, s.ID))
- return nil, utils.NewErrMandatoryIeMissing("RateProfileIDs or AccountIDs")
- }
- if srtSpl, pass, err := lcs.rS.populateSortingData(ctx, ev, s, extraOpts); err != nil {
- return nil, err
- } else if pass && srtSpl != nil {
- sortedRoutes.Routes = append(sortedRoutes.Routes, srtSpl)
- }
- }
- sortedRoutes.SortLeastCost()
- return
-}
diff --git a/engine/route_load_distribution.go b/engine/route_load_distribution.go
index 25fff57ec..514129416 100644
--- a/engine/route_load_distribution.go
+++ b/engine/route_load_distribution.go
@@ -20,31 +20,35 @@ package engine
import (
"fmt"
+ "strings"
"github.com/cgrates/birpc/context"
+ "github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
)
// NewLoadDistributionSorter .
-func NewLoadDistributionSorter(rS *RouteService) *LoadDistributionSorter {
- return &LoadDistributionSorter{rS: rS,
- sorting: utils.MetaLoad}
+func NewLoadDistributionSorter(cfg *config.CGRConfig, connMgr *ConnManager) *LoadDistributionSorter {
+ return &LoadDistributionSorter{cfg: cfg, connMgr: connMgr}
}
// LoadDistributionSorter orders suppliers based on their Resource Usage
type LoadDistributionSorter struct {
- sorting string
- rS *RouteService
+ cfg *config.CGRConfig
+ connMgr *ConnManager
}
// SortRoutes .
func (ws *LoadDistributionSorter) SortRoutes(ctx *context.Context, prflID string,
- routes map[string]*Route, suplEv *utils.CGREvent, extraOpts *optsGetRoutes) (sortedRoutes *SortedRoutes, err error) {
+ routes map[string]*RouteWithWeight, ev *utils.CGREvent, extraOpts *optsGetRoutes) (sortedRoutes *SortedRoutes, err error) {
+ if len(ws.cfg.RouteSCfg().StatSConns) == 0 {
+ return nil, utils.NewErrMandatoryIeMissing("connIDs")
+ }
sortedRoutes = &SortedRoutes{
ProfileID: prflID,
- Sorting: ws.sorting,
- Routes: make([]*SortedRoute, 0),
+ Sorting: utils.MetaLoad,
+ Routes: make([]*SortedRoute, 0, len(routes)),
}
for _, route := range routes {
// we should have at least 1 statID defined for counting CDR (a.k.a *sum:1)
@@ -54,9 +58,35 @@ func (ws *LoadDistributionSorter) SortRoutes(ctx *context.Context, prflID string
utils.RouteS, route.ID))
return nil, utils.NewErrMandatoryIeMissing("StatIDs")
}
- if srtSpl, pass, err := ws.rS.populateSortingData(ctx, suplEv, route, extraOpts); err != nil {
- return nil, err
- } else if pass && srtSpl != nil {
+ srtRoute := &SortedRoute{
+ RouteID: route.ID,
+ SortingData: map[string]interface{}{
+ utils.Weight: route.Weight,
+ },
+ sortingDataF64: map[string]float64{
+ utils.Weight: route.Weight,
+ },
+ RouteParameters: route.RouteParameters,
+ }
+ var metricSum float64
+ if metricSum, err = populateStatsForLoadRoute(ctx, ws.cfg, ws.connMgr, route.StatIDs, ev.Tenant); err != nil { //create metric map for route
+ if extraOpts.ignoreErrors {
+ utils.Logger.Warning(
+ fmt.Sprintf("<%s> ignoring route with ID: %s, err: %s",
+ utils.RouteS, route.ID, err.Error()))
+ continue
+ }
+ return
+ }
+ srtRoute.SortingData[utils.Load] = metricSum
+ srtRoute.sortingDataF64[utils.Load] = metricSum
+ var pass bool
+ if pass, err = routeLazyPass(ctx, route.lazyCheckRules, ev, srtRoute.SortingData,
+ ws.cfg.FilterSCfg().ResourceSConns,
+ ws.cfg.FilterSCfg().StatSConns,
+ ws.cfg.FilterSCfg().AccountSConns); err != nil {
+ return
+ } else if pass {
// Add the ratio in SortingData so we can used it later in SortLoadDistribution
floatRatio, err := utils.IfaceAsFloat64(route.cacheRoute[utils.MetaRatio])
if err != nil {
@@ -64,11 +94,50 @@ func (ws *LoadDistributionSorter) SortRoutes(ctx *context.Context, prflID string
fmt.Sprintf("<%s> cannot convert ratio <%+v> to float64 supplier: <%s>",
utils.RouteS, route.cacheRoute[utils.MetaRatio], route.ID))
}
- srtSpl.SortingData[utils.Ratio] = floatRatio
- srtSpl.sortingDataF64[utils.Ratio] = floatRatio
- sortedRoutes.Routes = append(sortedRoutes.Routes, srtSpl)
+ srtRoute.SortingData[utils.Ratio] = floatRatio
+ srtRoute.sortingDataF64[utils.Ratio] = floatRatio
+ sortedRoutes.Routes = append(sortedRoutes.Routes, srtRoute)
}
}
sortedRoutes.SortLoadDistribution()
return
}
+
+// populateStatsForLoadRoute will query a list of statIDs and return the sum of metrics
+// first metric found is always returned
+func populateStatsForLoadRoute(ctx *context.Context, cfg *config.CGRConfig,
+ connMgr *ConnManager, statIDs []string, tenant string) (result float64, err error) {
+ for _, statID := range statIDs {
+ // check if we get an ID in the following form (StatID:MetricID)
+ statWithMetric := strings.Split(statID, utils.InInFieldSep)
+ var metrics map[string]float64
+ if err = connMgr.Call(ctx,
+ cfg.RouteSCfg().StatSConns,
+ utils.StatSv1GetQueueFloatMetrics,
+ &utils.TenantIDWithAPIOpts{
+ TenantID: &utils.TenantID{
+ Tenant: tenant, ID: statWithMetric[0]}},
+ &metrics); err != nil &&
+ err.Error() != utils.ErrNotFound.Error() {
+ utils.Logger.Warning(
+ fmt.Sprintf("<%s> error: %s getting statMetrics for stat : %s",
+ utils.RouteS, err.Error(), statWithMetric[0]))
+ continue
+ }
+ if len(statWithMetric) == 2 { // in case we have MetricID defined with StatID we consider only that metric
+ // check if statQueue have metric defined
+ metricVal, has := metrics[statWithMetric[1]]
+ if !has {
+ return 0, fmt.Errorf("<%s> error: %s metric %s for statID: %s",
+ utils.RouteS, utils.ErrNotFound, statWithMetric[1], statWithMetric[0])
+ }
+ result += metricVal
+ } else { // otherwise we consider all metrics
+ for _, val := range metrics {
+ //add value of metric in a slice in case that we get the same metric from different stat
+ result += val
+ }
+ }
+ }
+ return
+}
diff --git a/engine/route_qos.go b/engine/route_qos.go
index a5ee768bd..11e4eac18 100644
--- a/engine/route_qos.go
+++ b/engine/route_qos.go
@@ -19,33 +19,117 @@ along with this program. If not, see
package engine
import (
+ "fmt"
+ "math"
+
"github.com/cgrates/birpc/context"
+ "github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
)
-func NewQOSRouteSorter(rS *RouteService) *QOSRouteSorter {
- return &QOSRouteSorter{rS: rS,
- sorting: utils.MetaQOS}
+func NewQOSRouteSorter(cfg *config.CGRConfig, connMgr *ConnManager) *QOSRouteSorter {
+ return &QOSRouteSorter{cfg: cfg, connMgr: connMgr}
}
// QOSSorter sorts route based on stats
type QOSRouteSorter struct {
- sorting string
- rS *RouteService
+ cfg *config.CGRConfig
+ connMgr *ConnManager
}
-func (qos *QOSRouteSorter) SortRoutes(ctx *context.Context, prflID string, routes map[string]*Route,
+func (qos *QOSRouteSorter) SortRoutes(ctx *context.Context, prflID string, routes map[string]*RouteWithWeight,
ev *utils.CGREvent, extraOpts *optsGetRoutes) (sortedRoutes *SortedRoutes, err error) {
- sortedRoutes = &SortedRoutes{ProfileID: prflID,
- Sorting: qos.sorting,
- Routes: make([]*SortedRoute, 0)}
+ if len(qos.cfg.RouteSCfg().StatSConns) == 0 {
+ return nil, utils.NewErrMandatoryIeMissing("connIDs")
+ }
+ sortedRoutes = &SortedRoutes{
+ ProfileID: prflID,
+ Sorting: utils.MetaQOS,
+ Routes: make([]*SortedRoute, 0, len(routes)),
+ }
for _, route := range routes {
- if srtSpl, pass, err := qos.rS.populateSortingData(ctx, ev, route, extraOpts); err != nil {
- return nil, err
- } else if pass && srtSpl != nil {
- sortedRoutes.Routes = append(sortedRoutes.Routes, srtSpl)
+ srtRoute := &SortedRoute{
+ RouteID: route.ID,
+ SortingData: map[string]interface{}{
+ utils.Weight: route.Weight,
+ },
+ sortingDataF64: map[string]float64{
+ utils.Weight: route.Weight,
+ },
+ RouteParameters: route.RouteParameters,
+ }
+ var metricSupp map[string]float64
+ if metricSupp, err = populatStatsForQOSRoute(ctx, qos.cfg, qos.connMgr, route.StatIDs, ev.Tenant); err != nil { //create metric map for route
+ if extraOpts.ignoreErrors {
+ utils.Logger.Warning(
+ fmt.Sprintf("<%s> ignoring route with ID: %s, err: %s",
+ utils.RouteS, route.ID, err.Error()))
+ continue
+ }
+ return
+ }
+ // add metrics from statIDs in SortingData
+ for key, val := range metricSupp {
+ srtRoute.SortingData[key] = val
+ srtRoute.sortingDataF64[key] = val
+ }
+ // check if the route have the metric from sortingParameters
+ // in case that the metric don't exist
+ // we use 10000000 for *pdd and -1 for others
+ for _, metric := range extraOpts.sortingParameters {
+ if _, hasMetric := metricSupp[metric]; !hasMetric {
+ if metric == utils.MetaPDD {
+ srtRoute.SortingData[metric] = math.MaxFloat64
+ srtRoute.sortingDataF64[metric] = math.MaxFloat64
+ } else {
+ srtRoute.SortingData[metric] = -1.0
+ srtRoute.sortingDataF64[metric] = -1.0
+ }
+ }
+ }
+ var pass bool
+ if pass, err = routeLazyPass(ctx, route.lazyCheckRules, ev, srtRoute.SortingData,
+ qos.cfg.FilterSCfg().ResourceSConns,
+ qos.cfg.FilterSCfg().StatSConns,
+ qos.cfg.FilterSCfg().AccountSConns); err != nil {
+ return
+ } else if pass {
+ sortedRoutes.Routes = append(sortedRoutes.Routes, srtRoute)
}
}
sortedRoutes.SortQOS(extraOpts.sortingParameters)
return
}
+
+// populatStatsForQOSRoute will query a list of statIDs and return composed metric values
+// first metric found is always returned
+func populatStatsForQOSRoute(ctx *context.Context, cfg *config.CGRConfig,
+ connMgr *ConnManager, statIDs []string, tenant string) (stsMetric map[string]float64, err error) {
+ type metric struct {
+ sum float64
+ len int
+ }
+ stsMetric = make(map[string]float64)
+ provStsMetrics := make(map[string]metric)
+ for _, statID := range statIDs {
+ var metrics map[string]float64
+ if err = connMgr.Call(ctx, cfg.RouteSCfg().StatSConns, utils.StatSv1GetQueueFloatMetrics,
+ &utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: statID}}, &metrics); err != nil &&
+ err.Error() != utils.ErrNotFound.Error() {
+ utils.Logger.Warning(
+ fmt.Sprintf("<%s> error: %s getting statMetrics for stat : %s", utils.RouteS, err.Error(), statID))
+ return
+ }
+ for key, val := range metrics {
+ //add value of metric in a slice in case that we get the same metric from different stat
+ provStsMetrics[key] = metric{
+ sum: provStsMetrics[key].sum + val,
+ len: provStsMetrics[key].len + 1,
+ }
+ }
+ }
+ for metric, val := range provStsMetrics {
+ stsMetric[metric] = val.sum / float64(val.len)
+ }
+ return
+}
diff --git a/engine/route_reas.go b/engine/route_reas.go
deleted file mode 100644
index 553f96e52..000000000
--- a/engine/route_reas.go
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
-Copyright (C) ITsysCOM GmbH
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see
-*/
-
-package engine
-
-import (
- "fmt"
-
- "github.com/cgrates/birpc/context"
-
- "github.com/cgrates/cgrates/utils"
-)
-
-func NewResourceAscendetSorter(rS *RouteService) *ResourceAscendentSorter {
- return &ResourceAscendentSorter{rS: rS,
- sorting: utils.MetaReas}
-}
-
-// ResourceAscendentSorter orders ascendent routes based on their Resource Usage
-type ResourceAscendentSorter struct {
- sorting string
- rS *RouteService
-}
-
-func (ws *ResourceAscendentSorter) SortRoutes(ctx *context.Context, prflID string,
- routes map[string]*Route, suplEv *utils.CGREvent, extraOpts *optsGetRoutes) (sortedRoutes *SortedRoutes, err error) {
- sortedRoutes = &SortedRoutes{ProfileID: prflID,
- Sorting: ws.sorting,
- Routes: make([]*SortedRoute, 0)}
- for _, route := range routes {
- if len(route.ResourceIDs) == 0 {
- utils.Logger.Warning(
- fmt.Sprintf("<%s> supplier: <%s> - empty ResourceIDs",
- utils.RouteS, route.ID))
- return nil, utils.NewErrMandatoryIeMissing("ResourceIDs")
- }
- if srtSpl, pass, err := ws.rS.populateSortingData(ctx, suplEv, route, extraOpts); err != nil {
- return nil, err
- } else if pass && srtSpl != nil {
- sortedRoutes.Routes = append(sortedRoutes.Routes, srtSpl)
- }
- }
- sortedRoutes.SortResourceAscendent()
- return
-}
diff --git a/engine/route_reds.go b/engine/route_reds.go
deleted file mode 100644
index d4cf3293a..000000000
--- a/engine/route_reds.go
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
-Copyright (C) ITsysCOM GmbH
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see
-*/
-
-package engine
-
-import (
- "fmt"
-
- "github.com/cgrates/birpc/context"
- "github.com/cgrates/cgrates/utils"
-)
-
-func NewResourceDescendentSorter(rS *RouteService) *ResourceDescendentSorter {
- return &ResourceDescendentSorter{rS: rS,
- sorting: utils.MetaReds}
-}
-
-// ResourceDescendentSorter orders suppliers based on their Resource Usage
-type ResourceDescendentSorter struct {
- sorting string
- rS *RouteService
-}
-
-func (ws *ResourceDescendentSorter) SortRoutes(ctx *context.Context, prflID string,
- routes map[string]*Route, suplEv *utils.CGREvent, extraOpts *optsGetRoutes) (sortedRoutes *SortedRoutes, err error) {
- sortedRoutes = &SortedRoutes{ProfileID: prflID,
- Sorting: ws.sorting,
- Routes: make([]*SortedRoute, 0)}
- for _, route := range routes {
- if len(route.ResourceIDs) == 0 {
- utils.Logger.Warning(
- fmt.Sprintf("<%s> supplier: <%s> - empty ResourceIDs",
- utils.RouteS, route.ID))
- return nil, utils.NewErrMandatoryIeMissing("ResourceIDs")
- }
- if srtSpl, pass, err := ws.rS.populateSortingData(ctx, suplEv, route, extraOpts); err != nil {
- return nil, err
- } else if pass && srtSpl != nil {
- sortedRoutes.Routes = append(sortedRoutes.Routes, srtSpl)
- }
- }
- sortedRoutes.SortResourceDescendent()
- return
-}
diff --git a/engine/route_resource_sort.go b/engine/route_resource_sort.go
new file mode 100644
index 000000000..b3ff59341
--- /dev/null
+++ b/engine/route_resource_sort.go
@@ -0,0 +1,130 @@
+/*
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
+Copyright (C) ITsysCOM GmbH
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see
+*/
+
+package engine
+
+import (
+ "fmt"
+
+ "github.com/cgrates/birpc/context"
+
+ "github.com/cgrates/cgrates/config"
+ "github.com/cgrates/cgrates/utils"
+)
+
+func populateResourcesForRoutes(ctx *context.Context, cfg *config.CGRConfig,
+ connMgr *ConnManager, routes map[string]*RouteWithWeight,
+ ev *utils.CGREvent, extraOpts *optsGetRoutes) (sortedRoutes []*SortedRoute, err error) {
+ if len(cfg.RouteSCfg().ResourceSConns) == 0 {
+ return nil, utils.NewErrMandatoryIeMissing("connIDs")
+ }
+ sortedRoutes = make([]*SortedRoute, 0, len(routes))
+ for _, route := range routes {
+ if len(route.ResourceIDs) == 0 {
+ utils.Logger.Warning(
+ fmt.Sprintf("<%s> supplier: <%s> - empty ResourceIDs",
+ utils.RouteS, route.ID))
+ return nil, utils.NewErrMandatoryIeMissing("ResourceIDs")
+ }
+ srtRoute := &SortedRoute{
+ RouteID: route.ID,
+ SortingData: map[string]interface{}{
+ utils.Weight: route.Weight,
+ },
+ sortingDataF64: map[string]float64{
+ utils.Weight: route.Weight,
+ },
+ RouteParameters: route.RouteParameters,
+ }
+ var tUsage float64
+ for _, resID := range route.ResourceIDs {
+ var res Resource
+ if err = connMgr.Call(ctx, cfg.RouteSCfg().ResourceSConns, utils.ResourceSv1GetResource,
+ &utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: ev.Tenant, ID: resID}},
+ &res); err != nil && err.Error() != utils.ErrNotFound.Error() {
+ utils.Logger.Warning(
+ fmt.Sprintf("<%s> error: %s getting resource for ID : %s", utils.RouteS, err.Error(), resID))
+ err = nil
+ continue
+ }
+ tUsage += res.TotalUsage()
+ }
+ srtRoute.SortingData[utils.ResourceUsage] = tUsage
+ srtRoute.sortingDataF64[utils.ResourceUsage] = tUsage
+ var pass bool
+ if pass, err = routeLazyPass(ctx, route.lazyCheckRules, ev, srtRoute.SortingData,
+ cfg.FilterSCfg().ResourceSConns,
+ cfg.FilterSCfg().StatSConns,
+ cfg.FilterSCfg().AccountSConns); err != nil {
+ return
+ } else if pass {
+ sortedRoutes = append(sortedRoutes, srtRoute)
+ }
+ }
+ return
+}
+
+func NewResourceAscendetSorter(cfg *config.CGRConfig, connMgr *ConnManager) *ResourceAscendentSorter {
+ return &ResourceAscendentSorter{cfg: cfg, connMgr: connMgr}
+}
+
+// ResourceAscendentSorter orders ascendent routes based on their Resource Usage
+type ResourceAscendentSorter struct {
+ cfg *config.CGRConfig
+ connMgr *ConnManager
+}
+
+func (ws *ResourceAscendentSorter) SortRoutes(ctx *context.Context, prflID string,
+ routes map[string]*RouteWithWeight, ev *utils.CGREvent, extraOpts *optsGetRoutes) (sortedRoutes *SortedRoutes, err error) {
+ var sRoutes []*SortedRoute
+ if sRoutes, err = populateResourcesForRoutes(ctx, ws.cfg, ws.connMgr, routes, ev, extraOpts); err != nil {
+ return
+ }
+ sortedRoutes = &SortedRoutes{
+ ProfileID: prflID,
+ Sorting: utils.MetaReas,
+ Routes: sRoutes,
+ }
+ sortedRoutes.SortResourceAscendent()
+ return
+}
+
+func NewResourceDescendentSorter(cfg *config.CGRConfig, connMgr *ConnManager) *ResourceDescendentSorter {
+ return &ResourceDescendentSorter{cfg: cfg, connMgr: connMgr}
+}
+
+// ResourceDescendentSorter orders suppliers based on their Resource Usage
+type ResourceDescendentSorter struct {
+ cfg *config.CGRConfig
+ connMgr *ConnManager
+}
+
+func (ws *ResourceDescendentSorter) SortRoutes(ctx *context.Context, prflID string,
+ routes map[string]*RouteWithWeight, ev *utils.CGREvent, extraOpts *optsGetRoutes) (sortedRoutes *SortedRoutes, err error) {
+ var sRoutes []*SortedRoute
+ if sRoutes, err = populateResourcesForRoutes(ctx, ws.cfg, ws.connMgr, routes, ev, extraOpts); err != nil {
+ return
+ }
+ sortedRoutes = &SortedRoutes{
+ ProfileID: prflID,
+ Sorting: utils.MetaReds,
+ Routes: sRoutes,
+ }
+ sortedRoutes.SortResourceDescendent()
+ return
+}
diff --git a/engine/route_weight.go b/engine/route_weight.go
index 4a3c0d2e6..d8e602c41 100644
--- a/engine/route_weight.go
+++ b/engine/route_weight.go
@@ -20,29 +20,44 @@ package engine
import (
"github.com/cgrates/birpc/context"
+ "github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
)
-func NewWeightSorter(rS *RouteService) *WeightSorter {
- return &WeightSorter{rS: rS,
- sorting: utils.MetaWeight}
+func NewWeightSorter(cfg *config.CGRConfig) *WeightSorter {
+ return &WeightSorter{cfg: cfg}
}
// WeightSorter orders routes based on their weight, no cost involved
type WeightSorter struct {
- sorting string
- rS *RouteService
+ cfg *config.CGRConfig
}
func (ws *WeightSorter) SortRoutes(ctx *context.Context, prflID string,
- routes map[string]*Route, suplEv *utils.CGREvent, extraOpts *optsGetRoutes) (sortedRoutes *SortedRoutes, err error) {
- sortedRoutes = &SortedRoutes{ProfileID: prflID,
- Sorting: ws.sorting,
- Routes: make([]*SortedRoute, 0)}
+ routes map[string]*RouteWithWeight, ev *utils.CGREvent, _ *optsGetRoutes) (sortedRoutes *SortedRoutes, err error) {
+ sortedRoutes = &SortedRoutes{
+ ProfileID: prflID,
+ Sorting: utils.MetaWeight,
+ Routes: make([]*SortedRoute, 0, len(routes)),
+ }
for _, route := range routes {
- if srtRoute, pass, err := ws.rS.populateSortingData(ctx, suplEv, route, extraOpts); err != nil {
- return nil, err
- } else if pass && srtRoute != nil {
+ srtRoute := &SortedRoute{
+ RouteID: route.ID,
+ SortingData: map[string]interface{}{
+ utils.Weight: route.Weight,
+ },
+ sortingDataF64: map[string]float64{
+ utils.Weight: route.Weight,
+ },
+ RouteParameters: route.RouteParameters,
+ }
+ var pass bool
+ if pass, err = routeLazyPass(ctx, route.lazyCheckRules, ev, srtRoute.SortingData,
+ ws.cfg.FilterSCfg().ResourceSConns,
+ ws.cfg.FilterSCfg().StatSConns,
+ ws.cfg.FilterSCfg().AccountSConns); err != nil {
+ return
+ } else if pass {
sortedRoutes.Routes = append(sortedRoutes.Routes, srtRoute)
}
}
diff --git a/engine/routes.go b/engine/routes.go
index 5e77b934d..1244cb95b 100644
--- a/engine/routes.go
+++ b/engine/routes.go
@@ -20,8 +20,6 @@ package engine
import (
"fmt"
- "math"
- "sort"
"strconv"
"strings"
"time"
@@ -39,12 +37,11 @@ type Route struct {
RateProfileIDs []string // used when computing price
ResourceIDs []string // queried in some strategies
StatIDs []string // queried in some strategies
- Weight float64
+ Weights utils.DynamicWeights
Blocker bool // do not process further route after this one
RouteParameters string
- cacheRoute map[string]interface{} // cache["*ratio"]=ratio
- lazyCheckRules []*FilterRule
+ cacheRoute map[string]interface{} // cache["*ratio"]=ratio
}
// RouteProfile represents the configuration of a Route profile
@@ -55,7 +52,7 @@ type RouteProfile struct {
Sorting string // Sorting strategy
SortingParameters []string
Routes []*Route
- Weight float64
+ Weights utils.DynamicWeights
}
// RouteProfileWithAPIOpts is used in replicatorV1 for dispatcher
@@ -104,24 +101,24 @@ func (rp *RouteProfile) TenantID() string {
return utils.ConcatenatedKey(rp.Tenant, rp.ID)
}
-// RouteProfiles is a sortable list of RouteProfile
-type RouteProfiles []*RouteProfile
-
-// Sort is part of sort interface, sort based on Weight
-func (lps RouteProfiles) Sort() {
- sort.Slice(lps, func(i, j int) bool { return lps[i].Weight > lps[j].Weight })
-}
-
// NewRouteService initializes the Route Service
func NewRouteService(dm *DataManager,
- filterS *FilterS, cgrcfg *config.CGRConfig, connMgr *ConnManager) (rS *RouteService) {
+ filterS *FilterS, cfg *config.CGRConfig, connMgr *ConnManager) (rS *RouteService) {
rS = &RouteService{
dm: dm,
filterS: filterS,
- cgrcfg: cgrcfg,
+ cfg: cfg,
connMgr: connMgr,
+ sorter: RouteSortDispatcher{
+ utils.MetaWeight: NewWeightSorter(cfg),
+ utils.MetaLC: NewLeastCostSorter(cfg, connMgr),
+ utils.MetaHC: NewHighestCostSorter(cfg, connMgr),
+ utils.MetaQOS: NewQOSRouteSorter(cfg, connMgr),
+ utils.MetaReas: NewResourceAscendetSorter(cfg, connMgr),
+ utils.MetaReds: NewResourceDescendentSorter(cfg, connMgr),
+ utils.MetaLoad: NewLoadDistributionSorter(cfg, connMgr),
+ },
}
- rS.sorter = NewRouteSortDispatcher(rS)
return
}
@@ -129,7 +126,7 @@ func NewRouteService(dm *DataManager,
type RouteService struct {
dm *DataManager
filterS *FilterS
- cgrcfg *config.CGRConfig
+ cfg *config.CGRConfig
sorter RouteSortDispatcher
connMgr *ConnManager
}
@@ -141,288 +138,52 @@ func (rpS *RouteService) Shutdown() {
}
// matchingRouteProfilesForEvent returns ordered list of matching resources which are active by the time of the call
-func (rpS *RouteService) matchingRouteProfilesForEvent(ctx *context.Context, tnt string, ev *utils.CGREvent) (matchingRPrf []*RouteProfile, err error) {
+func (rpS *RouteService) matchingRouteProfilesForEvent(ctx *context.Context, tnt string, ev *utils.CGREvent) (matchingRPrf RouteProfilesWithWeight, err error) {
evNm := utils.MapStorage{
utils.MetaReq: ev.Event,
utils.MetaOpts: ev.APIOpts,
}
rPrfIDs, err := MatchingItemIDsForEvent(ctx, evNm,
- rpS.cgrcfg.RouteSCfg().StringIndexedFields,
- rpS.cgrcfg.RouteSCfg().PrefixIndexedFields,
- rpS.cgrcfg.RouteSCfg().SuffixIndexedFields,
+ rpS.cfg.RouteSCfg().StringIndexedFields,
+ rpS.cfg.RouteSCfg().PrefixIndexedFields,
+ rpS.cfg.RouteSCfg().SuffixIndexedFields,
rpS.dm, utils.CacheRouteFilterIndexes, tnt,
- rpS.cgrcfg.RouteSCfg().IndexedSelects,
- rpS.cgrcfg.RouteSCfg().NestedFields,
+ rpS.cfg.RouteSCfg().IndexedSelects,
+ rpS.cfg.RouteSCfg().NestedFields,
)
if err != nil {
return nil, err
}
- matchingRPrf = make([]*RouteProfile, 0, len(rPrfIDs))
+ matchingRPrf = make(RouteProfilesWithWeight, 0, len(rPrfIDs))
for lpID := range rPrfIDs {
- rPrf, err := rpS.dm.GetRouteProfile(ctx, tnt, lpID, true, true, utils.NonTransactional)
- if err != nil {
+ var rPrf *RouteProfile
+ if rPrf, err = rpS.dm.GetRouteProfile(ctx, tnt, lpID, true, true, utils.NonTransactional); err != nil {
if err == utils.ErrNotFound {
continue
}
- return nil, err
+ return
}
- if pass, err := rpS.filterS.Pass(ctx, tnt, rPrf.FilterIDs,
+ var pass bool
+ if pass, err = rpS.filterS.Pass(ctx, tnt, rPrf.FilterIDs,
evNm); err != nil {
- return nil, err
+ return
} else if !pass {
continue
}
- matchingRPrf = append(matchingRPrf, rPrf)
+ var weight float64
+ if weight, err = WeightFromDynamics(ctx, rPrf.Weights,
+ rpS.filterS, ev.Tenant, evNm); err != nil {
+ return
+ }
+ matchingRPrf = append(matchingRPrf, &RouteProfileWithWeight{RouteProfile: rPrf, Weight: weight})
}
if len(matchingRPrf) == 0 {
return nil, utils.ErrNotFound
}
- sort.Slice(matchingRPrf, func(i, j int) bool { return matchingRPrf[i].Weight > matchingRPrf[j].Weight })
+ matchingRPrf.Sort()
return
}
-// costForEvent will compute cost out of accounts and rating plans for event
-// returns map[string]interface{} with cost and relevant matching information inside
-func (rpS *RouteService) costForEvent(ctx *context.Context, ev *utils.CGREvent,
- acntIDs, rpIDs []string) (costData map[string]interface{}, err error) {
- costData = make(map[string]interface{})
- var rpCost utils.RateProfileCost
- if err = rpS.connMgr.Call(ctx, rpS.cgrcfg.RouteSCfg().RateSConns,
- utils.RateSv1CostForEvent,
- &utils.ArgsCostForEvent{
- RateProfileIDs: rpIDs,
- CGREvent: ev,
- }, &rpCost); err != nil {
- return nil, err
- } else {
- costData[utils.Cost], _ = rpCost.Cost.Float64()
- costData[utils.RatingPlanID] = rpCost.ID
- }
-
- return
-}
-
-// statMetrics will query a list of statIDs and return composed metric values
-// first metric found is always returned
-func (rpS *RouteService) statMetrics(ctx *context.Context, statIDs []string, tenant string) (stsMetric map[string]float64, err error) {
- stsMetric = make(map[string]float64)
- provStsMetrics := make(map[string][]float64)
- if len(rpS.cgrcfg.RouteSCfg().StatSConns) != 0 {
- for _, statID := range statIDs {
- var metrics map[string]float64
- if err = rpS.connMgr.Call(ctx, rpS.cgrcfg.RouteSCfg().StatSConns, utils.StatSv1GetQueueFloatMetrics,
- &utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: statID}}, &metrics); err != nil &&
- err.Error() != utils.ErrNotFound.Error() {
- utils.Logger.Warning(
- fmt.Sprintf("<%s> error: %s getting statMetrics for stat : %s", utils.RouteS, err.Error(), statID))
- }
- for key, val := range metrics {
- //add value of metric in a slice in case that we get the same metric from different stat
- provStsMetrics[key] = append(provStsMetrics[key], val)
- }
- }
- for metric, slice := range provStsMetrics {
- sum := 0.0
- for _, val := range slice {
- sum += val
- }
- stsMetric[metric] = sum / float64(len(slice))
- }
- }
- return
-}
-
-// statMetricsForLoadDistribution will query a list of statIDs and return the sum of metrics
-// first metric found is always returned
-func (rpS *RouteService) statMetricsForLoadDistribution(ctx *context.Context, statIDs []string, tenant string) (result float64, err error) {
- provStsMetrics := make(map[string][]float64)
- if len(rpS.cgrcfg.RouteSCfg().StatSConns) != 0 {
- for _, statID := range statIDs {
- // check if we get an ID in the following form (StatID:MetricID)
- statWithMetric := strings.Split(statID, utils.InInFieldSep)
- var metrics map[string]float64
- if err = rpS.connMgr.Call(ctx,
- rpS.cgrcfg.RouteSCfg().StatSConns,
- utils.StatSv1GetQueueFloatMetrics,
- &utils.TenantIDWithAPIOpts{
- TenantID: &utils.TenantID{
- Tenant: tenant, ID: statWithMetric[0]}},
- &metrics); err != nil &&
- err.Error() != utils.ErrNotFound.Error() {
- utils.Logger.Warning(
- fmt.Sprintf("<%s> error: %s getting statMetrics for stat : %s",
- utils.RouteS, err.Error(), statWithMetric[0]))
- }
- if len(statWithMetric) == 2 { // in case we have MetricID defined with StatID we consider only that metric
- // check if statQueue have metric defined
- metricVal, has := metrics[statWithMetric[1]]
- if !has {
- return 0, fmt.Errorf("<%s> error: %s metric %s for statID: %s",
- utils.RouteS, utils.ErrNotFound, statWithMetric[1], statWithMetric[0])
- }
- provStsMetrics[statWithMetric[1]] = append(provStsMetrics[statWithMetric[1]], metricVal)
- } else { // otherwise we consider all metrics
- for key, val := range metrics {
- //add value of metric in a slice in case that we get the same metric from different stat
- provStsMetrics[key] = append(provStsMetrics[key], val)
- }
- }
- }
- for _, slice := range provStsMetrics {
- sum := 0.0
- for _, val := range slice {
- sum += val
- }
- result += sum
- }
- }
- return
-}
-
-// resourceUsage returns sum of all resource usages out of list
-func (rpS *RouteService) resourceUsage(ctx *context.Context, resIDs []string, tenant string) (tUsage float64, err error) {
- if len(rpS.cgrcfg.RouteSCfg().ResourceSConns) != 0 {
- for _, resID := range resIDs {
- var res Resource
- if err = rpS.connMgr.Call(ctx, rpS.cgrcfg.RouteSCfg().ResourceSConns, utils.ResourceSv1GetResource,
- &utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: resID}}, &res); err != nil && err.Error() != utils.ErrNotFound.Error() {
- utils.Logger.Warning(
- fmt.Sprintf("<%s> error: %s getting resource for ID : %s", utils.RouteS, err.Error(), resID))
- continue
- }
- tUsage += res.TotalUsage()
- }
- }
- return
-}
-
-func (rpS *RouteService) populateSortingData(ctx *context.Context, ev *utils.CGREvent, route *Route,
- extraOpts *optsGetRoutes) (srtRoute *SortedRoute, pass bool, err error) {
- sortedSpl := &SortedRoute{
- RouteID: route.ID,
- SortingData: map[string]interface{}{
- utils.Weight: route.Weight,
- },
- sortingDataF64: map[string]float64{
- utils.Weight: route.Weight,
- },
- RouteParameters: route.RouteParameters,
- }
- //calculate costData if we have fields
- if len(route.AccountIDs) != 0 || len(route.RateProfileIDs) != 0 {
- costData, err := rpS.costForEvent(ctx, ev, route.AccountIDs, route.RateProfileIDs)
- if err != nil {
- if extraOpts.ignoreErrors {
- utils.Logger.Warning(
- fmt.Sprintf("<%s> ignoring route with ID: %s, err: %s",
- utils.RouteS, route.ID, err.Error()))
- return nil, false, nil
- }
- return nil, false, err
- } else if len(costData) == 0 {
- utils.Logger.Warning(
- fmt.Sprintf("<%s> ignoring route with ID: %s, missing cost information",
- utils.RouteS, route.ID))
- return nil, false, nil
- } else {
- if extraOpts.maxCost != 0 &&
- costData[utils.Cost].(float64) > extraOpts.maxCost {
- utils.Logger.Warning(
- fmt.Sprintf("<%s> ignoring route with ID: %s, err: %s",
- utils.RouteS, route.ID, utils.ErrMaxCostExceeded.Error()))
- return nil, false, nil
- }
- for k, v := range costData {
- sortedSpl.SortingData[k] = v
- sortedSpl.sortingDataF64[k], _ = v.(float64)
- }
- }
- }
- //calculate metrics
- //in case we have *load strategy we use statMetricsForLoadDistribution function to calculate the result
- if len(route.StatIDs) != 0 {
- if extraOpts.sortingStragety == utils.MetaLoad {
- metricSum, err := rpS.statMetricsForLoadDistribution(ctx, route.StatIDs, ev.Tenant) //create metric map for route
- if err != nil {
- if extraOpts.ignoreErrors {
- utils.Logger.Warning(
- fmt.Sprintf("<%s> ignoring route with ID: %s, err: %s",
- utils.RouteS, route.ID, err.Error()))
- return nil, false, nil
- }
- return nil, false, err
- }
- sortedSpl.SortingData[utils.Load] = metricSum
- sortedSpl.sortingDataF64[utils.Load] = metricSum
- } else {
- metricSupp, err := rpS.statMetrics(ctx, route.StatIDs, ev.Tenant) //create metric map for route
- if err != nil {
- if extraOpts.ignoreErrors {
- utils.Logger.Warning(
- fmt.Sprintf("<%s> ignoring route with ID: %s, err: %s",
- utils.RouteS, route.ID, err.Error()))
- return nil, false, nil
- }
- return nil, false, err
- }
- //add metrics from statIDs in SortingData
- for key, val := range metricSupp {
- sortedSpl.SortingData[key] = val
- sortedSpl.sortingDataF64[key] = val
- }
- //check if the route have the metric from sortingParameters
- //in case that the metric don't exist
- //we use 10000000 for *pdd and -1 for others
- for _, metric := range extraOpts.sortingParameters {
- if _, hasMetric := metricSupp[metric]; !hasMetric {
- switch metric {
- default:
- sortedSpl.SortingData[metric] = -1.0
- sortedSpl.sortingDataF64[metric] = -1.0
- case utils.MetaPDD:
- sortedSpl.SortingData[metric] = math.MaxFloat64
- sortedSpl.sortingDataF64[metric] = math.MaxFloat64
- }
- }
- }
- }
- }
- //calculate resourceUsage
- if len(route.ResourceIDs) != 0 {
- resTotalUsage, err := rpS.resourceUsage(ctx, route.ResourceIDs, ev.Tenant)
- if err != nil {
- if extraOpts.ignoreErrors {
- utils.Logger.Warning(
- fmt.Sprintf("<%s> ignoring route with ID: %s, err: %s",
- utils.RouteS, route.ID, err.Error()))
- return nil, false, nil
- }
- return nil, false, err
- }
- sortedSpl.SortingData[utils.ResourceUsage] = resTotalUsage
- sortedSpl.sortingDataF64[utils.ResourceUsage] = resTotalUsage
- }
- //filter the route
- if len(route.lazyCheckRules) != 0 {
- //construct the DP and pass it to filterS
- dynDP := newDynamicDP(ctx, rpS.cgrcfg.FilterSCfg().ResourceSConns, rpS.cgrcfg.FilterSCfg().StatSConns,
- rpS.cgrcfg.FilterSCfg().AccountSConns,
- ev.Tenant, utils.MapStorage{
- utils.MetaReq: ev.Event,
- utils.MetaVars: sortedSpl.SortingData,
- })
-
- for _, rule := range route.lazyCheckRules { // verify the rules remaining from PartialPass
- if pass, err = rule.Pass(ctx, dynDP); err != nil {
- return nil, false, err
- } else if !pass {
- return nil, false, nil
- }
- }
- }
- return sortedSpl, true, nil
-}
-
// ArgsGetRoutes the argument for GetRoutes API
type ArgsGetRoutes struct {
IgnoreErrors bool
@@ -456,7 +217,7 @@ func (attr *ArgsGetRoutes) Clone() *ArgsGetRoutes {
}
func (attr *ArgsGetRoutes) asOptsGetRoutes() (opts *optsGetRoutes, err error) {
- opts = &optsGetRoutes{ignoreErrors: attr.IgnoreErrors}
+ opts = &optsGetRoutes{ignoreErrors: utils.OptAsBoolOrDef(attr.APIOpts, utils.MetaIgnoreErrors, attr.IgnoreErrors)}
if attr.MaxCost == utils.MetaEventCost { // dynamic cost needs to be calculated from event
if err = attr.CGREvent.CheckMandatoryFields([]string{utils.AccountField,
utils.Destination, utils.SetupTime, utils.Usage}); err != nil {
@@ -501,22 +262,22 @@ func (rpS *RouteService) V1GetRoutes(ctx *context.Context, args *ArgsGetRoutes,
}
tnt := args.Tenant
if tnt == utils.EmptyString {
- tnt = rpS.cgrcfg.GeneralCfg().DefaultTenant
+ tnt = rpS.cfg.GeneralCfg().DefaultTenant
}
- if len(rpS.cgrcfg.RouteSCfg().AttributeSConns) != 0 {
+ if len(rpS.cfg.RouteSCfg().AttributeSConns) != 0 {
if args.APIOpts == nil {
args.APIOpts = make(map[string]interface{})
}
args.APIOpts[utils.Subsys] = utils.MetaRoutes
args.CGREvent.APIOpts[utils.OptsContext] = utils.FirstNonEmpty(
utils.IfaceAsString(args.CGREvent.APIOpts[utils.OptsContext]),
- utils.IfaceAsString(rpS.cgrcfg.RouteSCfg().DefaultOpts[utils.OptsContext]),
+ utils.IfaceAsString(rpS.cfg.RouteSCfg().DefaultOpts[utils.OptsContext]),
utils.MetaRoutes)
attrArgs := &AttrArgsProcessEvent{
CGREvent: args.CGREvent,
}
var rplyEv AttrSProcessEventReply
- if err := rpS.connMgr.Call(ctx, rpS.cgrcfg.RouteSCfg().AttributeSConns,
+ if err := rpS.connMgr.Call(ctx, rpS.cfg.RouteSCfg().AttributeSConns,
utils.AttributeSv1ProcessEvent, attrArgs, &rplyEv); err == nil && len(rplyEv.AlteredFields) != 0 {
args.CGREvent = rplyEv.CGREvent
args.APIOpts = rplyEv.APIOpts
@@ -536,7 +297,7 @@ func (rpS *RouteService) V1GetRoutes(ctx *context.Context, args *ArgsGetRoutes,
}
// V1GetRouteProfilesForEvent returns the list of valid route profiles
-func (rpS *RouteService) V1GetRouteProfilesForEvent(ctx *context.Context, args *utils.CGREvent, reply *[]*RouteProfile) (err error) {
+func (rpS *RouteService) V1GetRouteProfilesForEvent(ctx *context.Context, args *utils.CGREvent, reply *[]*RouteProfile) (_ error) {
if missing := utils.MissingStructFields(args, []string{utils.ID}); len(missing) != 0 {
return utils.NewErrMandatoryIeMissing(missing...)
} else if args.Event == nil {
@@ -544,7 +305,7 @@ func (rpS *RouteService) V1GetRouteProfilesForEvent(ctx *context.Context, args *
}
tnt := args.Tenant
if tnt == utils.EmptyString {
- tnt = rpS.cgrcfg.GeneralCfg().DefaultTenant
+ tnt = rpS.cfg.GeneralCfg().DefaultTenant
}
sPs, err := rpS.matchingRouteProfilesForEvent(ctx, tnt, args)
if err != nil {
@@ -553,10 +314,18 @@ func (rpS *RouteService) V1GetRouteProfilesForEvent(ctx *context.Context, args *
}
return err
}
- *reply = sPs
+ *reply = make([]*RouteProfile, len(sPs))
+ for i, sP := range sPs {
+ (*reply)[i] = sP.RouteProfile
+ }
return
}
+var lazyRouteFltrPrfxs = []string{utils.DynamicDataPrefix + utils.MetaReq,
+ utils.DynamicDataPrefix + utils.MetaAccounts,
+ utils.DynamicDataPrefix + utils.MetaResources,
+ utils.DynamicDataPrefix + utils.MetaStats}
+
// sortedRoutesForEvent will return the list of valid route IDs
// for event based on filters and sorting algorithms
func (rpS *RouteService) sortedRoutesForProfile(ctx *context.Context, tnt string, rPrfl *RouteProfile, ev *utils.CGREvent,
@@ -568,25 +337,29 @@ func (rpS *RouteService) sortedRoutesForProfile(ctx *context.Context, tnt string
utils.MetaReq: ev.Event,
utils.MetaOpts: ev.APIOpts,
}
- passedRoutes := make(map[string]*Route)
+ passedRoutes := make(map[string]*RouteWithWeight)
// apply filters for event
for _, route := range rPrfl.Routes {
- pass, lazyCheckRules, err := rpS.filterS.LazyPass(ctx, tnt,
- route.FilterIDs, nM,
- []string{utils.DynamicDataPrefix + utils.MetaReq,
- utils.DynamicDataPrefix + utils.MetaAccounts,
- utils.DynamicDataPrefix + utils.MetaResources,
- utils.DynamicDataPrefix + utils.MetaStats})
- if err != nil {
- return nil, err
+ var pass bool
+ var lazyCheckRules []*FilterRule
+ if pass, lazyCheckRules, err = rpS.filterS.LazyPass(ctx, tnt,
+ route.FilterIDs, nM, lazyRouteFltrPrfxs); err != nil {
+ return
} else if !pass {
continue
}
- route.lazyCheckRules = lazyCheckRules
- if prev, has := passedRoutes[route.ID]; has && prev.Weight >= route.Weight {
- continue
+ var weight float64
+ if weight, err = WeightFromDynamics(ctx, route.Weights,
+ rpS.filterS, ev.Tenant, nM); err != nil {
+ return
+ }
+ if prev, has := passedRoutes[route.ID]; !has || prev.Weight < weight {
+ passedRoutes[route.ID] = &RouteWithWeight{
+ Route: route,
+ lazyCheckRules: lazyCheckRules,
+ Weight: weight,
+ }
}
- passedRoutes[route.ID] = route
}
if sortedRoutes, err = rpS.sorter.SortRoutes(ctx, rPrfl.ID, rPrfl.Sorting,
@@ -612,14 +385,14 @@ func (rpS *RouteService) sortedRoutesForEvent(ctx *context.Context, tnt string,
if _, has := args.CGREvent.Event[utils.Usage]; !has {
args.CGREvent.Event[utils.Usage] = time.Minute // make sure we have default set for Usage
}
- var rPrfs []*RouteProfile
+ var rPrfs RouteProfilesWithWeight
if rPrfs, err = rpS.matchingRouteProfilesForEvent(ctx, tnt, args.CGREvent); err != nil {
return
}
prfCount := len(rPrfs) // if the option is not present return for all profiles
prfCountOptInf, has := args.APIOpts[utils.OptsRoutesProfilesCount]
if !has {
- prfCountOptInf, has = rpS.cgrcfg.RouteSCfg().DefaultOpts[utils.OptsRoutesProfilesCount]
+ prfCountOptInf, has = rpS.cfg.RouteSCfg().DefaultOpts[utils.OptsRoutesProfilesCount]
}
if has {
prfCountOpt, err := utils.IfaceAsTInt64(prfCountOptInf)
@@ -661,7 +434,7 @@ func (rpS *RouteService) sortedRoutesForEvent(ctx *context.Context, tnt string,
prfPag.Offset = &offset
}
var sr *SortedRoutes
- if sr, err = rpS.sortedRoutesForProfile(ctx, tnt, rPrfl, args.CGREvent, prfPag, extraOpts); err != nil {
+ if sr, err = rpS.sortedRoutesForProfile(ctx, tnt, rPrfl.RouteProfile, args.CGREvent, prfPag, extraOpts); err != nil {
return
}
if len(sr.Routes) != 0 {
diff --git a/engine/routes_test.go b/engine/routes_test.go
index 2501c875d..ed24651e8 100644
--- a/engine/routes_test.go
+++ b/engine/routes_test.go
@@ -28,106 +28,11 @@ import (
"github.com/cgrates/cgrates/utils"
)
-func TestRoutesSort(t *testing.T) {
- sprs := RouteProfiles{
- &RouteProfile{
- Tenant: "cgrates.org",
- ID: "RoutePrf1",
- FilterIDs: []string{"*ai:~*req.AnswerTime:2014-07-14T14:25:00Z|2014-07-14T14:26:00Z"},
- Sorting: "",
- SortingParameters: []string{},
- Routes: []*Route{
- {
- ID: "route1",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 10.0,
- Blocker: false,
- RouteParameters: "param1",
- },
- },
- Weight: 10,
- },
- &RouteProfile{
- Tenant: "cgrates.org",
- ID: "RoutePrf2",
- FilterIDs: []string{"*ai:~*req.AnswerTime:2014-07-14T14:25:00Z|2014-07-14T14:26:00Z"},
- Sorting: "",
- SortingParameters: []string{},
- Routes: []*Route{
- {
- ID: "route1",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 20.0,
- Blocker: false,
- RouteParameters: "param1",
- },
- },
- Weight: 20.0,
- },
- }
- eRouteProfile := RouteProfiles{
- &RouteProfile{
- Tenant: "cgrates.org",
- ID: "RoutePrf2",
- FilterIDs: []string{"*ai:~*req.AnswerTime:2014-07-14T14:25:00Z|2014-07-14T14:26:00Z"},
- Sorting: "",
- SortingParameters: []string{},
- Routes: []*Route{
- {
- ID: "route1",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 20.0,
- Blocker: false,
- RouteParameters: "param1",
- },
- },
- Weight: 20.0,
- },
- &RouteProfile{
- Tenant: "cgrates.org",
- ID: "RoutePrf1",
- FilterIDs: []string{"*ai:~*req.AnswerTime:2014-07-14T14:25:00Z|2014-07-14T14:26:00Z"},
- Sorting: "",
- SortingParameters: []string{},
- Routes: []*Route{
- {
- ID: "route1",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 10.0,
- Blocker: false,
- RouteParameters: "param1",
- },
- },
- Weight: 10.0,
- },
- }
- sprs.Sort()
- if !reflect.DeepEqual(eRouteProfile, sprs) {
- t.Errorf("Expecting: %+v, received: %+v", eRouteProfile, sprs)
- }
-}
-
func TestRoutesCache(t *testing.T) {
var expTimeRoutes = time.Now().Add(20 * time.Minute)
expTimeStr := expTimeRoutes.Format(time.RFC3339)
var dmSPP *DataManager
- sppTest := RouteProfiles{
+ sppTest := []*RouteProfile{
&RouteProfile{
Tenant: "cgrates.org",
ID: "RouteProfile1",
@@ -142,12 +47,12 @@ func TestRoutesCache(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
Blocker: false,
RouteParameters: "param1",
},
},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
&RouteProfile{
Tenant: "cgrates.org",
@@ -163,7 +68,7 @@ func TestRoutesCache(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 20.0,
+ Weights: utils.DynamicWeights{{Weight: 20}},
RouteParameters: "param2",
},
{
@@ -173,7 +78,7 @@ func TestRoutesCache(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
RouteParameters: "param3",
},
{
@@ -183,12 +88,12 @@ func TestRoutesCache(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 30.0,
+ Weights: utils.DynamicWeights{{Weight: 30}},
Blocker: false,
RouteParameters: "param1",
},
},
- Weight: 20.0,
+ Weights: utils.DynamicWeights{{Weight: 20}},
},
&RouteProfile{
Tenant: "cgrates.org",
@@ -204,12 +109,12 @@ func TestRoutesCache(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
Blocker: false,
RouteParameters: "param1",
},
},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
}
@@ -296,87 +201,96 @@ func TestRoutesmatchingRouteProfilesForEvent(t *testing.T) {
expTimeStr := expTimeRoutes.Format(time.RFC3339)
var routeService *RouteService
var dmSPP *DataManager
- var sppTest = RouteProfiles{
- &RouteProfile{
- Tenant: "cgrates.org",
- ID: "RouteProfile1",
- FilterIDs: []string{"FLTR_RPP_1", "*ai:*now:2014-07-14T14:25:00Z|" + expTimeStr},
- Sorting: utils.MetaWeight,
- SortingParameters: []string{},
- Routes: []*Route{
- {
- ID: "route1",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 10.0,
- Blocker: false,
- RouteParameters: "param1",
+ var sppTest = RouteProfilesWithWeight{
+ &RouteProfileWithWeight{
+ RouteProfile: &RouteProfile{
+ Tenant: "cgrates.org",
+ ID: "RouteProfile1",
+ FilterIDs: []string{"FLTR_RPP_1", "*ai:*now:2014-07-14T14:25:00Z|" + expTimeStr},
+ Sorting: utils.MetaWeight,
+ SortingParameters: []string{},
+ Routes: []*Route{
+ {
+ ID: "route1",
+ FilterIDs: []string{},
+ AccountIDs: []string{},
+ RateProfileIDs: []string{},
+ ResourceIDs: []string{},
+ StatIDs: []string{},
+ Weights: utils.DynamicWeights{{Weight: 10}},
+ Blocker: false,
+ RouteParameters: "param1",
+ },
},
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
Weight: 10,
},
- &RouteProfile{
- Tenant: "cgrates.org",
- ID: "RouteProfile2",
- FilterIDs: []string{"FLTR_SUPP_2", "*ai:*now:2014-07-14T14:25:00Z|" + expTimeStr},
- Sorting: utils.MetaWeight,
- SortingParameters: []string{},
- Routes: []*Route{
- {
- ID: "route2",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 20.0,
- RouteParameters: "param2",
- },
- {
- ID: "route3",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 10.0,
- RouteParameters: "param3",
- },
- {
- ID: "route1",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 30.0,
- Blocker: false,
- RouteParameters: "param1",
+ &RouteProfileWithWeight{
+ RouteProfile: &RouteProfile{
+ Tenant: "cgrates.org",
+ ID: "RouteProfile2",
+ FilterIDs: []string{"FLTR_SUPP_2", "*ai:*now:2014-07-14T14:25:00Z|" + expTimeStr},
+ Sorting: utils.MetaWeight,
+ SortingParameters: []string{},
+ Routes: []*Route{
+ {
+ ID: "route2",
+ FilterIDs: []string{},
+ AccountIDs: []string{},
+ RateProfileIDs: []string{},
+ ResourceIDs: []string{},
+ StatIDs: []string{},
+ Weights: utils.DynamicWeights{{Weight: 20}},
+ RouteParameters: "param2",
+ },
+ {
+ ID: "route3",
+ FilterIDs: []string{},
+ AccountIDs: []string{},
+ RateProfileIDs: []string{},
+ ResourceIDs: []string{},
+ StatIDs: []string{},
+ Weights: utils.DynamicWeights{{Weight: 10}},
+ RouteParameters: "param3",
+ },
+ {
+ ID: "route1",
+ FilterIDs: []string{},
+ AccountIDs: []string{},
+ RateProfileIDs: []string{},
+ ResourceIDs: []string{},
+ StatIDs: []string{},
+ Weights: utils.DynamicWeights{{Weight: 30}},
+ Blocker: false,
+ RouteParameters: "param1",
+ },
},
+ Weights: utils.DynamicWeights{{Weight: 20}},
},
- Weight: 20.0,
+ Weight: 20,
},
- &RouteProfile{
- Tenant: "cgrates.org",
- ID: "RouteProfilePrefix",
- FilterIDs: []string{"FLTR_SUPP_3", "*ai:*now:2014-07-14T14:25:00Z|" + expTimeStr},
- Sorting: utils.MetaWeight,
- SortingParameters: []string{},
- Routes: []*Route{
- {
- ID: "route1",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 10.0,
- Blocker: false,
- RouteParameters: "param1",
+ &RouteProfileWithWeight{
+ RouteProfile: &RouteProfile{
+ Tenant: "cgrates.org",
+ ID: "RouteProfilePrefix",
+ FilterIDs: []string{"FLTR_SUPP_3", "*ai:*now:2014-07-14T14:25:00Z|" + expTimeStr},
+ Sorting: utils.MetaWeight,
+ SortingParameters: []string{},
+ Routes: []*Route{
+ {
+ ID: "route1",
+ FilterIDs: []string{},
+ AccountIDs: []string{},
+ RateProfileIDs: []string{},
+ ResourceIDs: []string{},
+ StatIDs: []string{},
+ Weights: utils.DynamicWeights{{Weight: 10}},
+ Blocker: false,
+ RouteParameters: "param1",
+ },
},
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
Weight: 10,
},
@@ -494,7 +408,7 @@ func TestRoutesmatchingRouteProfilesForEvent(t *testing.T) {
}
dmSPP.SetFilter(context.Background(), fltrSupp3, true)
for _, spp := range sppTest {
- if err = dmSPP.SetRouteProfile(context.Background(), spp, true); err != nil {
+ if err = dmSPP.SetRouteProfile(context.Background(), spp.RouteProfile, true); err != nil {
t.Errorf("Error: %+v", err)
}
}
@@ -503,7 +417,7 @@ func TestRoutesmatchingRouteProfilesForEvent(t *testing.T) {
if tempSpp, err := dmSPP.GetRouteProfile(context.Background(), spp.Tenant,
spp.ID, true, true, utils.NonTransactional); err != nil {
t.Errorf("Error: %+v", err)
- } else if !reflect.DeepEqual(spp, tempSpp) {
+ } else if !reflect.DeepEqual(spp.RouteProfile, tempSpp) {
t.Errorf("Expecting: %+v, received: %+v", spp, tempSpp)
}
}
@@ -537,7 +451,7 @@ func TestRoutesSortedForEvent(t *testing.T) {
expTimeStr := expTimeRoutes.Format(time.RFC3339)
var routeService *RouteService
var dmSPP *DataManager
- var sppTest = RouteProfiles{
+ var sppTest = []*RouteProfile{
&RouteProfile{
Tenant: "cgrates.org",
ID: "RouteProfile1",
@@ -552,12 +466,12 @@ func TestRoutesSortedForEvent(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
Blocker: false,
RouteParameters: "param1",
},
},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
&RouteProfile{
Tenant: "cgrates.org",
@@ -573,7 +487,7 @@ func TestRoutesSortedForEvent(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 20.0,
+ Weights: utils.DynamicWeights{{Weight: 20}},
RouteParameters: "param2",
},
{
@@ -583,7 +497,7 @@ func TestRoutesSortedForEvent(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
RouteParameters: "param3",
},
{
@@ -593,12 +507,12 @@ func TestRoutesSortedForEvent(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 30.0,
+ Weights: utils.DynamicWeights{{Weight: 30}},
Blocker: false,
RouteParameters: "param1",
},
},
- Weight: 20.0,
+ Weights: utils.DynamicWeights{{Weight: 20}},
},
&RouteProfile{
Tenant: "cgrates.org",
@@ -614,12 +528,12 @@ func TestRoutesSortedForEvent(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
Blocker: false,
RouteParameters: "param1",
},
},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
}
argsGetRoutes := []*ArgsGetRoutes{
@@ -847,7 +761,7 @@ func TestRoutesSortedForEventWithLimit(t *testing.T) {
expTimeRoutes := time.Now().Add(20 * time.Minute)
expTimeStr := expTimeRoutes.Format(time.RFC3339)
var routeService *RouteService
- sppTest := RouteProfiles{
+ sppTest := []*RouteProfile{
&RouteProfile{
Tenant: "cgrates.org",
ID: "RouteProfile1",
@@ -862,12 +776,12 @@ func TestRoutesSortedForEventWithLimit(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
Blocker: false,
RouteParameters: "param1",
},
},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
&RouteProfile{
Tenant: "cgrates.org",
@@ -883,7 +797,7 @@ func TestRoutesSortedForEventWithLimit(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 20.0,
+ Weights: utils.DynamicWeights{{Weight: 20}},
RouteParameters: "param2",
},
{
@@ -893,7 +807,7 @@ func TestRoutesSortedForEventWithLimit(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
RouteParameters: "param3",
},
{
@@ -903,12 +817,12 @@ func TestRoutesSortedForEventWithLimit(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 30.0,
+ Weights: utils.DynamicWeights{{Weight: 30}},
Blocker: false,
RouteParameters: "param1",
},
},
- Weight: 20.0,
+ Weights: utils.DynamicWeights{{Weight: 20}},
},
&RouteProfile{
Tenant: "cgrates.org",
@@ -924,12 +838,12 @@ func TestRoutesSortedForEventWithLimit(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
Blocker: false,
RouteParameters: "param1",
},
},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
}
argsGetRoutes := []*ArgsGetRoutes{
@@ -1102,7 +1016,7 @@ func TestRoutesSortedForEventWithOffset(t *testing.T) {
expTimeRoutes := time.Now().Add(20 * time.Minute)
expTimeStr := expTimeRoutes.Format(time.RFC3339)
var routeService *RouteService
- sppTest := RouteProfiles{
+ sppTest := []*RouteProfile{
&RouteProfile{
Tenant: "cgrates.org",
ID: "RouteProfile1",
@@ -1117,12 +1031,12 @@ func TestRoutesSortedForEventWithOffset(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
Blocker: false,
RouteParameters: "param1",
},
},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
&RouteProfile{
Tenant: "cgrates.org",
@@ -1138,7 +1052,7 @@ func TestRoutesSortedForEventWithOffset(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 20.0,
+ Weights: utils.DynamicWeights{{Weight: 20}},
RouteParameters: "param2",
},
{
@@ -1148,7 +1062,7 @@ func TestRoutesSortedForEventWithOffset(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
RouteParameters: "param3",
},
{
@@ -1158,12 +1072,12 @@ func TestRoutesSortedForEventWithOffset(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 30.0,
+ Weights: utils.DynamicWeights{{Weight: 30}},
Blocker: false,
RouteParameters: "param1",
},
},
- Weight: 20.0,
+ Weights: utils.DynamicWeights{{Weight: 20}},
},
&RouteProfile{
Tenant: "cgrates.org",
@@ -1179,12 +1093,12 @@ func TestRoutesSortedForEventWithOffset(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
Blocker: false,
RouteParameters: "param1",
},
},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
}
argsGetRoutes := []*ArgsGetRoutes{
@@ -1347,7 +1261,7 @@ func TestRoutesSortedForEventWithLimitAndOffset(t *testing.T) {
expTimeRoutes := time.Now().Add(20 * time.Minute)
expTimeStr := expTimeRoutes.Format(time.RFC3339)
var routeService *RouteService
- sppTest := RouteProfiles{
+ sppTest := []*RouteProfile{
&RouteProfile{
Tenant: "cgrates.org",
ID: "RouteProfile1",
@@ -1362,12 +1276,12 @@ func TestRoutesSortedForEventWithLimitAndOffset(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
Blocker: false,
RouteParameters: "param1",
},
},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
&RouteProfile{
Tenant: "cgrates.org",
@@ -1383,7 +1297,7 @@ func TestRoutesSortedForEventWithLimitAndOffset(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 20.0,
+ Weights: utils.DynamicWeights{{Weight: 20}},
RouteParameters: "param2",
},
{
@@ -1393,7 +1307,7 @@ func TestRoutesSortedForEventWithLimitAndOffset(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
RouteParameters: "param3",
},
{
@@ -1403,12 +1317,12 @@ func TestRoutesSortedForEventWithLimitAndOffset(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 30.0,
+ Weights: utils.DynamicWeights{{Weight: 30}},
Blocker: false,
RouteParameters: "param1",
},
},
- Weight: 20.0,
+ Weights: utils.DynamicWeights{{Weight: 20}},
},
&RouteProfile{
Tenant: "cgrates.org",
@@ -1424,12 +1338,12 @@ func TestRoutesSortedForEventWithLimitAndOffset(t *testing.T) {
RateProfileIDs: []string{},
ResourceIDs: []string{},
StatIDs: []string{},
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
Blocker: false,
RouteParameters: "param1",
},
},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
}
argsGetRoutes := []*ArgsGetRoutes{
@@ -1593,6 +1507,7 @@ func TestRoutesAsOptsGetRoutes(t *testing.T) {
s := &ArgsGetRoutes{
IgnoreErrors: true,
MaxCost: "10.0",
+ CGREvent: &utils.CGREvent{},
}
spl := &optsGetRoutes{
ignoreErrors: true,
@@ -1610,6 +1525,7 @@ func TestRoutesAsOptsGetRoutes(t *testing.T) {
func TestRoutesAsOptsGetRoutesIgnoreErrors(t *testing.T) {
s := &ArgsGetRoutes{
IgnoreErrors: true,
+ CGREvent: &utils.CGREvent{},
}
spl := &optsGetRoutes{
ignoreErrors: true,
@@ -1627,87 +1543,96 @@ func TestRoutesAsOptsGetRoutesMaxCost(t *testing.T) {
expTimeRoutes := time.Now().Add(20 * time.Minute)
expTimeStr := expTimeRoutes.Format(time.RFC3339)
var routeService *RouteService
- sppTest := RouteProfiles{
- &RouteProfile{
- Tenant: "cgrates.org",
- ID: "RouteProfile1",
- FilterIDs: []string{"FLTR_RPP_1", "*ai:*now:2014-07-14T14:25:00Z|" + expTimeStr},
- Sorting: utils.MetaWeight,
- SortingParameters: []string{},
- Routes: []*Route{
- {
- ID: "route1",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 10.0,
- Blocker: false,
- RouteParameters: "param1",
+ sppTest := RouteProfilesWithWeight{
+ &RouteProfileWithWeight{
+ RouteProfile: &RouteProfile{
+ Tenant: "cgrates.org",
+ ID: "RouteProfile1",
+ FilterIDs: []string{"FLTR_RPP_1", "*ai:*now:2014-07-14T14:25:00Z|" + expTimeStr},
+ Sorting: utils.MetaWeight,
+ SortingParameters: []string{},
+ Routes: []*Route{
+ {
+ ID: "route1",
+ FilterIDs: []string{},
+ AccountIDs: []string{},
+ RateProfileIDs: []string{},
+ ResourceIDs: []string{},
+ StatIDs: []string{},
+ Weights: utils.DynamicWeights{{Weight: 10}},
+ Blocker: false,
+ RouteParameters: "param1",
+ },
},
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
Weight: 10,
},
- &RouteProfile{
- Tenant: "cgrates.org",
- ID: "RouteProfile2",
- FilterIDs: []string{"FLTR_SUPP_2", "*ai:*now:2014-07-14T14:25:00Z|" + expTimeStr},
- Sorting: utils.MetaWeight,
- SortingParameters: []string{},
- Routes: []*Route{
- {
- ID: "route2",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 20.0,
- RouteParameters: "param2",
- },
- {
- ID: "route3",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 10.0,
- RouteParameters: "param3",
- },
- {
- ID: "route1",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 30.0,
- Blocker: false,
- RouteParameters: "param1",
+ &RouteProfileWithWeight{
+ RouteProfile: &RouteProfile{
+ Tenant: "cgrates.org",
+ ID: "RouteProfile2",
+ FilterIDs: []string{"FLTR_SUPP_2", "*ai:*now:2014-07-14T14:25:00Z|" + expTimeStr},
+ Sorting: utils.MetaWeight,
+ SortingParameters: []string{},
+ Routes: []*Route{
+ {
+ ID: "route2",
+ FilterIDs: []string{},
+ AccountIDs: []string{},
+ RateProfileIDs: []string{},
+ ResourceIDs: []string{},
+ StatIDs: []string{},
+ Weights: utils.DynamicWeights{{Weight: 20}},
+ RouteParameters: "param2",
+ },
+ {
+ ID: "route3",
+ FilterIDs: []string{},
+ AccountIDs: []string{},
+ RateProfileIDs: []string{},
+ ResourceIDs: []string{},
+ StatIDs: []string{},
+ Weights: utils.DynamicWeights{{Weight: 10}},
+ RouteParameters: "param3",
+ },
+ {
+ ID: "route1",
+ FilterIDs: []string{},
+ AccountIDs: []string{},
+ RateProfileIDs: []string{},
+ ResourceIDs: []string{},
+ StatIDs: []string{},
+ Weights: utils.DynamicWeights{{Weight: 30}},
+ Blocker: false,
+ RouteParameters: "param1",
+ },
},
+ Weights: utils.DynamicWeights{{Weight: 20}},
},
- Weight: 20.0,
+ Weight: 20,
},
- &RouteProfile{
- Tenant: "cgrates.org",
- ID: "RouteProfilePrefix",
- FilterIDs: []string{"FLTR_SUPP_3", "*ai:*now:2014-07-14T14:25:00Z|" + expTimeStr},
- Sorting: utils.MetaWeight,
- SortingParameters: []string{},
- Routes: []*Route{
- {
- ID: "route1",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 10.0,
- Blocker: false,
- RouteParameters: "param1",
+ &RouteProfileWithWeight{
+ RouteProfile: &RouteProfile{
+ Tenant: "cgrates.org",
+ ID: "RouteProfilePrefix",
+ FilterIDs: []string{"FLTR_SUPP_3", "*ai:*now:2014-07-14T14:25:00Z|" + expTimeStr},
+ Sorting: utils.MetaWeight,
+ SortingParameters: []string{},
+ Routes: []*Route{
+ {
+ ID: "route1",
+ FilterIDs: []string{},
+ AccountIDs: []string{},
+ RateProfileIDs: []string{},
+ ResourceIDs: []string{},
+ StatIDs: []string{},
+ Weights: utils.DynamicWeights{{Weight: 10}},
+ Blocker: false,
+ RouteParameters: "param1",
+ },
},
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
Weight: 10,
},
@@ -1826,7 +1751,7 @@ func TestRoutesAsOptsGetRoutesMaxCost(t *testing.T) {
dmSPP.SetFilter(context.Background(), fltrSupp3, true)
for _, spp := range sppTest {
- if err = dmSPP.SetRouteProfile(context.Background(), spp, true); err != nil {
+ if err = dmSPP.SetRouteProfile(context.Background(), spp.RouteProfile, true); err != nil {
t.Errorf("Error: %+v", err)
}
}
@@ -1835,12 +1760,12 @@ func TestRoutesAsOptsGetRoutesMaxCost(t *testing.T) {
if tempSpp, err := dmSPP.GetRouteProfile(context.Background(), spp.Tenant,
spp.ID, true, true, utils.NonTransactional); err != nil {
t.Errorf("Error: %+v", err)
- } else if !reflect.DeepEqual(spp, tempSpp) {
+ } else if !reflect.DeepEqual(spp.RouteProfile, tempSpp) {
t.Errorf("Expecting: %+v, received: %+v", spp, tempSpp)
}
}
- routeService.cgrcfg.RouteSCfg().IndexedSelects = false
+ routeService.cfg.RouteSCfg().IndexedSelects = false
sprf, err := routeService.matchingRouteProfilesForEvent(context.Background(), argsGetRoutes[0].Tenant, argsGetRoutes[0].CGREvent)
if err != nil {
t.Errorf("Error: %+v", err)
@@ -1870,87 +1795,96 @@ func TestRoutesMatchWithIndexFalse(t *testing.T) {
expTimeRoutes := time.Now().Add(20 * time.Minute)
expTimeStr := expTimeRoutes.Format(time.RFC3339)
var routeService *RouteService
- sppTest := RouteProfiles{
- &RouteProfile{
- Tenant: "cgrates.org",
- ID: "RouteProfile1",
- FilterIDs: []string{"FLTR_RPP_1", "*ai:*now:2014-07-14T14:25:00Z|" + expTimeStr},
- Sorting: utils.MetaWeight,
- SortingParameters: []string{},
- Routes: []*Route{
- {
- ID: "route1",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 10.0,
- Blocker: false,
- RouteParameters: "param1",
+ sppTest := RouteProfilesWithWeight{
+ &RouteProfileWithWeight{
+ RouteProfile: &RouteProfile{
+ Tenant: "cgrates.org",
+ ID: "RouteProfile1",
+ FilterIDs: []string{"FLTR_RPP_1", "*ai:*now:2014-07-14T14:25:00Z|" + expTimeStr},
+ Sorting: utils.MetaWeight,
+ SortingParameters: []string{},
+ Routes: []*Route{
+ {
+ ID: "route1",
+ FilterIDs: []string{},
+ AccountIDs: []string{},
+ RateProfileIDs: []string{},
+ ResourceIDs: []string{},
+ StatIDs: []string{},
+ Weights: utils.DynamicWeights{{Weight: 10}},
+ Blocker: false,
+ RouteParameters: "param1",
+ },
},
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
Weight: 10,
},
- &RouteProfile{
- Tenant: "cgrates.org",
- ID: "RouteProfile2",
- FilterIDs: []string{"FLTR_SUPP_2", "*ai:*now:2014-07-14T14:25:00Z|" + expTimeStr},
- Sorting: utils.MetaWeight,
- SortingParameters: []string{},
- Routes: []*Route{
- {
- ID: "route2",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 20.0,
- RouteParameters: "param2",
- },
- {
- ID: "route3",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 10.0,
- RouteParameters: "param3",
- },
- {
- ID: "route1",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 30.0,
- Blocker: false,
- RouteParameters: "param1",
+ &RouteProfileWithWeight{
+ RouteProfile: &RouteProfile{
+ Tenant: "cgrates.org",
+ ID: "RouteProfile2",
+ FilterIDs: []string{"FLTR_SUPP_2", "*ai:*now:2014-07-14T14:25:00Z|" + expTimeStr},
+ Sorting: utils.MetaWeight,
+ SortingParameters: []string{},
+ Routes: []*Route{
+ {
+ ID: "route2",
+ FilterIDs: []string{},
+ AccountIDs: []string{},
+ RateProfileIDs: []string{},
+ ResourceIDs: []string{},
+ StatIDs: []string{},
+ Weights: utils.DynamicWeights{{Weight: 20}},
+ RouteParameters: "param2",
+ },
+ {
+ ID: "route3",
+ FilterIDs: []string{},
+ AccountIDs: []string{},
+ RateProfileIDs: []string{},
+ ResourceIDs: []string{},
+ StatIDs: []string{},
+ Weights: utils.DynamicWeights{{Weight: 10}},
+ RouteParameters: "param3",
+ },
+ {
+ ID: "route1",
+ FilterIDs: []string{},
+ AccountIDs: []string{},
+ RateProfileIDs: []string{},
+ ResourceIDs: []string{},
+ StatIDs: []string{},
+ Weights: utils.DynamicWeights{{Weight: 30}},
+ Blocker: false,
+ RouteParameters: "param1",
+ },
},
+ Weights: utils.DynamicWeights{{Weight: 20}},
},
- Weight: 20.0,
+ Weight: 20,
},
- &RouteProfile{
- Tenant: "cgrates.org",
- ID: "RouteProfilePrefix",
- FilterIDs: []string{"FLTR_SUPP_3", "*ai:*now:2014-07-14T14:25:00Z|" + expTimeStr},
- Sorting: utils.MetaWeight,
- SortingParameters: []string{},
- Routes: []*Route{
- {
- ID: "route1",
- FilterIDs: []string{},
- AccountIDs: []string{},
- RateProfileIDs: []string{},
- ResourceIDs: []string{},
- StatIDs: []string{},
- Weight: 10.0,
- Blocker: false,
- RouteParameters: "param1",
+ &RouteProfileWithWeight{
+ RouteProfile: &RouteProfile{
+ Tenant: "cgrates.org",
+ ID: "RouteProfilePrefix",
+ FilterIDs: []string{"FLTR_SUPP_3", "*ai:*now:2014-07-14T14:25:00Z|" + expTimeStr},
+ Sorting: utils.MetaWeight,
+ SortingParameters: []string{},
+ Routes: []*Route{
+ {
+ ID: "route1",
+ FilterIDs: []string{},
+ AccountIDs: []string{},
+ RateProfileIDs: []string{},
+ ResourceIDs: []string{},
+ StatIDs: []string{},
+ Weights: utils.DynamicWeights{{Weight: 10}},
+ Blocker: false,
+ RouteParameters: "param1",
+ },
},
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
Weight: 10,
},
@@ -2069,7 +2003,7 @@ func TestRoutesMatchWithIndexFalse(t *testing.T) {
dmSPP.SetFilter(context.Background(), fltrSupp3, true)
for _, spp := range sppTest {
- if err = dmSPP.SetRouteProfile(context.Background(), spp, true); err != nil {
+ if err = dmSPP.SetRouteProfile(context.Background(), spp.RouteProfile, true); err != nil {
t.Errorf("Error: %+v", err)
}
}
@@ -2078,12 +2012,12 @@ func TestRoutesMatchWithIndexFalse(t *testing.T) {
if tempSpp, err := dmSPP.GetRouteProfile(context.Background(), spp.Tenant,
spp.ID, true, true, utils.NonTransactional); err != nil {
t.Errorf("Error: %+v", err)
- } else if !reflect.DeepEqual(spp, tempSpp) {
+ } else if !reflect.DeepEqual(spp.RouteProfile, tempSpp) {
t.Errorf("Expecting: %+v, received: %+v", spp, tempSpp)
}
}
- routeService.cgrcfg.RouteSCfg().IndexedSelects = false
+ routeService.cfg.RouteSCfg().IndexedSelects = false
sprf, err := routeService.matchingRouteProfilesForEvent(context.Background(), argsGetRoutes[0].Tenant, argsGetRoutes[0].CGREvent)
if err != nil {
t.Errorf("Error: %+v", err)
@@ -2111,7 +2045,7 @@ func TestRoutesMatchWithIndexFalse(t *testing.T) {
func TestRoutesSortedForEventWithLimitAndOffset2(t *testing.T) {
var routeService *RouteService
- sppTest := RouteProfiles{
+ sppTest := []*RouteProfile{
&RouteProfile{
Tenant: "cgrates.org",
ID: "RouteProfile1",
@@ -2119,11 +2053,11 @@ func TestRoutesSortedForEventWithLimitAndOffset2(t *testing.T) {
Routes: []*Route{
{
ID: "route2",
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
RouteParameters: "param1",
},
},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
},
&RouteProfile{
Tenant: "cgrates.org",
@@ -2132,21 +2066,21 @@ func TestRoutesSortedForEventWithLimitAndOffset2(t *testing.T) {
Routes: []*Route{
{
ID: "route2",
- Weight: 20.0,
+ Weights: utils.DynamicWeights{{Weight: 20}},
RouteParameters: "param2",
},
{
ID: "route3",
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
RouteParameters: "param3",
},
{
ID: "route1",
- Weight: 30.0,
+ Weights: utils.DynamicWeights{{Weight: 30}},
RouteParameters: "param1",
},
},
- Weight: 5,
+ Weights: utils.DynamicWeights{{Weight: 5}},
},
&RouteProfile{
Tenant: "cgrates.org",
@@ -2155,11 +2089,11 @@ func TestRoutesSortedForEventWithLimitAndOffset2(t *testing.T) {
Routes: []*Route{
{
ID: "route1",
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
RouteParameters: "param1",
},
},
- Weight: 20,
+ Weights: utils.DynamicWeights{{Weight: 20}},
},
&RouteProfile{
Tenant: "cgrates.org",
@@ -2168,11 +2102,11 @@ func TestRoutesSortedForEventWithLimitAndOffset2(t *testing.T) {
Routes: []*Route{
{
ID: "route1",
- Weight: 10.0,
+ Weights: utils.DynamicWeights{{Weight: 10}},
RouteParameters: "param1",
},
},
- Weight: 0,
+ Weights: utils.DynamicWeights{{}},
},
}
argsGetRoutes := &ArgsGetRoutes{
diff --git a/engine/z_filterindexer_it_test.go b/engine/z_filterindexer_it_test.go
index bab9f4d4a..02ab11a76 100644
--- a/engine/z_filterindexer_it_test.go
+++ b/engine/z_filterindexer_it_test.go
@@ -1845,11 +1845,11 @@ func testITTestIndexingWithEmptyFltrID2(t *testing.T) {
RateProfileIDs: []string{""},
ResourceIDs: []string{""},
StatIDs: []string{""},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
RouteParameters: "",
},
},
- Weight: 20,
+ Weights: utils.DynamicWeights{{Weight: 20}},
}
splProfile2 := &RouteProfile{
Tenant: "cgrates.org",
@@ -1864,11 +1864,11 @@ func testITTestIndexingWithEmptyFltrID2(t *testing.T) {
RateProfileIDs: []string{""},
ResourceIDs: []string{""},
StatIDs: []string{""},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
RouteParameters: "",
},
},
- Weight: 20,
+ Weights: utils.DynamicWeights{{Weight: 20}},
}
if err := dataManager.SetRouteProfile(context.Background(), splProfile, true); err != nil {
diff --git a/engine/z_libindex_health_test.go b/engine/z_libindex_health_test.go
index ac4cbb9e1..0bb7d6a89 100644
--- a/engine/z_libindex_health_test.go
+++ b/engine/z_libindex_health_test.go
@@ -673,18 +673,18 @@ func TestHealthIndexRoutes(t *testing.T) {
Routes: []*Route{
{
ID: "route1",
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
Blocker: false,
RouteParameters: "",
},
{
ID: "route2",
RateProfileIDs: []string{"RP_1002"},
- Weight: 20,
+ Weights: utils.DynamicWeights{{Weight: 20}},
Blocker: false,
},
},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
}
if err := dm.SetRouteProfile(context.Background(), rtPrf, false); err != nil {
t.Error(err)
@@ -779,18 +779,18 @@ func TestHealthIndexRoutes(t *testing.T) {
Routes: []*Route{
{
ID: "route1",
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
Blocker: false,
RouteParameters: "",
},
{
ID: "route2",
RateProfileIDs: []string{"RP_1002"},
- Weight: 20,
+ Weights: utils.DynamicWeights{{Weight: 20}},
Blocker: false,
},
},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
}
if err := dm.SetRouteProfile(context.Background(), rtPrf, false); err != nil {
t.Error(err)
diff --git a/engine/z_onstor_it_test.go b/engine/z_onstor_it_test.go
index bc84c7126..b7dc6cb50 100644
--- a/engine/z_onstor_it_test.go
+++ b/engine/z_onstor_it_test.go
@@ -674,11 +674,11 @@ func testOnStorITRouteProfile(t *testing.T) {
RateProfileIDs: []string{"RPL_1"},
ResourceIDs: []string{"ResGR1"},
StatIDs: []string{"Stat1"},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
RouteParameters: "param1",
},
},
- Weight: 20,
+ Weights: utils.DynamicWeights{{Weight: 20}},
}
if _, rcvErr := onStor.GetRouteProfile(context.Background(), "cgrates.org", "SPRF_1",
true, false, utils.NonTransactional); rcvErr != nil && rcvErr != utils.ErrNotFound {
@@ -716,7 +716,7 @@ func testOnStorITRouteProfile(t *testing.T) {
RateProfileIDs: []string{"RPL_1"},
ResourceIDs: []string{"ResGR1"},
StatIDs: []string{"Stat1"},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
RouteParameters: "param1",
},
{
@@ -726,7 +726,7 @@ func testOnStorITRouteProfile(t *testing.T) {
RateProfileIDs: []string{"RPL_2"},
ResourceIDs: []string{"ResGR2"},
StatIDs: []string{"Stat2"},
- Weight: 20,
+ Weights: utils.DynamicWeights{{Weight: 20}},
RouteParameters: "param2",
},
}
diff --git a/engine/z_stordb_it_test.go b/engine/z_stordb_it_test.go
index 8a1822ea9..5d66c01c3 100644
--- a/engine/z_stordb_it_test.go
+++ b/engine/z_stordb_it_test.go
@@ -575,12 +575,12 @@ func testStorDBitCRUDTPRoutes(t *testing.T) {
RateProfileIDs: []string{"RPL_1"},
ResourceIDs: []string{"ResGroup1"},
StatIDs: []string{"Stat1"},
- Weight: 10,
+ Weights: ";10",
Blocker: false,
RouteParameters: "SortingParam1",
},
},
- Weight: 20,
+ Weights: ";20",
},
{
TPid: "TP1",
@@ -596,12 +596,12 @@ func testStorDBitCRUDTPRoutes(t *testing.T) {
RateProfileIDs: []string{"RPL_1"},
ResourceIDs: []string{"ResGroup1"},
StatIDs: []string{"Stat1"},
- Weight: 10,
+ Weights: ";10",
Blocker: false,
RouteParameters: "SortingParam2",
},
},
- Weight: 10,
+ Weights: ";10",
},
}
if err := storDB.SetTPRoutes(tpRoutes); err != nil {
diff --git a/general_tests/export_it_test.go b/general_tests/export_it_test.go
index b9328bfe2..67e5da1f2 100644
--- a/general_tests/export_it_test.go
+++ b/general_tests/export_it_test.go
@@ -304,18 +304,18 @@ func testExpVerifyRoutes(t *testing.T) {
Routes: []*engine.Route{
{
ID: "route1",
- Weight: 20,
+ Weights: 20,
Blocker: false,
RouteParameters: utils.EmptyString,
},
{
ID: "route2",
- Weight: 10,
+ Weights: 10,
Blocker: false,
RouteParameters: utils.EmptyString,
},
},
- Weight: 10,
+ Weights: 10,
}
splPrf2 := &engine.RouteProfile{
@@ -328,18 +328,18 @@ func testExpVerifyRoutes(t *testing.T) {
{
ID: "route2",
- Weight: 10,
+ Weights: 10,
Blocker: false,
RouteParameters: utils.EmptyString,
},
{
ID: "route1",
- Weight: 20,
+ Weights: 20,
Blocker: false,
RouteParameters: utils.EmptyString,
},
},
- Weight: 10,
+ Weights: 10,
}
if err := expRpc.Call(utils.APIerSv1GetRouteProfile,
&utils.TenantID{Tenant: "cgrates.org", ID: "ROUTE_ACNT_1001"}, &reply); err != nil {
diff --git a/general_tests/filtered_replication_it_test.go b/general_tests/filtered_replication_it_test.go
index 748fe1f70..8023ecda0 100644
--- a/general_tests/filtered_replication_it_test.go
+++ b/general_tests/filtered_replication_it_test.go
@@ -933,15 +933,15 @@ func testFltrRplRouteProfile(t *testing.T) {
{
ID: "local",
RateProfileIDs: []string{"RP_LOCAL"},
- Weight: 10,
+ Weights: 10,
},
{
ID: "mobile",
RateProfileIDs: []string{"RP_MOBILE"},
- Weight: 30,
+ Weights: 30,
},
},
- Weight: 10,
+ Weights: 10,
},
}
var result string
diff --git a/general_tests/route_it_test.go b/general_tests/route_it_test.go
index 2c1a8c43a..73dad246c 100644
--- a/general_tests/route_it_test.go
+++ b/general_tests/route_it_test.go
@@ -142,11 +142,11 @@ func testV1SplSSetSupplierProfilesWithoutRateProfileIDs(t *testing.T) {
{
ID: "ROUTE1",
AccountIDs: []string{"accc"},
- Weight: 20,
+ Weights: 20,
Blocker: false,
},
},
- Weight: 10,
+ Weights: 10,
},
}
var result string
@@ -208,24 +208,24 @@ func testV1SplSAddNewSplPrf(t *testing.T) {
{
ID: "route1",
ResourceIDs: []string{"ResourceSupplier1", "Resource2Supplier1"},
- Weight: 20,
+ Weights: 20,
Blocker: false,
},
//route2 and route3 will have the same ResourceUsage = 7
{
ID: "route2",
ResourceIDs: []string{"ResourceSupplier2"},
- Weight: 20,
+ Weights: 20,
Blocker: false,
},
{
ID: "route3",
ResourceIDs: []string{"ResourceSupplier3"},
- Weight: 35,
+ Weights: 35,
Blocker: false,
},
},
- Weight: 10,
+ Weights: 10,
},
}
var result string
@@ -468,24 +468,24 @@ func testV1SplSAddNewSplPrf2(t *testing.T) {
{
ID: "route1",
ResourceIDs: []string{"ResourceSupplier1", "Resource2Supplier1"},
- Weight: 20,
+ Weights: 20,
Blocker: false,
},
//route2 and route3 will have the same ResourceUsage = 7
{
ID: "route2",
ResourceIDs: []string{"ResourceSupplier2"},
- Weight: 20,
+ Weights: 20,
Blocker: false,
},
{
ID: "route3",
ResourceIDs: []string{"ResourceSupplier3"},
- Weight: 35,
+ Weights: 35,
Blocker: false,
},
},
- Weight: 10,
+ Weights: 10,
},
}
var result string
diff --git a/loaders/loader_test.go b/loaders/loader_test.go
index b34231083..1438328ab 100644
--- a/loaders/loader_test.go
+++ b/loaders/loader_test.go
@@ -793,8 +793,8 @@ func TestLoaderProcessRoutes(t *testing.T) {
Path: "FilterIDs",
Type: utils.MetaComposed,
Value: config.NewRSRParsersMustCompile("~*req.2", utils.InfieldSep)},
- {Tag: "Weight",
- Path: "Weight",
+ {Tag: "Weights",
+ Path: "Weights",
Type: utils.MetaComposed,
Value: config.NewRSRParsersMustCompile("~*req.3", utils.InfieldSep)},
{Tag: "Sorting",
@@ -829,8 +829,8 @@ func TestLoaderProcessRoutes(t *testing.T) {
Path: "RouteStatIDs",
Type: utils.MetaComposed,
Value: config.NewRSRParsersMustCompile("~*req.11", utils.InfieldSep)},
- {Tag: "RouteWeight",
- Path: "RouteWeight",
+ {Tag: "RouteWeights",
+ Path: "RouteWeights",
Type: utils.MetaComposed,
Value: config.NewRSRParsersMustCompile("~*req.12", utils.InfieldSep)},
{Tag: "RouteBlocker",
@@ -872,7 +872,7 @@ func TestLoaderProcessRoutes(t *testing.T) {
RateProfileIDs: []string{"RPL_1"},
ResourceIDs: []string{"ResGroup1"},
StatIDs: []string{"Stat1"},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
Blocker: true,
RouteParameters: "param1",
},
@@ -883,7 +883,7 @@ func TestLoaderProcessRoutes(t *testing.T) {
RateProfileIDs: []string{"RPL_3"},
ResourceIDs: []string{"ResGroup3"},
StatIDs: []string{"Stat2"},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
Blocker: false,
RouteParameters: utils.EmptyString,
},
@@ -892,12 +892,12 @@ func TestLoaderProcessRoutes(t *testing.T) {
RateProfileIDs: []string{"RPL_2"},
ResourceIDs: []string{"ResGroup2", "ResGroup4"},
StatIDs: []string{"Stat3"},
- Weight: 10,
+ Weights: utils.DynamicWeights{{Weight: 10}},
Blocker: false,
RouteParameters: utils.EmptyString,
},
},
- Weight: 20,
+ Weights: utils.DynamicWeights{{Weight: 20}},
}
sort.Slice(eSp.Routes, func(i, j int) bool {
return strings.Compare(eSp.Routes[i].ID+strings.Join(eSp.Routes[i].FilterIDs, utils.ConcatenatedKeySep),
diff --git a/migrator/routes.go b/migrator/routes.go
index e7c5fa7db..daa61aa7d 100644
--- a/migrator/routes.go
+++ b/migrator/routes.go
@@ -206,7 +206,7 @@ func convertSupplierToRoute(spp *SupplierProfile) (route *engine.RouteProfile) {
FilterIDs: spp.FilterIDs,
Sorting: spp.Sorting,
SortingParameters: spp.SortingParameters,
- Weight: spp.Weight,
+ Weights: utils.DynamicWeights{{Weight: spp.Weight}},
}
route.Routes = make([]*engine.Route, len(spp.Suppliers))
for i, supl := range spp.Suppliers {
@@ -217,7 +217,7 @@ func convertSupplierToRoute(spp *SupplierProfile) (route *engine.RouteProfile) {
RateProfileIDs: supl.RatingPlanIDs,
ResourceIDs: supl.ResourceIDs,
StatIDs: supl.StatIDs,
- Weight: supl.Weight,
+ Weights: utils.DynamicWeights{{Weight: supl.Weight}},
Blocker: supl.Blocker,
RouteParameters: supl.SupplierParameters,
}
diff --git a/migrator/routes_it_test.go b/migrator/routes_it_test.go
index 888c6c305..58d104d2c 100644
--- a/migrator/routes_it_test.go
+++ b/migrator/routes_it_test.go
@@ -183,7 +183,7 @@ func testSupITMigrateAndMove(t *testing.T) {
Tenant: "cgrates.org",
ID: "SUP1",
FilterIDs: []string{"*string:~*req.Account:1001"},
- Weight: 10,
+ Weights: 10,
Sorting: utils.MetaQOS,
SortingParameters: []string{},
Routes: []*engine.Route{{
@@ -192,7 +192,7 @@ func testSupITMigrateAndMove(t *testing.T) {
AccountIDs: []string{"1001"},
RateProfileIDs: []string{"RT_PLAN1"},
ResourceIDs: []string{"RES1"},
- Weight: 10,
+ Weights: 10,
}},
}
switch supAction {
diff --git a/migrator/tp_routes_it_test.go b/migrator/tp_routes_it_test.go
index b493c1d1c..7b35c6a8d 100644
--- a/migrator/tp_routes_it_test.go
+++ b/migrator/tp_routes_it_test.go
@@ -122,12 +122,12 @@ func testTpSplITPopulate(t *testing.T) {
RateProfileIDs: []string{"RPL_1"},
ResourceIDs: []string{"ResGroup1"},
StatIDs: []string{"Stat1"},
- Weight: 10,
+ Weights: 10,
Blocker: false,
RouteParameters: "SortingParam1",
},
},
- Weight: 20,
+ Weights: 20,
},
}
if err := tpSplMigrator.storDBIn.StorDB().SetTPRoutes(tpSuppliers); err != nil {
diff --git a/utils/apitpdata.go b/utils/apitpdata.go
index f6913386c..4b0abc3e7 100644
--- a/utils/apitpdata.go
+++ b/utils/apitpdata.go
@@ -620,7 +620,7 @@ type TPRoute struct {
RateProfileIDs []string // used when computing price
ResourceIDs []string // queried in some strategies
StatIDs []string // queried in some strategies
- Weight float64
+ Weights string
Blocker bool
RouteParameters string
}
@@ -634,7 +634,7 @@ type TPRouteProfile struct {
Sorting string
SortingParameters []string
Routes []*TPRoute
- Weight float64
+ Weights string
}
// TPAttribute is used in TPAttributeProfile
diff --git a/utils/consts.go b/utils/consts.go
index b2d32c69b..5bb5835a6 100644
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -543,7 +543,7 @@ const (
RouteAccountIDs = "RouteAccountIDs"
RouteRateProfileIDs = "RouteRateProfileIDs"
RouteStatIDs = "RouteStatIDs"
- RouteWeight = "RouteWeight"
+ RouteWeights = "RouteWeights"
RouteParameters = "RouteParameters"
RouteBlocker = "RouteBlocker"
RouteResourceIDs = "RouteResourceIDs"