uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-12 18:46:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Modifide supliers for supliers integration tests.

Browse Source
This commit is contained in:
Trial97
2018-11-07 18:03:35 +02:00
committed by Dan Christian Bogos
parent 1192df9843
commit dea13048df
4 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apier/v1/apier_it_test.go
View File

@@ -1300,6 +1300,18 @@ func TestApierComputeReverse(t *testing.T) {
}
}
// Make sure balance was topped-up
// Bug reported by DigiDaz over IRC
func TestApierGetAccountAfterLoad(t *testing.T) {
var reply *engine.Account
attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001"}
if err := rater.Call("ApierV2.GetAccount", attrs, &reply); err != nil {
t.Error("Got error on ApierV1.GetAccount: ", err.Error())
} else if reply.BalanceMap[utils.MONETARY].GetTotalValue() != 11 {
t.Errorf("Calling ApierV1.GetBalance expected: 11, received: %v", reply.BalanceMap[utils.MONETARY].GetTotalValue())
}
}
func TestApierResetDataAfterLoadFromFolder(t *testing.T) {
expStats := &utils.CacheStats{
Destinations: 3,
@@ -1344,18 +1356,6 @@ func TestApierResetDataAfterLoadFromFolder(t *testing.T) {
}
}
// Make sure balance was topped-up
// Bug reported by DigiDaz over IRC
func TestApierGetAccountAfterLoad(t *testing.T) {
var reply *engine.Account
attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001"}
if err := rater.Call("ApierV2.GetAccount", attrs, &reply); err != nil {
t.Error("Got error on ApierV1.GetAccount: ", err.Error())
} else if reply.BalanceMap[utils.MONETARY].GetTotalValue() != 11 {
t.Errorf("Calling ApierV1.GetBalance expected: 11, received: %f", reply.BalanceMap[utils.MONETARY].GetTotalValue())
}
}
// Test here ResponderGetCost
func TestApierResponderGetCost(t *testing.T) {
tStart, _ := utils.ParseDate("2013-08-07T17:30:00Z")

12
apier/v1/suppliers_it_test.go
View File

@@ -391,7 +391,6 @@ func testV1SplSGetHighestCostSuppliers(t *testing.T) {
} else if !reflect.DeepEqual(eSpls, suplsReply) {
t.Errorf("Expecting: %s, received: %s",
utils.ToJSON(eSpls), utils.ToJSON(suplsReply))
panic(utils.ToJSON(suplsReply))
}
}
@@ -547,7 +546,7 @@ func testV1SplSGetQOSSuppliers(t *testing.T) {
Tenant: "cgrates.org",
ID: "testV1SplSGetQOSSuppliers",
Event: map[string]interface{}{
"DistincMatch": "*qos",
"DistinctMatch": "*qos",
},
},
}
@@ -604,7 +603,7 @@ func testV1SplSGetQOSSuppliers2(t *testing.T) {
Tenant: "cgrates.org",
ID: "testV1SplSGetQOSSuppliers",
Event: map[string]interface{}{
"DistincMatch": "*qos2",
"DistinctMatch": "*qos2",
},
},
}
@@ -660,7 +659,7 @@ func testV1SplSGetQOSSuppliers3(t *testing.T) {
Tenant: "cgrates.org",
ID: "testV1SplSGetQOSSuppliers",
Event: map[string]interface{}{
"DistincMatch": "*qos3",
"DistinctMatch": "*qos3",
},
},
}
@@ -716,7 +715,7 @@ func testV1SplSGetQOSSuppliersFiltred(t *testing.T) {
Tenant: "cgrates.org",
ID: "testV1SplSGetQOSSuppliers",
Event: map[string]interface{}{
"DistincMatch": "*qos_filtred",
"DistinctMatch": "*qos_filtred",
},
},
}
@@ -763,7 +762,7 @@ func testV1SplSGetQOSSuppliersFiltred2(t *testing.T) {
Tenant: "cgrates.org",
ID: "testV1SplSGetQOSSuppliers",
Event: map[string]interface{}{
"DistincMatch": "*qos_filtred2",
"DistinctMatch": "*qos_filtred2",
utils.Account: "1003",
utils.Destination: "1002",
utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC),
@@ -804,7 +803,6 @@ func testV1SplSGetQOSSuppliersFiltred2(t *testing.T) {
} else if !reflect.DeepEqual(eSpls, suplsReply) {
t.Errorf("Expecting: %s, received: %s",
utils.ToJSON(eSpls), utils.ToJSON(suplsReply))
panic(utils.ToJSON(suplsReply))
}
}

12
data/tariffplans/testit/Filters.csv
View File

