uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-19 22:28:45 +05:00
Code Issues Packages Projects Releases Wiki Activity

Updated session volume integration test/tariffplans and config

Browse Source
This commit is contained in:
porosnicuadrian
2021-09-29 17:45:00 +03:00
committed by Dan Christian Bogos
parent 0d877dc35d
commit 1cad960ae2
6 changed files with 75 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
data/conf/samples/session_volume_discount_internal/cgrates.json
View File

@@ -18,6 +18,23 @@
"sessions": {
"enabled": true,
"routes_conns": ["*internal"],
"cdrs_conns": ["*internal"],
},
"cdrs": { // CDRs config
"enabled": true,
},
"chargers": {
"enabled": true,
},
"rates": {
"enabled": true,
},
"accounts": {
"enabled": true,
},
"loaders": [
@@ -33,6 +50,9 @@
"routes": {
"enabled": true,
"indexed_selects": false,
"rates_conns": ["*localhost"], // connections to RateS
"accounts_conns": ["*internal"], // connections to AccountS
},
"admins": {

5
data/tariffplans/sessions_discount_volume/Accounts.csv Normal file
View File

@@ -0,0 +1,5 @@
#Tenant,ID,FilterIDs,Weights,Opts,BalanceID,BalanceFilterIDs,BalanceWeights,BalanceType,BalanceUnits,BalanceUnitFactors,BalanceOpts,BalanceCostIncrements,BalanceAttributeIDs,BalanceRateProfileIDs,ThresholdIDs
cgrates.org,ACCOUNT1,,,,ABS_BALANCE1,,;30,*abstract,600000000000,,,,,RP_ABS_BALANCE1,
cgrates.org,ACCOUNT1,,,,ABS_BALANCE2,,;20,*abstract,300000000000,,,,,RP_ABS_BALANCE2,
cgrates.org,ACCOUNT1,,,,CNCRT_BALANCE1,,;10,*concrete,1000,,*balanceUnlimited:true,,,RP_CNCRT_BALANCE1,
1 #Tenant ID FilterIDs Weights Opts BalanceID BalanceFilterIDs BalanceWeights BalanceType BalanceUnits BalanceUnitFactors BalanceOpts BalanceCostIncrements BalanceAttributeIDs BalanceRateProfileIDs ThresholdIDs
2 cgrates.org ACCOUNT1 ABS_BALANCE1 ;30 *abstract 600000000000 RP_ABS_BALANCE1
3 cgrates.org ACCOUNT1 ABS_BALANCE2 ;20 *abstract 300000000000 RP_ABS_BALANCE2
4 cgrates.org ACCOUNT1 CNCRT_BALANCE1 ;10 *concrete 1000 *balanceUnlimited:true RP_CNCRT_BALANCE1

16
data/tariffplans/sessions_discount_volume/RateProfiles.csv
View File

@@ -1,16 +1,10 @@
#Tenant,ID,FilterIDs,Weights,MinCost,MaxCost,MaxCostStrategy,RateID,RateFilterIDs,RateActivationStart,RateWeights,RateBlocker,RateIntervalStart,RateFixedFee,RateRecurrentFee,RateUnit,RateIncrement
cgrates.org,RP1,,,,,,RT_10,*prefix:~*req.Destination:10,,;10,,,,0.03,1m,1s
cgrates.org,RP1,,,,,,RT_20,*prefix:~*req.Destination:20,,;10,,,,0.01,1m,1s
cgrates.org,RP1,,,,,,RT_DFLT,,,,,,,0.92,1m,1s
cgrates.org,RP_ABS_BALANCE1,,,,,,RT_ABS1,,,;10,,,,0.01,1m,1s
cgrates.org,RP2,,,,,,RT_100,*prefix:~*req.Destination:100,,;10,,,,0.92,1m,1s
cgrates.org,RP2,,,,,,RT_DFLT,,,,,,,0.95,1m,1s
cgrates.org,RP_ABS_BALANCE2,,,,,,RT_ABS2,,,;10,,,,0.02,1m,1s
cgrates.org,RP3,,,,,,RT_1,*prefix:~*req.Destination:1,,;10,,,,0.01,1m,1s
cgrates.org,RP3,,,,,,RT_DFLT,,,,,,,0.97,1m,1s
cgrates.org,RP_CNCRT_BALANCE1,,,,,,RT_CNC1,,,;10,,,,0.1,1m,1s
cgrates.org,RP_ROUTE2,,,,,,RT_ROUTE,,,;10,,,,0.05,1m,1s
cgrates.org,RP4,,,,,,RT_200,*prefix:~*req.Destination:200,,,,,,0.02,1m,1s
cgrates.org,RP4,,,,,,RT_1002,*prefix:~*req.Destination:1002,,;10,,,,0.09,1m,1s
cgrates.org,RP4,,,,,,RT_6,*prefix:~*req.Destination:6,,;10,,,,0.09,1m,1s
cgrates.org,RP4,,,,,,RT_DFLT,,,,,,,0.91,1m,1s
1 #Tenant ID FilterIDs Weights MinCost MaxCost MaxCostStrategy RateID RateFilterIDs RateActivationStart RateWeights RateBlocker RateIntervalStart RateFixedFee RateRecurrentFee RateUnit RateIncrement
2 cgrates.org RP1 RP_ABS_BALANCE1 RT_10 RT_ABS1 *prefix:~*req.Destination:10 ;10 0.03 0.01 1m 1s
3 cgrates.org RP1 RP_ABS_BALANCE2 RT_20 RT_ABS2 *prefix:~*req.Destination:20 ;10 0.01 0.02 1m 1s
cgrates.org RP1 RT_DFLT 0.92 1m 1s
cgrates.org RP2 RT_100 *prefix:~*req.Destination:100 ;10 0.92 1m 1s
4 cgrates.org RP2 RP_CNCRT_BALANCE1 RT_DFLT RT_CNC1 ;10 0.95 0.1 1m 1s
5 cgrates.org RP3 RP_ROUTE2 RT_1 RT_ROUTE *prefix:~*req.Destination:1 ;10 0.01 0.05 1m 1s
cgrates.org RP3 RT_DFLT 0.97 1m 1s
6
7
8
9
10

14
data/tariffplans/sessions_discount_volume/Routes.csv
View File

@@ -1,14 +1,6 @@
#Tenant,ID,FilterIDs,Weight,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters
cgrates.org,LC1,,,*lc,,,,,,,,,,
cgrates.org,LC1,,,,,supplier1,,,RP1,,,,,
cgrates.org,LC1,,,,,supplier2,,,RP2,,,,,
cgrates.org,LC1,,,,,supplier3,,,RP3,,,,,
cgrates.org,LC1,,,,,supplier4,,,RP4,,,,,
cgrates.org,RP1,*string:~*req.Account:ACCOUNT1,,*lc,,,,,,,,,,
#cgrates.org,RP1,,,,,ROUTE1,,ACCOUNT1,,,,,,
cgrates.org,RP1,,,,,ROUTE2,,,RP_ROUTE2,,,,,
#cgrates.org,DEFAULT_ROUTES,,,*weight,,,,,,,,,,
#cgrates.org,DEFAULT_ROUTES,,,,,supplier1,,,,,,10,,
#cgrates.org,DEFAULT_ROUTES,,,,,supplier2,,,,,,20,,
#cgrates.org,DEFAULT_ROUTES,,,,,supplier3,,,,,,40,,
#cgrates.org,DEFAULT_ROUTES,,,,,supplier4,,,,,,35,,
1 #Tenant ID FilterIDs Weight Sorting SortingParameters RouteID RouteFilterIDs RouteAccountIDs RouteRateProfileIDs RouteResourceIDs RouteStatIDs RouteWeight RouteBlocker RouteParameters
2 cgrates.org LC1 RP1 *string:~*req.Account:ACCOUNT1 *lc
3 cgrates.org #cgrates.org LC1 RP1 supplier1 ROUTE1 ACCOUNT1 RP1
4 cgrates.org LC1 RP1 supplier2 ROUTE2 RP2 RP_ROUTE2
5
cgrates.org LC1 supplier4 RP4
#cgrates.org DEFAULT_ROUTES *weight
6
#cgrates.org DEFAULT_ROUTES supplier2 20
#cgrates.org DEFAULT_ROUTES supplier3 40
#cgrates.org DEFAULT_ROUTES supplier4 35

267
general_tests/session_volume_discount_it_test.go
View File

@@ -23,8 +23,6 @@ package general_tests
import (
"errors"
"path"
"reflect"
"sort"
"testing"
"time"
@@ -32,10 +30,10 @@ import (
"github.com/cgrates/birpc/context"
"github.com/cgrates/birpc/jsonrpc"
"github.com/cgrates/cgrates/apis"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/loaders"
"github.com/cgrates/cgrates/sessions"
"github.com/cgrates/cgrates/utils"
)
@@ -52,8 +50,8 @@ var (
testSessVolDiscStartEngine,
testSessVolDiscApierRpcConn,
testSessVolDiscLoadersLoad,
testSessVolDiscCheckRoutesAndRateProfiles,
testSessVolDiscSetAccounts,
testSessVolDiscAuthorizeEvent1,
// testSessVolDiscProcessCDR,
testSessVolDiscStopCgrEngine,
}
)
@@ -140,238 +138,57 @@ func testSessVolDiscLoadersLoad(t *testing.T) {
}
}
func testSessVolDiscCheckRoutesAndRateProfiles(t *testing.T) {
expRp := &utils.RateProfile{
Tenant: "cgrates.org",
ID: "RP1",
FilterIDs: []string{},
MinCost: utils.NewDecimal(0, 0),
MaxCost: utils.NewDecimal(0, 0),
Rates: map[string]*utils.Rate{
"RT_10": {
ID: "RT_10",
FilterIDs: []string{"*prefix:~*req.Destination:10"},
IntervalRates: []*utils.IntervalRate{
{
IntervalStart: utils.NewDecimal(0, 0),
FixedFee: utils.NewDecimal(0, 0),
RecurrentFee: utils.NewDecimal(3, 2),
Unit: utils.NewDecimal(60000000000, 0),
Increment: utils.NewDecimal(1000000000, 0),
},
},
},
"RT_20": {
ID: "RT_20",
FilterIDs: []string{"*prefix:~*req.Destination:20"},
IntervalRates: []*utils.IntervalRate{
{
IntervalStart: utils.NewDecimal(0, 0),
FixedFee: utils.NewDecimal(0, 0),
RecurrentFee: utils.NewDecimal(1, 2),
Unit: utils.NewDecimal(60000000000, 0),
Increment: utils.NewDecimal(1000000000, 0),
},
},
},
"RT_DFLT": {
ID: "RT_DFLT",
IntervalRates: []*utils.IntervalRate{
{
IntervalStart: utils.NewDecimal(0, 0),
FixedFee: utils.NewDecimal(0, 0),
RecurrentFee: utils.NewDecimal(92, 2),
Unit: utils.NewDecimal(60000000000, 0),
Increment: utils.NewDecimal(1000000000, 0),
},
},
},
},
}
var reply *utils.RateProfile
if err := tSessVolDiscBiRPC.Call(context.Background(), utils.AdminSv1GetRateProfile,
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{
Tenant: "cgrates.org",
ID: "RP1",
},
}, &reply); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(reply, expRp) {
t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expRp), utils.ToJSON(reply))
func testSessVolDiscAuthorizeEvent1(t *testing.T) {
var reply *engine.APIRouteProfile
if err := tSessVolDiscBiRPC.Call(context.Background(), utils.AdminSv1GetRouteProfile,
&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}}, &reply); err != nil {
t.Fatal(err)
}
expRoutePrf := &engine.APIRouteProfile{
Tenant: "cgrates.org",
ID: "LC1",
FilterIDs: []string{},
Sorting: "*lc",
SortingParameters: []string{},
Routes: []*engine.ExternalRoute{
{
ID: "supplier1",
RateProfileIDs: []string{"RP1"},
},
{
ID: "supplier2",
RateProfileIDs: []string{"RP2"},
},
{
ID: "supplier3",
RateProfileIDs: []string{"RP3"},
},
{
ID: "supplier4",
RateProfileIDs: []string{"RP4"},
},
args := &utils.CGREvent{
Tenant: "cgrates.org",
ID: "testSessVolDiscAuthorizeEvent1",
Event: map[string]interface{}{
utils.AccountField: "ACCOUNT1",
utils.Category: "call",
utils.ToR: "*voice",
},
APIOpts: map[string]interface{}{
utils.Usage: time.Minute + 30*time.Second,
utils.OptsRouteS: true,
},
}
var result *engine.APIRouteProfile
if err := tSessVolDiscBiRPC.Call(context.Background(), utils.AdminSv1GetRouteProfile,
&utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{
Tenant: "cgrates.org",
ID: "LC1",
},
}, &result); err != nil {
// authorize the session
var rplyFirst sessions.V1AuthorizeReply
if err := tSessVolDiscBiRPC.Call(context.Background(), utils.SessionSv1AuthorizeEvent,
args, &rplyFirst); err != nil {
t.Error(err)
} else {
sort.Slice(result.Routes, func(i, j int) bool {
return result.Routes[i].ID < result.Routes[j].ID
})
if !reflect.DeepEqual(result, expRoutePrf) {
t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expRoutePrf), utils.ToJSON(result))
}
}
}
func testSessVolDiscSetAccounts(t *testing.T) {
accPrf1 := &apis.APIAccountWithAPIOpts{
APIAccount: &utils.APIAccount{
Tenant: "cgrates.org",
ID: "ACC1",
FilterIDs: []string{"*string:~*req.Account:1"},
Balances: map[string]*utils.APIBalance{
"AbstractBalance1": {
ID: "AbstractBalance1",
Type: utils.MetaAbstract,
Units: float64(40 * time.Second),
CostIncrements: []*utils.APICostIncrement{
{
Increment: utils.Float64Pointer(float64(time.Second)),
FixedFee: utils.Float64Pointer(float64(0)),
RecurrentFee: utils.Float64Pointer(float64(1)),
},
},
},
},
Weights: ";10",
func testSessVolDiscProcessCDR(t *testing.T) {
args := utils.CGREvent{
Tenant: "cgrates.org",
ID: "TestSSv1ItProcessCDR",
Event: map[string]interface{}{
utils.AccountField: "ACCOUNT1",
utils.Destination: "1002",
},
APIOpts: nil,
}
accPrf2 := &apis.APIAccountWithAPIOpts{
APIAccount: &utils.APIAccount{
Tenant: "cgrates.org",
ID: "ACC2",
FilterIDs: []string{"*string:~*req.Account:2"},
Balances: map[string]*utils.APIBalance{
"AbstractBalance2": {
ID: "AbstractBalance2",
Type: utils.MetaAbstract,
Units: float64(80 * time.Second),
CostIncrements: []*utils.APICostIncrement{
{
Increment: utils.Float64Pointer(float64(time.Minute)),
FixedFee: utils.Float64Pointer(float64(0)),
RecurrentFee: utils.Float64Pointer(float64(1)),
},
},
},
},
Weights: ";10",
APIOpts: map[string]interface{}{
utils.OptsChargerS: true,
utils.OptsAccountS: true,
utils.StartTime: time.Date(2020, time.January, 7, 16, 60, 0, 0, time.UTC),
utils.Usage: time.Minute + 30*time.Second,
},
APIOpts: nil,
}
accPrf3 := &apis.APIAccountWithAPIOpts{
APIAccount: &utils.APIAccount{
Tenant: "cgrates.org",
ID: "ACC3",
FilterIDs: []string{"*string:~*req.Account:3"},
Balances: map[string]*utils.APIBalance{
"AbstractBalance3": {
ID: "AbstractBalance3",
Type: utils.MetaAbstract,
Units: float64(120 * time.Second),
UnitFactors: []*utils.APIUnitFactor{
{
Factor: 100,
},
},
CostIncrements: []*utils.APICostIncrement{
{
Increment: utils.Float64Pointer(float64(time.Minute)),
FixedFee: utils.Float64Pointer(float64(0)),
RecurrentFee: utils.Float64Pointer(float64(1)),
},
},
},
},
Weights: ";10",
},
APIOpts: nil,
var rply string
if err := tSessVolDiscBiRPC.Call(context.Background(), utils.SessionSv1ProcessCDR,
args, &rply); err != nil {
t.Fatal(err)
}
accPrf4 := &apis.APIAccountWithAPIOpts{
APIAccount: &utils.APIAccount{
Tenant: "cgrates.org",
ID: "ACC3",
FilterIDs: []string{"*string:~*req.Account:4"},
Balances: map[string]*utils.APIBalance{
"AbstractBalance4": {
ID: "AbstractBalance4",
Type: utils.MetaAbstract,
Units: float64(30 * time.Second),
UnitFactors: []*utils.APIUnitFactor{
{
Factor: 100,
},
},
CostIncrements: []*utils.APICostIncrement{
{
Increment: utils.Float64Pointer(float64(time.Second)),
FixedFee: utils.Float64Pointer(float64(0.01)),
RecurrentFee: utils.Float64Pointer(float64(2)),
},
},
},
},
Weights: ";10",
},
APIOpts: nil,
}
var reply string
if err := tSessVolDiscBiRPC.Call(context.Background(), utils.AdminSv1SetAccount,
accPrf1, &reply); err != nil {
t.Error(err)
} else if reply != utils.OK {
t.Error(err)
}
if err := tSessVolDiscBiRPC.Call(context.Background(), utils.AdminSv1SetAccount,
accPrf2, &reply); err != nil {
t.Error(err)
} else if reply != utils.OK {
t.Error(err)
}
if err := tSessVolDiscBiRPC.Call(context.Background(), utils.AdminSv1SetAccount,
accPrf3, &reply); err != nil {
t.Error(err)
} else if reply != utils.OK {
t.Error(err)
}
if err := tSessVolDiscBiRPC.Call(context.Background(), utils.AdminSv1SetAccount,
accPrf4, &reply); err != nil {
t.Error(err)
} else if reply != utils.OK {
t.Error(err)
if rply != utils.OK {
t.Errorf("Unexpected reply: %s", rply)
}
}

4
sessions/sessions.go
View File

@@ -1564,7 +1564,6 @@ func (sS *SessionS) BiRPCv1AuthorizeEvent(ctx *context.Context,
nil, true, utils.NonTransactional)
}
// end of RPC caching
if !(args.GetAttributes || utils.OptAsBool(args.APIOpts, utils.OptsAttributeS) ||
args.GetMaxUsage || utils.OptAsBool(args.APIOpts, utils.OptsSesMaxUsage) ||
args.AuthorizeResources || utils.OptAsBool(args.APIOpts, utils.OptsSesResourceSAuthorize) ||
@@ -1574,7 +1573,6 @@ func (sS *SessionS) BiRPCv1AuthorizeEvent(ctx *context.Context,
if args.APIOpts == nil {
args.APIOpts = make(map[string]interface{})
}
if args.GetAttributes ||
utils.OptAsBool(args.APIOpts, utils.OptsAttributeS) {
if args.APIOpts == nil {
@@ -1592,7 +1590,6 @@ func (sS *SessionS) BiRPCv1AuthorizeEvent(ctx *context.Context,
}
}
runEvents := make(map[string]*utils.CGREvent)
if args.GetMaxUsage || // backwards compatibility
utils.OptAsBool(args.APIOpts, utils.OptsChargerS) {
var chrgrs []*engine.ChrgSProcessEventReply
@@ -1605,7 +1602,6 @@ func (sS *SessionS) BiRPCv1AuthorizeEvent(ctx *context.Context,
} else {
runEvents[utils.MetaRaw] = args.CGREvent
}
if args.GetMaxUsage || // backwards compatibility
utils.OptAsBool(args.APIOpts, utils.OptsAccountS) {
var maxAbstracts map[string]*utils.Decimal