From 37f6596531456e1d4d44cb17496d11bd4ba8e2cd Mon Sep 17 00:00:00 2001 From: porosnicuadrian Date: Thu, 17 Jun 2021 17:05:31 +0300 Subject: [PATCH] Multiple lines for declaring csv in tariffplans --- data/tariffplans/tut_sip_redirect/Routes.csv | 8 +++-- data/tariffplans/tutorial/Attributes.csv | 36 ++++++++++++++------ data/tariffplans/tutorial/Routes.csv | 12 +++++-- data/tariffplans/tutorial2/Attributes.csv | 3 +- data/tariffplans/tutroutes/Routes.csv | 18 ++++++---- 5 files changed, 55 insertions(+), 22 deletions(-) diff --git a/data/tariffplans/tut_sip_redirect/Routes.csv b/data/tariffplans/tut_sip_redirect/Routes.csv index 4d5c1ad50..f7ac9814b 100644 --- a/data/tariffplans/tut_sip_redirect/Routes.csv +++ b/data/tariffplans/tut_sip_redirect/Routes.csv @@ -1,7 +1,11 @@ #Tenant,ID,FilterIDs,ActivationInterval,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRatingPlanIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters,Weight -cgrates.org,ROUTE_ACNT_1001,*string:~*req.Account:1001,2017-11-27T00:00:00Z,*weight,,route1,,1001,RP_10CNT,,,20,,cgrates.org,20 + +cgrates.org,ROUTE_ACNT_1001,*string:~*req.Account:1001,2017-11-27T00:00:00Z,*weight,,,,,,,,,,,20 +cgrates.org,ROUTE_ACNT_1001,,,,,route1,,1001,RP_10CNT,,,20,,cgrates.org,20 cgrates.org,ROUTE_ACNT_1001,,,,,route2,,1001,RP_20CNT,,,10,,cgrates.net,10 cgrates.org,ROUTE_ACNT_1001,,,,,route3,,1001,RP_1CNT,,,5,,cgrates.com,5 -cgrates.org,ROUTE_ACNT_1002,*string:~*req.Account:1002,2017-11-27T00:00:00Z,*weight,,route1,,1002,RP_10CNT,,,20,,1003@192.168.56.203,20 + +cgrates.org,ROUTE_ACNT_1002,*string:~*req.Account:1002,2017-11-27T00:00:00Z,*weight,,,,,,,,,,,20 +cgrates.org,ROUTE_ACNT_1002,,,,,route1,,1002,RP_10CNT,,,20,,1003@192.168.56.203,20 cgrates.org,ROUTE_ACNT_1002,,,,,route2,,1002,RP_20CNT,,,10,,1004@192.168.57.203,10 cgrates.org,ROUTE_ACNT_1002,,,,,route3,,1002,RP_1CNT,,,5,,1005@192.168.58.203,5 diff --git a/data/tariffplans/tutorial/Attributes.csv b/data/tariffplans/tutorial/Attributes.csv index d764c908d..785c033f8 100644 --- a/data/tariffplans/tutorial/Attributes.csv +++ b/data/tariffplans/tutorial/Attributes.csv @@ -1,26 +1,42 @@ #Tenant,ID,Contexts,FilterIDs,ActivationInterval,AttributeFilterIDs,Path,Type,Value,Blocker,Weight cgrates.org,ATTR_1001_SIMPLEAUTH,simpleauth,*string:~*req.Account:1001,,,*req.Password,*constant,CGRateS.org,false,20 + cgrates.org,ATTR_1002_SIMPLEAUTH,simpleauth,*string:~*req.Account:1002,,,*req.Password,*constant,CGRateS.org,false,20 + cgrates.org,ATTR_1003_SIMPLEAUTH,simpleauth,*string:~*req.Account:1003,,,*req.Password,*constant,CGRateS.org,false,20 -cgrates.org,ATTR_1001_SESSIONAUTH,*sessions,*string:~*req.Account:1001,,,*req.Password,*constant,CGRateS.org,false,10 + +cgrates.org,ATTR_1001_SESSIONAUTH,*sessions,*string:~*req.Account:1001,,,,,,false,10 +cgrates.org,ATTR_1001_SESSIONAUTH,,,,,*req.Password,*constant,CGRateS.org,, cgrates.org,ATTR_1001_SESSIONAUTH,,,,,*req.RequestType,*constant,*prepaid,, cgrates.org,ATTR_1001_SESSIONAUTH,,,,,*req.PaypalAccount,*constant,cgrates@paypal.com,, cgrates.org,ATTR_1001_SESSIONAUTH,,,,,*req.LCRProfile,*constant,premium_cli,, -cgrates.org,ATTR_1002_SESSIONAUTH,*sessions,*string:~*req.Account:1002,,,*req.Password,*constant,CGRateS.org,false,10 + +cgrates.org,ATTR_1002_SESSIONAUTH,*sessions,*string:~*req.Account:1002,,,,,,false,10 +cgrates.org,ATTR_1002_SESSIONAUTH,,,,,*req.Password,*constant,CGRateS.org,, cgrates.org,ATTR_1002_SESSIONAUTH,,,,,*req.RequestType,*constant,*postpaid,, cgrates.org,ATTR_1002_SESSIONAUTH,,,,,*req.PaypalAccount,*constant,cgrates@paypal.com,, cgrates.org,ATTR_1002_SESSIONAUTH,,,,,*req.LCRProfile,*constant,premium_cli,, cgrates.org,ATTR_1002_SESSIONAUTH,,,,,ResourceAllocation,*constant,"ResGroup1",, -cgrates.org,ATTR_1003_SESSIONAUTH,*sessions,*string:~*req.Account:1003,,,*req.Password,*constant,CGRateS.org,false,10 + +cgrates.org,ATTR_1003_SESSIONAUTH,*sessions,*string:~*req.Account:1003,,,,,,false,10 +cgrates.org,ATTR_1003_SESSIONAUTH,,,,,*req.Password,*constant,CGRateS.org,, cgrates.org,ATTR_1003_SESSIONAUTH,,,,,*req.RequestType,*constant,*prepaid,, cgrates.org,ATTR_1003_SESSIONAUTH,,,,,*req.PaypalAccount,*constant,cgrates@paypal.com,, cgrates.org,ATTR_1003_SESSIONAUTH,,,,,*req.LCRProfile,*constant,premium_cli,, -cgrates.org,ATTR_ACC_ALIAS,*any,*string:~*req.SubscriberId:1006,,,*req.Account,*constant,1001,false,10 -cgrates.org,ATTR_ACC_ALIAS,*any,,,,*req.RequestType,*constant,*prepaid,, -cgrates.com,ATTR_TNT_ALIAS,*any,*string:~*req.SubscriberId:1006,,,*req.Account,*constant,1001,false,10 -cgrates.com,ATTR_TNT_ALIAS,*any,,,,*req.RequestType,*constant,*prepaid,, -cgrates.com,ATTR_TNT_ALIAS,*any,,,,*tenant,*constant,cgrates.org,, + +cgrates.org,ATTR_ACC_ALIAS,*any,*string:~*req.SubscriberId:1006,,,,,,false,10 +cgrates.org,ATTR_ACC_ALIAS,,,,,*req.Account,*constant,1001,, +cgrates.org,ATTR_ACC_ALIAS,,,,,*req.RequestType,*constant,*prepaid,, + +cgrates.com,ATTR_TNT_ALIAS,*any,*string:~*req.SubscriberId:1006,,,,,false,10 +cgrates.com,ATTR_TNT_ALIAS,,,,,*req.Account,*constant,1001,, +cgrates.com,ATTR_TNT_ALIAS,,,,,*req.RequestType,*constant,*prepaid,, +cgrates.com,ATTR_TNT_ALIAS,,,,,*tenant,*constant,cgrates.org,, + cgrates.com,ATTR_TNT_1001,*any,*string:~*req.Account:1001,,,*tenant,*constant,cgrates.org,, + cgrates.com,ATTR_TNT_DISC,*any,*string:~*req.Account:testDiamInitWithSessionDisconnect,,,*tenant,*constant,cgrates.org,, -cgrates.com,ATTR_ACC_EMULATE_TERMINATE,*any,*string:~*req.SubscriberId:testDiamItEmulateTerminate,,,*req.Account,*constant,testDiamItEmulateTerminate,false,10 -cgrates.com,ATTR_ACC_EMULATE_TERMINATE,*any,,,,*req.RequestType,*constant,*prepaid,, + +cgrates.com,ATTR_ACC_EMULATE_TERMINATE,*any,*string:~*req.SubscriberId:testDiamItEmulateTerminate,,,,,,false,10 +cgrates.com,ATTR_ACC_EMULATE_TERMINATE,,,,,*req.Account,*constant,testDiamItEmulateTerminate,, +cgrates.com,ATTR_ACC_EMULATE_TERMINATE,,,,,*req.RequestType,*constant,*prepaid,, diff --git a/data/tariffplans/tutorial/Routes.csv b/data/tariffplans/tutorial/Routes.csv index 2946f3c39..97df65e9d 100644 --- a/data/tariffplans/tutorial/Routes.csv +++ b/data/tariffplans/tutorial/Routes.csv @@ -1,8 +1,14 @@ #Tenant,ID,FilterIDs,ActivationInterval,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRatingPlanIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters,Weight -cgrates.org,ROUTE_ACNT_1001,FLTR_ACNT_1001,2017-11-27T00:00:00Z,*weight,,route1,,,,,,10,,,10 + +cgrates.org,ROUTE_ACNT_1001,FLTR_ACNT_1001,2017-11-27T00:00:00Z,*weight,,,,,,,,,,,10 +cgrates.org,ROUTE_ACNT_1001,,,,,route1,,,,,,10,,,10 cgrates.org,ROUTE_ACNT_1001,,,,,route2,,,,,,20,,,20 -cgrates.org,ROUTE_ACNT_1002,FLTR_ACNT_1002,2017-11-27T00:00:00Z,*lc,,route1,,,RP_1002_LOW,,,10,false,,10 + +cgrates.org,ROUTE_ACNT_1002,FLTR_ACNT_1002,2017-11-27T00:00:00Z,*lc,,,,,,,,,false,,10 +cgrates.org,ROUTE_ACNT_1002,,,,,route1,,,RP_1002_LOW,,,10,,, cgrates.org,ROUTE_ACNT_1002,,,,,route2,,,RP_1002,,,20,,, -cgrates.org,ROUTE_ACNT_1003,FLTR_ACNT_1003,2017-11-27T00:00:00Z,*qos,*tcc;*tcd,route1,,,,,Stats2,10,false,,10 + +cgrates.org,ROUTE_ACNT_1003,FLTR_ACNT_1003,2017-11-27T00:00:00Z,*qos,*tcc;*tcd,,,,,,,,false,,10 +cgrates.org,ROUTE_ACNT_1003,,,,,route1,,,,,Stats2,10,,, cgrates.org,ROUTE_ACNT_1003,,,,,route2,,,,,Stats2_1,20,,, diff --git a/data/tariffplans/tutorial2/Attributes.csv b/data/tariffplans/tutorial2/Attributes.csv index 51b0feab1..3121268fd 100644 --- a/data/tariffplans/tutorial2/Attributes.csv +++ b/data/tariffplans/tutorial2/Attributes.csv @@ -1,7 +1,8 @@ # Tenant,ID,Contexts,FilterIDs,ActivationInterval,AttributeFilterIDs,Path,Type,Value,Blocker,Weight # CRG_RESELLER1 replaces Category->reseller1 and RequestType->*rated for *sessions and *cdrs events -cgrates.org,ATTR_CRG_SUPPLIER1,*sessions;*cdrs,,,,*req.Category,*constant,reseller1,false,0 +cgrates.org,ATTR_CRG_SUPPLIER1,*sessions;*cdrs,,,,,,,false,0 +cgrates.org,ATTR_CRG_SUPPLIER1,,,,,*req.Category,*constant,reseller1,, cgrates.org,ATTR_CRG_SUPPLIER1,,,,,*req.RequestType,*constant,*rated,, # ATTR_1001_AUTH returns the Password value for the account 1001 in context diff --git a/data/tariffplans/tutroutes/Routes.csv b/data/tariffplans/tutroutes/Routes.csv index 270530850..c7fe448d3 100644 --- a/data/tariffplans/tutroutes/Routes.csv +++ b/data/tariffplans/tutroutes/Routes.csv @@ -1,27 +1,33 @@ #Tenant,ID,FilterIDs,ActivationInterval,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRatingPlanIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters,Weight -cgrates.org,ROUTE_ACNT_1001,*string:~*req.Account:1001,,*weight,,vendor1,FLTR_DEST_1003,,,,,10,,, +cgrates.org,ROUTE_ACNT_1001,*string:~*req.Account:1001,,*weight,,,,,,,,,,, +cgrates.org,ROUTE_ACNT_1001,,,,,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,*string:~*req.Account:1002,,*lc,,,,,,,,,,, +cgrates.org,ROUTE_ACNT_1002,,,,,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,*string:~*req.Account:1003,,*qos,*acd;*tcc,,,,,,,,,, +cgrates.org,ROUTE_ACNT_1003,,,,,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,*string:~*req.Account:1004,,*reas,,,,,,,,,,, +cgrates.org,ROUTE_ACNT_1004,,,,,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,*string:~*req.Account:1005,,*load,vendor1:3;*default:2,,,,,,,,,, +cgrates.org,ROUTE_ACNT_1005,,,,,vendor1,,,,,STATS_VENDOR_1:*sum#1,,,, 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,Fltr_tcc,,*hc,,,,,,,,,,, +cgrates.org,ROUTE_HC1,,,,,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,,,