@@ -9,19 +9,19 @@ cgrates.org,FLTR_ACNT_dan,*string,Account,dan,2014-07-29T15:00:00Z
cgrates.org,FLTR_SPP_ACNT_dan,*string,*req.Account,dan,2014-07-29T15:00:00Z
cgrates.org,FLTR_SPP_2,*string,Account,1003,2014-07-29T15:00:00Z
cgrates.org,FLTR_SPP_2,*prefix,Destination,10;20,
cgrates.org,FLTR_SPP_2,*string,DistincMatch,*highest_cost,
cgrates.org,FLTR_SPP_3,*string,DistincMatch,*qos,2014-07-29T15:00:00Z
cgrates.org,FLTR_SPP_2,*string,DistinctMatch,*highest_cost,
cgrates.org,FLTR_SPP_3,*string,DistinctMatch,*qos,2014-07-29T15:00:00Z
cgrates.org,FLTR_STAT_1,*string,Account,1001,2014-07-29T15:00:00Z
cgrates.org,FLTR_STAT_2,*string,Account,1002,2014-07-29T15:00:00Z
cgrates.org,FLTR_STAT_3,*string,Account,1003,2014-07-29T15:00:00Z
cgrates.org,FLTR_SPP_4,*string,DistincMatch,*qos2,2014-07-29T15:00:00Z
cgrates.org,FLTR_SPP_5,*string,DistincMatch,*qos3,2014-07-29T15:00:00Z
cgrates.org,FLTR_SPP_4,*string,DistinctMatch,*qos2,2014-07-29T15:00:00Z
cgrates.org,FLTR_SPP_5,*string,DistinctMatch,*qos3,2014-07-29T15:00:00Z
cgrates.org,FLTR_STAT_1_1,*string,Stat,Stat1_1,2014-07-29T15:00:00Z
cgrates.org,FLTR_SPP_6,*string,DistincMatch,*qos_filtred,2014-07-29T15:00:00Z
cgrates.org,FLTR_SPP_6,*string,DistinctMatch,*qos_filtred,2014-07-29T15:00:00Z
cgrates.org,FLTR_QOS_SP1,*gte,*gs.*acd,10.0,2014-07-29T15:00:00Z
cgrates.org,FLTR_QOS_SP2,*gte,*gs.*acd,10.0,2014-07-29T15:00:00Z
cgrates.org,FLTR_QOS_SP2,*gte,*gs.*tcd,11.0,
cgrates.org,FLTR_SPP_QOS_2,*string,DistincMatch,*qos_filtred2,2014-07-29T15:00:00Z
cgrates.org,FLTR_SPP_QOS_2,*string,DistinctMatch,*qos_filtred2,2014-07-29T15:00:00Z
cgrates.org,FLTR_QOS_SP1_2,*gte,*sd.Cost,0.1,2014-07-29T15:00:00Z
cgrates.org,FLTR_QOS_SP2_2,*gte,*sd.Cost,0.2,2014-07-29T15:00:00Z
cgrates.org,FLTR_TEST,*string,Subject,TEST,2014-07-29T15:00:00Z
1 #Tenant[0] ID[1] FilterType[2] FilterFieldName[3] FilterFieldValues[4] ActivationInterval[5]
9 cgrates.org FLTR_SPP_ACNT_dan *string *req.Account dan 2014-07-29T15:00:00Z
10 cgrates.org FLTR_SPP_2 *string Account 1003 2014-07-29T15:00:00Z
11 cgrates.org FLTR_SPP_2 *prefix Destination 10;20
12 cgrates.org FLTR_SPP_2 *string DistincMatch DistinctMatch *highest_cost
13 cgrates.org FLTR_SPP_3 *string DistincMatch DistinctMatch *qos 2014-07-29T15:00:00Z
14 cgrates.org FLTR_STAT_1 *string Account 1001 2014-07-29T15:00:00Z
15 cgrates.org FLTR_STAT_2 *string Account 1002 2014-07-29T15:00:00Z
16 cgrates.org FLTR_STAT_3 *string Account 1003 2014-07-29T15:00:00Z
17 cgrates.org FLTR_SPP_4 *string DistincMatch DistinctMatch *qos2 2014-07-29T15:00:00Z
18 cgrates.org FLTR_SPP_5 *string DistincMatch DistinctMatch *qos3 2014-07-29T15:00:00Z
19 cgrates.org FLTR_STAT_1_1 *string Stat Stat1_1 2014-07-29T15:00:00Z
20 cgrates.org FLTR_SPP_6 *string DistincMatch DistinctMatch *qos_filtred 2014-07-29T15:00:00Z
21 cgrates.org FLTR_QOS_SP1 *gte *gs.*acd 10.0 2014-07-29T15:00:00Z
22 cgrates.org FLTR_QOS_SP2 *gte *gs.*acd 10.0 2014-07-29T15:00:00Z
23 cgrates.org FLTR_QOS_SP2 *gte *gs.*tcd 11.0
24 cgrates.org FLTR_SPP_QOS_2 *string DistincMatch DistinctMatch *qos_filtred2 2014-07-29T15:00:00Z
25 cgrates.org FLTR_QOS_SP1_2 *gte *sd.Cost 0.1 2014-07-29T15:00:00Z
26 cgrates.org FLTR_QOS_SP2_2 *gte *sd.Cost 0.2 2014-07-29T15:00:00Z
27 cgrates.org FLTR_TEST *string Subject TEST 2014-07-29T15:00:00Z

