diff --git a/data/tariffplans/oldtutorial/Routes.csv b/data/tariffplans/oldtutorial/Routes.csv index 57db06794..0b52afdd4 100644 --- a/data/tariffplans/oldtutorial/Routes.csv +++ b/data/tariffplans/oldtutorial/Routes.csv @@ -1,8 +1,8 @@ #Tenant,ID,FilterIDs,ActivationInterval,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRatingPlanIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters,Weight -cgrates.org,SPL_WEIGHT_2,,2017-11-27T00:00:00Z,*weight,,supplier1,,,,,,10,,,5 -cgrates.org,SPL_WEIGHT_1,FLTR_DST_DE;FLTR_ACNT_1007,2017-11-27T00:00:00Z,*weight,,supplier1,,,,,,10,,,10 -cgrates.org,SPL_WEIGHT_1,FLTR_DST_DE,,,,supplier2,,,,,,20,,, -cgrates.org,SPL_WEIGHT_1,FLTR_ACNT_1007,,,,supplier3,FLTR_ACNT_dan,,,,,15,,, -cgrates.org,SPL_LEASTCOST_1,FLTR_1,2017-11-27T00:00:00Z,*lc,,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,ROUTE_WEIGHT_2,,2017-11-27T00:00:00Z,*weight,,route1,,,,,,10,,,5 +cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE;FLTR_ACNT_1007,2017-11-27T00:00:00Z,*weight,,route1,,,,,,10,,,10 +cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE,,,,route2,,,,,,20,,, +cgrates.org,ROUTE_WEIGHT_1,FLTR_ACNT_1007,,,,route3,FLTR_ACNT_dan,,,,,15,,, +cgrates.org,ROUTE_LEASTCOST_1,FLTR_1,2017-11-27T00:00:00Z,*lc,,route1,,,RP_SPECIAL_1002,,,10,false,,10 +cgrates.org,ROUTE_LEASTCOST_1,,,,,route2,,,RP_RETAIL1,,,20,,, +cgrates.org,ROUTE_LEASTCOST_1,,,,,route3,,,RP_SPECIAL_1002,,,15,,, diff --git a/dispatchers/routes_it_test.go b/dispatchers/routes_it_test.go index 13c73ee6f..6a554ebd9 100755 --- a/dispatchers/routes_it_test.go +++ b/dispatchers/routes_it_test.go @@ -126,12 +126,12 @@ func testDspSupPingFailover(t *testing.T) { func testDspSupGetSupFailover(t *testing.T) { var rpl *engine.SortedRoutes eRpl1 := &engine.SortedRoutes{ - ProfileID: "SPL_WEIGHT_2", + ProfileID: "ROUTE_WEIGHT_2", Sorting: utils.MetaWeight, Count: 1, SortedRoutes: []*engine.SortedRoute{ { - RouteID: "supplier1", + RouteID: "route1", RouteParameters: "", SortingData: map[string]interface{}{ utils.Weight: 10.0, @@ -283,12 +283,12 @@ func testDspSupTestAuthKey2(t *testing.T) { func testDspSupGetSupRoundRobin(t *testing.T) { var rpl *engine.SortedRoutes eRpl1 := &engine.SortedRoutes{ - ProfileID: "SPL_WEIGHT_2", + ProfileID: "ROUTE_WEIGHT_2", Sorting: utils.MetaWeight, Count: 1, SortedRoutes: []*engine.SortedRoute{ { - RouteID: "supplier1", + RouteID: "route1", RouteParameters: "", SortingData: map[string]interface{}{ utils.Weight: 10.0,