diff --git a/data/conf/samples/loaders/tutinternal/cgrates.json b/data/conf/samples/loaders/tutinternal/cgrates.json index fffc78217..bf52553e4 100644 --- a/data/conf/samples/loaders/tutinternal/cgrates.json +++ b/data/conf/samples/loaders/tutinternal/cgrates.json @@ -61,7 +61,6 @@ "file_name": "Attributes.csv", "fields": [ {"tag": "AttributesFields","type": "*template", "value": "attrTemplateLoader"} - ], }, ], @@ -199,7 +198,7 @@ {"path": "Tenant", "type": "*variable", "value": "~*req.0", "mandatory": true}, {"path": "ID", "type": "*variable", "value": "~*req.1", "mandatory": true}, {"path": "FilterIDs", "type": "*variable", "value": "~*req.2"}, - {"path": "Weight", "type": "*variable", "value": "~*req.3"}, + {"path": "Weights", "type": "*variable", "value": "~*req.3"}, {"path": "Attributes.FilterIDs", "type": "*variable", "value": "~*req.4","new_branch":true}, {"path": "Attributes.Path", "type": "*variable", "value": "~*req.5"}, {"path": "Attributes.Type", "type": "*variable", "value": "~*req.6"}, diff --git a/data/conf/samples/loaders/tutmongo/cgrates.json b/data/conf/samples/loaders/tutmongo/cgrates.json index 54ae86864..e2af11db8 100644 --- a/data/conf/samples/loaders/tutmongo/cgrates.json +++ b/data/conf/samples/loaders/tutmongo/cgrates.json @@ -102,7 +102,6 @@ "file_name": "Attributes.csv", "fields": [ {"tag": "AttributesFields","type": "*template", "value": "attrTemplateLoader"} - ], }, ], @@ -247,7 +246,7 @@ {"path": "Tenant", "type": "*variable", "value": "~*req.0", "mandatory": true}, {"path": "ID", "type": "*variable", "value": "~*req.1", "mandatory": true}, {"path": "FilterIDs", "type": "*variable", "value": "~*req.2"}, - {"path": "Weight", "type": "*variable", "value": "~*req.3"}, + {"path": "Weights", "type": "*variable", "value": "~*req.3"}, {"path": "Attributes.FilterIDs", "type": "*variable", "value": "~*req.4","new_branch":true}, {"path": "Attributes.Path", "type": "*variable", "value": "~*req.5"}, {"path": "Attributes.Type", "type": "*variable", "value": "~*req.6"}, diff --git a/data/conf/samples/loaders/tutmysql/cgrates.json b/data/conf/samples/loaders/tutmysql/cgrates.json index 75bec44e6..bfd1dc27b 100644 --- a/data/conf/samples/loaders/tutmysql/cgrates.json +++ b/data/conf/samples/loaders/tutmysql/cgrates.json @@ -61,17 +61,7 @@ "type": "*attributes", "file_name": "Attributes.csv", "fields": [ - //{"tag": "AttributesFields","type": "*template", "value": "attrTemplateLoader"} - {"tag": "TenantID", "path": "Tenant", "type": "*variable", "value": "~*req.0", "mandatory": true}, - {"tag": "ProfileID", "path": "ID", "type": "*variable", "value": "~*req.1", "mandatory": true}, - {"tag": "FilterIDs", "path": "FilterIDs", "type": "*variable", "value": "~*req.2"}, - {"tag": "Weights", "path": "Weights", "type": "*variable", "value": "~*req.3"}, - {"tag": "AttributeFilterIDs", "path": "Attributes.FilterIDs", "type": "*variable", "value": "~*req.4","new_branch":true}, - {"tag": "Path", "path": "Attributes.Path", "type": "*variable", "value": "~*req.5"}, - {"tag": "Type", "path": "Attributes.Type", "type": "*variable", "value": "~*req.6"}, - {"tag": "Value", "path": "Attributes.Value", "type": "*variable", "value": "~*req.7"}, - {"tag": "Blocker", "path": "Blocker", "type": "*variable", "value": "~*req.8"}, - + {"tag": "AttributesFields","type": "*template", "value": "attrTemplateLoader"} ], }, ], @@ -253,7 +243,7 @@ {"path": "Tenant", "type": "*variable", "value": "~*req.0", "mandatory": true}, {"path": "ID", "type": "*variable", "value": "~*req.1", "mandatory": true}, {"path": "FilterIDs", "type": "*variable", "value": "~*req.2"}, - {"path": "Weight", "type": "*variable", "value": "~*req.3"}, + {"path": "Weights", "type": "*variable", "value": "~*req.3"}, {"path": "Attributes.FilterIDs", "type": "*variable", "value": "~*req.4","new_branch":true}, {"path": "Attributes.Path", "type": "*variable", "value": "~*req.5"}, {"path": "Attributes.Type", "type": "*variable", "value": "~*req.6"}, diff --git a/data/conf/samples/registrarc/dispatchers_mysql/cgrates.json b/data/conf/samples/registrarc/dispatchers_mysql/cgrates.json index 3cacfbe75..976acf017 100755 --- a/data/conf/samples/registrarc/dispatchers_mysql/cgrates.json +++ b/data/conf/samples/registrarc/dispatchers_mysql/cgrates.json @@ -30,8 +30,6 @@ }, }, - - "schedulers": { "enabled": true, }, diff --git a/data/conf/samples/tutinternal/cgrates.json b/data/conf/samples/tutinternal/cgrates.json index f08148976..264ea4153 100644 --- a/data/conf/samples/tutinternal/cgrates.json +++ b/data/conf/samples/tutinternal/cgrates.json @@ -25,27 +25,17 @@ "db_type": "*internal" }, - -"rals": { - "enabled": true, - "thresholds_conns": ["*internal"], - "max_increments":3000000 -}, - - "schedulers": { "enabled": true, "cdrs_conns": ["*internal"], "stats_conns": ["*localhost"] }, - "cdrs": { "enabled": true, "chargers_conns":["*internal"] }, - "attributes": { "enabled": true, "stats_conns": ["*localhost"], diff --git a/engine/libtest.go b/engine/libtest.go index 77785c4af..dccfc5a44 100644 --- a/engine/libtest.go +++ b/engine/libtest.go @@ -123,7 +123,7 @@ cgrates.org,RoutePrf1,,,,,route1,,,,ResGroup4,Stat3,;10,, AttributesCSVContent = ` #Tenant,ID,FilterIDs,Weights,AttributeFilterIDs,Path,Type,Value,Blocker cgrates.org,ALS1,*string:~*req.Account:1001;*string:~*opts.*context:con1,;20,*string:~*req.Field1:Initial,*req.Field1,*variable,Sub1,true -cgrates.org,ALS1,*string:~*opts.*context:con2|con3,;20,,*req.Field2,*variable,Sub2,true +cgrates.org,ALS1,*string:~*opts.*context:con2|con3,,,*req.Field2,*variable,Sub2,true ` ChargersCSVContent = ` #Tenant,ID,FilterIDs,Weights,RunID,AttributeIDs