12
data/tariffplans/testit/Suppliers.csv
View File

@@ -8,22 +8,22 @@ cgrates.org,SPL_WEIGHT_1,FLTR_ACNT_1007,,,,supplier3,FLTR_SPP_ACNT_dan,,,,,15,,,
cgrates.org,SPL_LEASTCOST_1,FLTR_1,2017-11-27T00:00:00Z,*least_cost,,supplier1,,,RP_SPECIAL_1002,,,10,false,,10
cgrates.org,SPL_LEASTCOST_1,,,,,supplier2,,,RP_RETAIL1,,,20,,,
cgrates.org,SPL_LEASTCOST_1,,,,,supplier3,,,RP_SPECIAL_1002,,,15,,,
cgrates.org,SPL_HIGHESTCOST_1,FLTR_SPP_2,2017-11-27T00:00:00Z,*highest_cost,,supplier1,,,RP_SPECIAL_1002,,,10,false,,10
cgrates.org,SPL_HIGHESTCOST_1,FLTR_SPP_2,2017-11-27T00:00:00Z,*highest_cost,,supplier1,,,RP_SPECIAL_1002,,,10,false,,20
cgrates.org,SPL_HIGHESTCOST_1,,,,,supplier2,,,RP_RETAIL1,,,20,,,
cgrates.org,SPL_HIGHESTCOST_1,,,,,supplier3,,,RP_SPECIAL_1002,,,15,,,
cgrates.org,SPL_QOS_1,FLTR_SPP_3,2017-11-27T00:00:00Z,*qos,*acd;*tcd;*asr,supplier1,,,,,Stat_1;Stat_1_1,10,false,,10
cgrates.org,SPL_QOS_1,FLTR_SPP_3,2017-11-27T00:00:00Z,*qos,*acd;*tcd;*asr,supplier1,,,,,Stat_1;Stat_1_1,10,false,,20
cgrates.org,SPL_QOS_1,,,,,supplier2,,,,,Stat_2,20,,,
cgrates.org,SPL_QOS_1,,,,,supplier3,,,,,Stat_3,35,,,
cgrates.org,SPL_QOS_2,FLTR_SPP_4,2017-11-27T00:00:00Z,*qos,*dcc,supplier1,,,,,Stat_1;Stat_1_1,10,false,,10
cgrates.org,SPL_QOS_2,FLTR_SPP_4,2017-11-27T00:00:00Z,*qos,*dcc,supplier1,,,,,Stat_1;Stat_1_1,10,false,,20
cgrates.org,SPL_QOS_2,,,,,supplier2,,,,,Stat_2,20,,,
cgrates.org,SPL_QOS_2,,,,,supplier3,,,,,Stat_3,35,,,
cgrates.org,SPL_QOS_3,FLTR_SPP_5,2017-11-27T00:00:00Z,*qos,*pdd,supplier1,,,,,Stat_1;Stat_1_1,10,false,,10
cgrates.org,SPL_QOS_3,FLTR_SPP_5,2017-11-27T00:00:00Z,*qos,*pdd,supplier1,,,,,Stat_1;Stat_1_1,10,false,,20
cgrates.org,SPL_QOS_3,,,,,supplier2,,,,,Stat_2,20,,,
cgrates.org,SPL_QOS_3,,,,,supplier3,,,,,Stat_3,35,,,
cgrates.org,SPL_QOS_FILTRED,FLTR_SPP_6,2017-11-27T00:00:00Z,*qos,*pdd,supplier1,FLTR_QOS_SP1,,,,Stat_1;Stat_1_1,10,false,,10
cgrates.org,SPL_QOS_FILTRED,FLTR_SPP_6,2017-11-27T00:00:00Z,*qos,*pdd,supplier1,FLTR_QOS_SP1,,,,Stat_1;Stat_1_1,10,false,,20
cgrates.org,SPL_QOS_FILTRED,,,,,supplier2,FLTR_QOS_SP2,,,,Stat_2,20,,,
cgrates.org,SPL_QOS_FILTRED,,,,,supplier3,,,,,Stat_3,35,,,
cgrates.org,SPL_QOS_FILTRED2,FLTR_SPP_QOS_2,2017-11-27T00:00:00Z,*qos,*acd;*tcd;*asr,supplier1,FLTR_QOS_SP1_2,,RP_SPECIAL_1002,,Stat_1;Stat_1_1,10,false,,10
cgrates.org,SPL_QOS_FILTRED2,FLTR_SPP_QOS_2,2017-11-27T00:00:00Z,*qos,*acd;*tcd;*asr,supplier1,FLTR_QOS_SP1_2,,RP_SPECIAL_1002,,Stat_1;Stat_1_1,10,false,,20
cgrates.org,SPL_QOS_FILTRED2,,,,,supplier2,FLTR_QOS_SP2_2,,RP_RETAIL1,,Stat_2,20,,,
cgrates.org,SPL_QOS_FILTRED2,,,,,supplier3,,,,,Stat_3,35,,,
cgrates.org,SPL_LCR,FLTR_TEST,2017-11-27T00:00:00Z,*least_cost,,supplier_1,,,RP_TEST_1,,,10,,,50
1 #Tenant ID FilterIDs ActivationInterval Sorting SortingParameters SupplierID SupplierFilterIDs SupplierAccountIDs SupplierRatingPlanIDs SupplierResourceIDs SupplierStatIDs SupplierWeight SupplierBlocker SupplierParameters Weight
8 cgrates.org SPL_LEASTCOST_1 FLTR_1 2017-11-27T00:00:00Z *least_cost supplier1 RP_SPECIAL_1002 10 false 10
9 cgrates.org SPL_LEASTCOST_1 supplier2 RP_RETAIL1 20
10 cgrates.org SPL_LEASTCOST_1 supplier3 RP_SPECIAL_1002 15
11 cgrates.org SPL_HIGHESTCOST_1 FLTR_SPP_2 2017-11-27T00:00:00Z *highest_cost supplier1 RP_SPECIAL_1002 10 false 10 20
12 cgrates.org SPL_HIGHESTCOST_1 supplier2 RP_RETAIL1 20
13 cgrates.org SPL_HIGHESTCOST_1 supplier3 RP_SPECIAL_1002 15
14 cgrates.org SPL_QOS_1 FLTR_SPP_3 2017-11-27T00:00:00Z *qos *acd;*tcd;*asr supplier1 Stat_1;Stat_1_1 10 false 10 20
15 cgrates.org SPL_QOS_1 supplier2 Stat_2 20
16 cgrates.org SPL_QOS_1 supplier3 Stat_3 35
17 cgrates.org SPL_QOS_2 FLTR_SPP_4 2017-11-27T00:00:00Z *qos *dcc supplier1 Stat_1;Stat_1_1 10 false 10 20
18 cgrates.org SPL_QOS_2 supplier2 Stat_2 20
19 cgrates.org SPL_QOS_2 supplier3 Stat_3 35
20 cgrates.org SPL_QOS_3 FLTR_SPP_5 2017-11-27T00:00:00Z *qos *pdd supplier1 Stat_1;Stat_1_1 10 false 10 20
21 cgrates.org SPL_QOS_3 supplier2 Stat_2 20
22 cgrates.org SPL_QOS_3 supplier3 Stat_3 35
23 cgrates.org SPL_QOS_FILTRED FLTR_SPP_6 2017-11-27T00:00:00Z *qos *pdd supplier1 FLTR_QOS_SP1 Stat_1;Stat_1_1 10 false 10 20
24 cgrates.org SPL_QOS_FILTRED supplier2 FLTR_QOS_SP2 Stat_2 20
25 cgrates.org SPL_QOS_FILTRED supplier3 Stat_3 35
26 cgrates.org SPL_QOS_FILTRED2 FLTR_SPP_QOS_2 2017-11-27T00:00:00Z *qos *acd;*tcd;*asr supplier1 FLTR_QOS_SP1_2 RP_SPECIAL_1002 Stat_1;Stat_1_1 10 false 10 20
27 cgrates.org SPL_QOS_FILTRED2 supplier2 FLTR_QOS_SP2_2 RP_RETAIL1 Stat_2 20
28 cgrates.org SPL_QOS_FILTRED2 supplier3 Stat_3 35
29 cgrates.org SPL_LCR FLTR_TEST 2017-11-27T00:00:00Z *least_cost supplier_1 RP_TEST_1 10 50