From 88100633700f81814652862dbf87a0ae86b29dcc Mon Sep 17 00:00:00 2001 From: DanB Date: Tue, 24 Jul 2018 19:10:33 +0200 Subject: [PATCH] ClueLRN TP and conf folders updated --- data/conf/samples/cluelrn/cgrates.json | 59 +++++++++++++++++++++++++ data/tariffplans/cluelrn/Attributes.csv | 13 +++--- data/tariffplans/cluelrn/Suppliers.csv | 2 +- engine/attributes.go | 6 +-- 4 files changed, 70 insertions(+), 10 deletions(-) create mode 100644 data/conf/samples/cluelrn/cgrates.json diff --git a/data/conf/samples/cluelrn/cgrates.json b/data/conf/samples/cluelrn/cgrates.json new file mode 100644 index 000000000..e4501c5a8 --- /dev/null +++ b/data/conf/samples/cluelrn/cgrates.json @@ -0,0 +1,59 @@ +{ +// CGRateS Configuration file +// + + +"general": { + "log_level": 7, +}, + + +"listen": { + "rpc_json": ":2012", + "rpc_gob": ":2013", + "http": ":2080", +}, + + +"data_db": { // database used to store runtime data (eg: accounts, cdr stats) + "db_type": "redis", // data_db type: + "db_port": 6379, // data_db port to reach the database + "db_name": "10", // data_db database name to connect to + +}, + + +"stor_db": { + "db_password": "CGRateS.org", +}, + + +"rals": { + "enabled": true, +}, + + +"scheduler": { + "enabled": true, +}, + + +"cdrs": { + "enabled": true, +}, + + +"attributes": { + "enabled": true, +}, + + +"suppliers": { + "enabled": true, + "attributes_conns": [ + {"address": "*internal"} + ], +}, + + +} diff --git a/data/tariffplans/cluelrn/Attributes.csv b/data/tariffplans/cluelrn/Attributes.csv index f7845b498..9d7d1c0ca 100644 --- a/data/tariffplans/cluelrn/Attributes.csv +++ b/data/tariffplans/cluelrn/Attributes.csv @@ -1,7 +1,8 @@ #Tenant,ID,Contexts,FilterIDs,ActivationInterval,FieldName,Initial,Substitute,Append,Blocker,Weight -cgrates.org,LRN_9174269000,lrn,*string:Destination:9174269000,,LRN,*any,13128543000,true,false,10 -cgrates.org,LRN_LATA_Dst9174269000,lrn,*string:LRN:13128543000,,DestinationLATA,*any,358,true,false,20 -cgrates.org,LRN_LATA_Cli13128543000,lrn,*string:Caller:13128543000;*rsr::DestinationLATA(!^$),,CallerLATA,*any,132,true,false,30 -cgrates.org,LRN_JURISTICTION_NY,lrn,FLTR_INTRALATA_NEWYORK,,LRNJuristiction,*any,INTRA,true,false,50 -cgrates.org,LRN_JURISTICTION_IL,lrn,FLTR_INTRALATA_ILLINOIS,,LRNJuristiction,*any,INTRA,true,false,50 -cgrates.org,LRN_JURISTICTION_INTER,lrn,*string:Destination:9174269000;*rsr::CallerLATA(!^$),,LRNJuristiction,*any,INTER,true,false,40 +cgrates.org,LRN_Dst3125650565,lrn,*string:Destination:3125650565,,Destination,*any,13128543000,true,false,10 +cgrates.org,LRN_Dst3125650565,,,,OriginalDestination,*any,3125650565,true,false,10 +cgrates.org,LRN_LATA_Dst13128543000,lrn,*string:Destination:13128543000;*rsr::OriginalDestination(!^$),,DestinationLATA,*any,358,true,false,20 +cgrates.org,LRN_LATA_Cli9174269000,lrn,*string:Account:9174269000;*rsr::DestinationLATA(!^$),,CallerLATA,*any,132,true,false,30 +cgrates.org,LRN_JURISDICTION_NY,lrn,FLTR_INTRALATA_NEWYORK,,LRNJurisdiction,*any,INTRA,true,false,50 +cgrates.org,LRN_JURISDICTION_IL,lrn,FLTR_INTRALATA_ILLINOIS,,LRNJurisdiction,*any,INTRA,true,false,50 +cgrates.org,LRN_JURISDICTION_INTER,lrn,*string:Destination:9174269000;*rsr::CallerLATA(!^$),,LRNJurisdiction,*any,INTER,true,false,40 diff --git a/data/tariffplans/cluelrn/Suppliers.csv b/data/tariffplans/cluelrn/Suppliers.csv index 6d553a0c9..40e4bfdf0 100644 --- a/data/tariffplans/cluelrn/Suppliers.csv +++ b/data/tariffplans/cluelrn/Suppliers.csv @@ -1,4 +1,4 @@ #Tenant,ID,FilterIDs,ActivationInterval,Sorting,SortingParamameters,SupplierID,SupplierFilterIDs,SupplierAccountIDs,SupplierRatingPlanIDs,SupplierResourceIDs,SupplierStatIDs,SupplierWeight,SupplierBlocker,SupplierParameters,Weight -cgrates.org,SPL_CLUELRN_INTER,*string:Caller:3125650565;*string:LRNJuristiction:INTER,2017-11-27T00:00:00Z,*least_cost,,LEVEL3,,,RP_LEVEL3_INTER,,,,false,,10 +cgrates.org,SPL_CLUELRN_INTER,*string:Account:9174269000;*string:LRNJuristiction:INTER,2017-11-27T00:00:00Z,*least_cost,,LEVEL3,,,RP_LEVEL3_INTER,,,,false,,10 cgrates.org,SPL_CLUELRN_INTER,,,,,TMOBILE,,,RP_TMOBILE_INTER,,,,false,, cgrates.org,SPL_CLUELRN_INTER,,,,,COMCAST,,,RP_COMCAST_INTER,,,,false,, diff --git a/engine/attributes.go b/engine/attributes.go index 7f1d9d114..e7a6019d2 100644 --- a/engine/attributes.go +++ b/engine/attributes.go @@ -141,7 +141,7 @@ type AttrSProcessEventReply struct { MatchedProfiles []string AlteredFields []string CGREvent *utils.CGREvent - blocker bool + blocker bool // internally used to stop further processRuns } // Digest returns serialized version of alteredFields in AttrSProcessEventReply @@ -257,7 +257,7 @@ func (alS *AttributeService) V1ProcessEvent(args *AttrArgsProcessEvent, } if apiRply == nil { // first reply apiRply = evRply - if apiRply.blocker == true { + if apiRply.blocker { break } continue @@ -274,7 +274,7 @@ func (alS *AttributeService) V1ProcessEvent(args *AttrArgsProcessEvent, } apiRply.AlteredFields = append(apiRply.AlteredFields, fldName) } - if evRply.blocker == true { + if evRply.blocker { break } }