diff --git a/data/tariffplans/dispatchers_gob/Attributes.csv b/data/tariffplans/dispatchers_gob/Attributes.csv index 304a8b24d..b5ef19458 100644 --- a/data/tariffplans/dispatchers_gob/Attributes.csv +++ b/data/tariffplans/dispatchers_gob/Attributes.csv @@ -20,7 +20,7 @@ cgrates.org,ATTR_API_PSE_AUTH,*auth,*string:~*req.ApiKey:pse12345,20,,*req.APIMe cgrates.org,ATTR_API_CFG_AUTH,*auth,*string:~*req.ApiKey:cfg12345,20,,*req.APIMethods,*constant,ConfigSv1.GetConfig&ConfigSv1.ReloadConfig,false cgrates.org,ATTR_API_APIER_AUTH,*auth,*string:~*req.ApiKey:apier12345,20,,*req.APIMethods,*constant,APIerSv1.GetAttributeProfile&APIerSv1.SetAttributeProfile,false cgrates.org,ATTR_API_RALS_AUTH,*auth,*string:~*req.ApiKey:rals12345,20,,*req.APIMethods,*constant,RALsV1.Ping&RALsV1.GetRatingPlansCost,false -cgrates.org,ATTR_API_REPLICATOR_AUTH,*auth,*string:~*req.ApiKey:repl12345,20,,*req.APIMethods,*constant,ReplicatorSv1.Ping&ReplicatorSv1.GetAccount&ReplicatorSv1.SetAccount&ReplicatorSv1.RemoveAccount&ReplicatorSv1.GetRouteProfile&ReplicatorSv1.SetRouteProfile&ReplicatorSv1.RemoveRouteProfile&ReplicatorSv1.GetAttributeProfile&ReplicatorSv1.SetAttributeProfile&ReplicatorSv1.RemoveAttributeProfile&ReplicatorSv1.SetChargerProfile&ReplicatorSv1.GetChargerProfile&ReplicatorSv1.RemoveChargerProfile&ReplicatorSv1.GetDispatcherProfile&ReplicatorSv1.SetDispatcherProfile&ReplicatorSv1.RemoveDispatcherProfile&ReplicatorSv1.GetDispatcherHost&ReplicatorSv1.SetDispatcherHost&ReplicatorSv1.RemoveDispatcherHost&ReplicatorSv1.GetFilter&ReplicatorSv1.SetFilter&ReplicatorSv1.RemoveFilter&ReplicatorSv1.GetThreshold&ReplicatorSv1.SetThreshold&ReplicatorSv1.RemoveThreshold&ReplicatorSv1.GetStatQueue&ReplicatorSv1.SetStatQueue&ReplicatorSv1.RemoveStatQueue&ReplicatorSv1.GetResource&ReplicatorSv1.SetResource&ReplicatorSv1.RemoveResource&ReplicatorSv1.GetResourceProfile&ReplicatorSv1.SetResourceProfile&ReplicatorSv1.RemoveResourceProfile&ReplicatorSv1.GetStatQueueProfile&ReplicatorSv1.SetStatQueueProfile&ReplicatorSv1.RemoveStatQueueProfile&ReplicatorSv1.GetThresholdProfile&ReplicatorSv1.SetThresholdProfile&ReplicatorSv1.RemoveThresholdProfile&ReplicatorSv1.GetTiming&ReplicatorSv1.SetTiming&ReplicatorSv1.RemoveTiming&ReplicatorSv1.GetActionTriggers&ReplicatorSv1.SetActionTriggers&ReplicatorSv1.RemoveActionTriggers&ReplicatorSv1.SetSharedGroup&ReplicatorSv1.GetSharedGroup&ReplicatorSv1.RemoveSharedGroup&ReplicatorSv1.SetActions&ReplicatorSv1.GetActions&ReplicatorSv1.RemoveActions&ReplicatorSv1.SetActionPlan&ReplicatorSv1.GetActionPlan&ReplicatorSv1.RemoveActionPlan&ReplicatorSv1.SetAccountActionPlans&ReplicatorSv1.GetAccountActionPlans&ReplicatorSv1.RemAccountActionPlans&ReplicatorSv1.SetRatingPlan&ReplicatorSv1.GetRatingPlan&ReplicatorSv1.RemoveRatingPlan&ReplicatorSv1.SetRatingProfile&ReplicatorSv1.GetRatingProfile&ReplicatorSv1.RemoveRatingProfile&ReplicatorSv1.SetDestination&ReplicatorSv1.GetDestination&ReplicatorSv1.RemoveDestination&ReplicatorSv1.SetLoadIDs&ReplicatorSv1.GetItemLoadIDs&ReplicatorSv1.SetRateProfile&ReplicatorSv1.GetRateProfile&ReplicatorSv1.RemoveRateProfile,false +cgrates.org,ATTR_API_REPLICATOR_AUTH,*auth,*string:~*req.ApiKey:repl12345,20,,*req.APIMethods,*constant,ReplicatorSv1.Ping&ReplicatorSv1.GetAccount&ReplicatorSv1.SetAccount&ReplicatorSv1.RemoveAccount&ReplicatorSv1.GetRouteProfile&ReplicatorSv1.SetRouteProfile&ReplicatorSv1.RemoveRouteProfile&ReplicatorSv1.GetAttributeProfile&ReplicatorSv1.SetAttributeProfile&ReplicatorSv1.RemoveAttributeProfile&ReplicatorSv1.SetChargerProfile&ReplicatorSv1.GetChargerProfile&ReplicatorSv1.RemoveChargerProfile&ReplicatorSv1.GetDispatcherProfile&ReplicatorSv1.SetDispatcherProfile&ReplicatorSv1.RemoveDispatcherProfile&ReplicatorSv1.GetDispatcherHost&ReplicatorSv1.SetDispatcherHost&ReplicatorSv1.RemoveDispatcherHost&ReplicatorSv1.GetFilter&ReplicatorSv1.SetFilter&ReplicatorSv1.RemoveFilter&ReplicatorSv1.GetThreshold&ReplicatorSv1.SetThreshold&ReplicatorSv1.RemoveThreshold&ReplicatorSv1.GetStatQueue&ReplicatorSv1.SetStatQueue&ReplicatorSv1.RemoveStatQueue&ReplicatorSv1.GetResource&ReplicatorSv1.SetResource&ReplicatorSv1.RemoveResource&ReplicatorSv1.GetResourceProfile&ReplicatorSv1.SetResourceProfile&ReplicatorSv1.RemoveResourceProfile&ReplicatorSv1.GetStatQueueProfile&ReplicatorSv1.SetStatQueueProfile&ReplicatorSv1.RemoveStatQueueProfile&ReplicatorSv1.GetThresholdProfile&ReplicatorSv1.SetThresholdProfile&ReplicatorSv1.RemoveThresholdProfile&ReplicatorSv1.GetTiming&ReplicatorSv1.SetTiming&ReplicatorSv1.RemoveTiming&ReplicatorSv1.GetActionTriggers&ReplicatorSv1.SetActionTriggers&ReplicatorSv1.RemoveActionTriggers&ReplicatorSv1.SetSharedGroup&ReplicatorSv1.GetSharedGroup&ReplicatorSv1.RemoveSharedGroup&ReplicatorSv1.SetActions&ReplicatorSv1.GetActions&ReplicatorSv1.RemoveActions&ReplicatorSv1.SetActionPlan&ReplicatorSv1.GetActionPlan&ReplicatorSv1.RemoveActionPlan&ReplicatorSv1.SetAccountActionPlans&ReplicatorSv1.GetAccountActionPlans&ReplicatorSv1.RemAccountActionPlans&ReplicatorSv1.SetRatingPlan&ReplicatorSv1.GetRatingPlan&ReplicatorSv1.RemoveRatingPlan&ReplicatorSv1.SetRatingProfile&ReplicatorSv1.GetRatingProfile&ReplicatorSv1.RemoveRatingProfile&ReplicatorSv1.SetLoadIDs&ReplicatorSv1.GetItemLoadIDs&ReplicatorSv1.SetRateProfile&ReplicatorSv1.GetRateProfile&ReplicatorSv1.RemoveRateProfile,false cgrates.org,ATTR_API_CDRSV2,*auth,*string:~*req.ApiKey:cdrsv212345,20,,*req.APIMethods,*constant,CDRsV2.ProcessEvent&CDRsV2.StoreSessionCost,false cgrates.org,ATTR_API_RATES_AUTH,*auth,*string:~*req.ApiKey:rPrf12345,20,,*req.APIMethods,*constant,RateSv1.Ping,false cgrates.org,ATTR_API_CORE_AUTH,*auth,*string:~*req.ApiKey:core12345,20,,*req.APIMethods,*constant,CoreSv1.Status&CoreSv1.Ping&CoreSv1.Sleep,false diff --git a/data/tariffplans/osips_training/AccountActions.csv b/data/tariffplans/osips_training/AccountActions.csv deleted file mode 100644 index ae1d42032..000000000 --- a/data/tariffplans/osips_training/AccountActions.csv +++ /dev/null @@ -1,6 +0,0 @@ -#Tenant,Account,ActionPlanId,ActionTriggersId,AllowNegative,Disabled -cgrates.org,101,TEST_ACCOUNT,TEST_THRESHOLDS,, -cgrates.org,102,TEST_ACCOUNT,TEST_THRESHOLDS,, -cgrates.org,103,TEST_ACCOUNT,TEST_THRESHOLDS,, -cgrates.org,104,TEST_ACCOUNT,TEST_THRESHOLDS,, -cgrates.org,105,TEST_ACCOUNT,TEST_THRESHOLDS,, diff --git a/data/tariffplans/osips_training/ActionPlans.csv b/data/tariffplans/osips_training/ActionPlans.csv deleted file mode 100644 index aebdcd1bc..000000000 --- a/data/tariffplans/osips_training/ActionPlans.csv +++ /dev/null @@ -1,3 +0,0 @@ -#Id,ActionsId,TimingId,Weight -TEST_ACCOUNT,TOPUP_MONETARY_5,*asap,10 -TEST_ACCOUNT,TOPUP_VOICE_200,*asap,10 diff --git a/data/tariffplans/osips_training/ActionTriggers.csv b/data/tariffplans/osips_training/ActionTriggers.csv deleted file mode 100644 index 0e75af524..000000000 --- a/data/tariffplans/osips_training/ActionTriggers.csv +++ /dev/null @@ -1,3 +0,0 @@ -#Tag[0],UniqueId[1],ThresholdType[2],ThresholdValue[3],Recurrent[4],MinSleep[5],ExpiryTime[6],ActivationTime[7],BalanceTag[8],BalanceType[9],BalanceCategories[10],BalanceDestinationIds[11],BalanceRatingSubject[12],BalanceSharedGroup[13],BalanceExpiryTime[14],BalanceTimingIds[15],BalanceWeight[16],BalanceBlocker[17],BalanceDisabled[18],ActionsId[19],Weight[20] -TEST_THRESHOLDS,,*min_balance,2,false,0,,,,*monetary,,,,,,,,,,LOG_WARNING,10 -TEST_THRESHOLDS,,*max_balance,20,false,0,,,,*monetary,,,,,,,,,,LOG_WARNING,10 diff --git a/data/tariffplans/osips_training/Actions.csv b/data/tariffplans/osips_training/Actions.csv deleted file mode 100644 index 725fa994c..000000000 --- a/data/tariffplans/osips_training/Actions.csv +++ /dev/null @@ -1,4 +0,0 @@ -#ActionsId[0],Action[1],ExtraParameters[2],Filter[3],BalanceId[4],BalanceType[5],Categories[6],DestinationIds[7],RatingSubject[8],SharedGroup[9],ExpiryTime[10],TimingIds[11],Units[12],BalanceWeight[13],BalanceBlocker[14],BalanceDisabled[15],Weight[16] -TOPUP_MONETARY_5,*topup_reset,,,,*monetary,,*any,,,*unlimited,,10,10,false,false,10 -TOPUP_VOICE_200,*topup_reset,,,,*voice,,DST_ON_NET,,,*unlimited,,12000,20,false,false,10 -LOG_WARNING,*log,,,,,,,,,,,,,false,false,10 diff --git a/data/tariffplans/osips_training/DestinationRates.csv b/data/tariffplans/osips_training/DestinationRates.csv deleted file mode 100644 index ef3a20677..000000000 --- a/data/tariffplans/osips_training/DestinationRates.csv +++ /dev/null @@ -1,2 +0,0 @@ -#Id,DestinationId,RatesTag,RoundingMethod,RoundingDecimals,MaxCost,MaxCostStrategy -DR_ANY_1CNT,*any,RT_1CNT,*up,4,0, \ No newline at end of file diff --git a/data/tariffplans/osips_training/Destinations.csv b/data/tariffplans/osips_training/Destinations.csv deleted file mode 100644 index c41538425..000000000 --- a/data/tariffplans/osips_training/Destinations.csv +++ /dev/null @@ -1,3 +0,0 @@ -#Id,Prefix -DST_ON_NET,10 - diff --git a/data/tariffplans/osips_training/README.md b/data/tariffplans/osips_training/README.md deleted file mode 100644 index f9d63dc17..000000000 --- a/data/tariffplans/osips_training/README.md +++ /dev/null @@ -1,24 +0,0 @@ -OpenSIPS-CGRateS integration training -===================================== - -Scenario: ---------- - -- Simple rating scenario: any destination dialed will be charged with a setup fee of 5 cents and 1 cent per second in 1 minute increment for the first minute then in second increments. - - Cost simulation can be achieved via cost command: cgr-console 'cost Category="call" Tenant="cgrates.org" Subject="101" Destination="+4986517174963" TimeStart="2016-08-03T13:00:00Z" TimeEnd="2016-08-03T13:01:02Z"' - -- Create 5 accounts (101, 102, 103, 104, 105). - - - Each account will receive 2 balances: - - One *voice with 200 minutes on-net (destinations starting with 10 prefix) - - One *monetary balance with 5 EUR/USD without destination limits - - - For each account we will set up 2 account triggers: one monitoring minimum balance (2 in our case) and second monitoring fraud (maximum balance) with threshold being set to 20. On thresholds being hit there will be a syslog warning - - - Account checks possible via account command: cgr-console 'accounts Tenant="cgrates.org" AccountIds=["101"]' - -- Create one CDRStatS queue building up ASR, ACD, ACC, TCD, TCC metrics and having action triggers monitoring minimum asr of 35% - again with syslog as warning. -- CDRStatS queue metrics possible via console command: cgr-console 'cdrstats_metrics StatsQueueId="STATS_TEST"' - - - diff --git a/data/tariffplans/osips_training/Rates.csv b/data/tariffplans/osips_training/Rates.csv deleted file mode 100644 index 42c2d1ada..000000000 --- a/data/tariffplans/osips_training/Rates.csv +++ /dev/null @@ -1,3 +0,0 @@ -#Id,ConnectFee,Rate,RateUnit,RateIncrement,GroupIntervalStart -RT_1CNT,0.05,0.01,1s,60s,0s -RT_1CNT,0,0.01,1s,1s,60s diff --git a/data/tariffplans/osips_training/RatingPlans.csv b/data/tariffplans/osips_training/RatingPlans.csv deleted file mode 100644 index 17795dab9..000000000 --- a/data/tariffplans/osips_training/RatingPlans.csv +++ /dev/null @@ -1,2 +0,0 @@ -#Id,DestinationRatesId,TimingTag,Weight -RP_TRAINING1,DR_ANY_1CNT,*any,10 \ No newline at end of file diff --git a/data/tariffplans/osips_training/RatingProfiles.csv b/data/tariffplans/osips_training/RatingProfiles.csv deleted file mode 100644 index 6a35e2cfc..000000000 --- a/data/tariffplans/osips_training/RatingProfiles.csv +++ /dev/null @@ -1,2 +0,0 @@ -#Tenant,Category,Subject,ActivationTime,RatingPlanId,RatesFallbackSubject -cgrates.org,call,*any,2016-08-01T00:00:00Z,RP_TRAINING1, diff --git a/data/tariffplans/test/a1/ActionPlans.csv b/data/tariffplans/test/a1/ActionPlans.csv deleted file mode 100644 index a852fa4de..000000000 --- a/data/tariffplans/test/a1/ActionPlans.csv +++ /dev/null @@ -1,4 +0,0 @@ -#Id,ActionsId,TimingId,Weight -PACKAGE_1,LOG,*asap,10 -PACKAGE_1,LOG,FIRST_OF_YEAR_2020,10 -PACKAGE_2,LOG,FIRST_OF_YEAR_2020,10 diff --git a/data/tariffplans/test/a1/Actions.csv b/data/tariffplans/test/a1/Actions.csv deleted file mode 100644 index 4a87c06df..000000000 --- a/data/tariffplans/test/a1/Actions.csv +++ /dev/null @@ -1,2 +0,0 @@ -#ActionsId[0],Action[1],ExtraParameters[2],Filter[3],BalanceId[4],BalanceType[5],Categories[6],DestinationIds[7],RatingSubject[8],SharedGroup[9],ExpiryTime[10],TimingIds[11],Units[12],BalanceWeight[13],BalanceBlocker[14],BalanceDisabled[15],Weight[16] -LOG,*log,,,,,,,,,,,,,false,false,10 diff --git a/data/tariffplans/test/a1/DestinationRates.csv b/data/tariffplans/test/a1/DestinationRates.csv deleted file mode 100644 index 1e64ecac3..000000000 --- a/data/tariffplans/test/a1/DestinationRates.csv +++ /dev/null @@ -1,2 +0,0 @@ -#Id,DestinationId,RatesTag,RoundingMethod,RoundingDecimals,MaxCost,MaxCostStrategy -DR_DATA1,*any,RT_DATA1,*up,5,, diff --git a/data/tariffplans/test/a1/Rates.csv b/data/tariffplans/test/a1/Rates.csv deleted file mode 100644 index c4fbab57e..000000000 --- a/data/tariffplans/test/a1/Rates.csv +++ /dev/null @@ -1,2 +0,0 @@ -#Id,ConnectFee,Rate,RateUnit,RateIncrement,GroupIntervalStart -RT_DATA1,0,0.0,1048576,10240,0 diff --git a/data/tariffplans/test/a1/RatingPlans.csv b/data/tariffplans/test/a1/RatingPlans.csv deleted file mode 100644 index 34f413c1f..000000000 --- a/data/tariffplans/test/a1/RatingPlans.csv +++ /dev/null @@ -1,2 +0,0 @@ -#Id,DestinationRatesId,TimingTag,Weight -RP_DATA1,DR_DATA1,*any,10 diff --git a/data/tariffplans/test/a1/RatingProfiles.csv b/data/tariffplans/test/a1/RatingProfiles.csv deleted file mode 100644 index 870263b11..000000000 --- a/data/tariffplans/test/a1/RatingProfiles.csv +++ /dev/null @@ -1,2 +0,0 @@ -#Tenant,Category,Subject,ActivationTime,RatingPlanId,RatesFallbackSubject -cgrates.org,data1,rpdata1,2015-01-01T00:00:00Z,RP_DATA1, diff --git a/data/tariffplans/test/a1/Timings.csv b/data/tariffplans/test/a1/Timings.csv deleted file mode 100644 index 745a8cb9d..000000000 --- a/data/tariffplans/test/a1/Timings.csv +++ /dev/null @@ -1,2 +0,0 @@ -#Tag,Years,Months,MonthDays,WeekDays,Time -FIRST_OF_YEAR_2020,2020,1,1,*any,00:00:00 diff --git a/data/tariffplans/test/destinations/addback/Destinations.csv b/data/tariffplans/test/destinations/addback/Destinations.csv deleted file mode 100644 index 712524759..000000000 --- a/data/tariffplans/test/destinations/addback/Destinations.csv +++ /dev/null @@ -1,13 +0,0 @@ -#Tag,Prefix -GERMANY,+49 -GERMANY_MOBILE,+4915 -GERMANY_MOBILE,+4916 -GERMANY_MOBILE,+4917 -DATA_DEST,222 -ROMANIA,+40 -ROMANIA_MOBILE,+4072 -ROMANIA_MOBILE,+4073 -ROMANIA_MOBILE,+4074 -ROMANIA_MOBILE,+4072 -EUROPE,+40 -EUROPE,+49 diff --git a/data/tariffplans/test/destinations/addone/Destinations.csv b/data/tariffplans/test/destinations/addone/Destinations.csv deleted file mode 100644 index de96fe5b3..000000000 --- a/data/tariffplans/test/destinations/addone/Destinations.csv +++ /dev/null @@ -1,15 +0,0 @@ -#Tag,Prefix -GERMANY,+49 -GERMANY_MOBILE,+4915 -GERMANY_MOBILE,+4916 -GERMANY_MOBILE,+4917 -DATA_DEST,222 -ROMANIA,+40 -ROMANIA_MOBILE,+4072 -ROMANIA_MOBILE,+4073 -ROMANIA_MOBILE,+4074 -ROMANIA_MOBILE,+4072 -HUNGARY,+36 -EUROPE,+40 -EUROPE,+49 -EUROPE,+36 diff --git a/data/tariffplans/test/destinations/alldests/Destinations.csv b/data/tariffplans/test/destinations/alldests/Destinations.csv deleted file mode 100644 index 712524759..000000000 --- a/data/tariffplans/test/destinations/alldests/Destinations.csv +++ /dev/null @@ -1,13 +0,0 @@ -#Tag,Prefix -GERMANY,+49 -GERMANY_MOBILE,+4915 -GERMANY_MOBILE,+4916 -GERMANY_MOBILE,+4917 -DATA_DEST,222 -ROMANIA,+40 -ROMANIA_MOBILE,+4072 -ROMANIA_MOBILE,+4073 -ROMANIA_MOBILE,+4074 -ROMANIA_MOBILE,+4072 -EUROPE,+40 -EUROPE,+49 diff --git a/data/tariffplans/test/destinations/cacheall/DestinationRates.csv b/data/tariffplans/test/destinations/cacheall/DestinationRates.csv deleted file mode 100644 index fd1eb6c7a..000000000 --- a/data/tariffplans/test/destinations/cacheall/DestinationRates.csv +++ /dev/null @@ -1 +0,0 @@ -DR_100x,DST_100x,R_100x,*up,4,0, diff --git a/data/tariffplans/test/destinations/cacheall/Destinations.csv b/data/tariffplans/test/destinations/cacheall/Destinations.csv deleted file mode 100644 index fb72bddbf..000000000 --- a/data/tariffplans/test/destinations/cacheall/Destinations.csv +++ /dev/null @@ -1,2 +0,0 @@ -DST_100x,1001 -DST_100x,1002 \ No newline at end of file diff --git a/data/tariffplans/test/destinations/cacheall/Rates.csv b/data/tariffplans/test/destinations/cacheall/Rates.csv deleted file mode 100644 index 4dd524064..000000000 --- a/data/tariffplans/test/destinations/cacheall/Rates.csv +++ /dev/null @@ -1 +0,0 @@ -R_100x,0,10,60s,1s,0s diff --git a/data/tariffplans/test/destinations/cacheall/RatingPlans.csv b/data/tariffplans/test/destinations/cacheall/RatingPlans.csv deleted file mode 100644 index e0047fef0..000000000 --- a/data/tariffplans/test/destinations/cacheall/RatingPlans.csv +++ /dev/null @@ -1 +0,0 @@ -RPL_100x,DR_100x,always,10 diff --git a/data/tariffplans/test/destinations/cacheall/RatingProfiles.csv b/data/tariffplans/test/destinations/cacheall/RatingProfiles.csv deleted file mode 100644 index 6cb45eae9..000000000 --- a/data/tariffplans/test/destinations/cacheall/RatingProfiles.csv +++ /dev/null @@ -1,2 +0,0 @@ -#Tenant,Category,Subject,ActivationTime,RatingPlanId,RatesFallbackSubject -cgrates.org,call,test,2014-01-14T00:00:00Z,RPL_100x, diff --git a/data/tariffplans/test/destinations/cacheall/Timings.csv b/data/tariffplans/test/destinations/cacheall/Timings.csv deleted file mode 100644 index 671732122..000000000 --- a/data/tariffplans/test/destinations/cacheall/Timings.csv +++ /dev/null @@ -1 +0,0 @@ -always,*any,*any,*any,*any,00:00:00 diff --git a/data/tariffplans/test/destinations/cacheone/DestinationRates.csv b/data/tariffplans/test/destinations/cacheone/DestinationRates.csv deleted file mode 100644 index fd1eb6c7a..000000000 --- a/data/tariffplans/test/destinations/cacheone/DestinationRates.csv +++ /dev/null @@ -1 +0,0 @@ -DR_100x,DST_100x,R_100x,*up,4,0, diff --git a/data/tariffplans/test/destinations/cacheone/Destinations.csv b/data/tariffplans/test/destinations/cacheone/Destinations.csv deleted file mode 100644 index 5ac310bdc..000000000 --- a/data/tariffplans/test/destinations/cacheone/Destinations.csv +++ /dev/null @@ -1 +0,0 @@ -DST_100x,1001 diff --git a/data/tariffplans/test/destinations/cacheone/Rates.csv b/data/tariffplans/test/destinations/cacheone/Rates.csv deleted file mode 100644 index 4dd524064..000000000 --- a/data/tariffplans/test/destinations/cacheone/Rates.csv +++ /dev/null @@ -1 +0,0 @@ -R_100x,0,10,60s,1s,0s diff --git a/data/tariffplans/test/destinations/cacheone/RatingPlans.csv b/data/tariffplans/test/destinations/cacheone/RatingPlans.csv deleted file mode 100644 index e0047fef0..000000000 --- a/data/tariffplans/test/destinations/cacheone/RatingPlans.csv +++ /dev/null @@ -1 +0,0 @@ -RPL_100x,DR_100x,always,10 diff --git a/data/tariffplans/test/destinations/cacheone/RatingProfiles.csv b/data/tariffplans/test/destinations/cacheone/RatingProfiles.csv deleted file mode 100644 index 6cb45eae9..000000000 --- a/data/tariffplans/test/destinations/cacheone/RatingProfiles.csv +++ /dev/null @@ -1,2 +0,0 @@ -#Tenant,Category,Subject,ActivationTime,RatingPlanId,RatesFallbackSubject -cgrates.org,call,test,2014-01-14T00:00:00Z,RPL_100x, diff --git a/data/tariffplans/test/destinations/cacheone/Timings.csv b/data/tariffplans/test/destinations/cacheone/Timings.csv deleted file mode 100644 index 671732122..000000000 --- a/data/tariffplans/test/destinations/cacheone/Timings.csv +++ /dev/null @@ -1 +0,0 @@ -always,*any,*any,*any,*any,00:00:00 diff --git a/data/tariffplans/test/destinations/multiid/DestinationRates.csv b/data/tariffplans/test/destinations/multiid/DestinationRates.csv deleted file mode 100644 index b5d98941e..000000000 --- a/data/tariffplans/test/destinations/multiid/DestinationRates.csv +++ /dev/null @@ -1,4 +0,0 @@ -#Tag,DestinationsTag,RatesTag,RoundingMethod,RoundingDecimals,MaxCost,MaxCostStrategy -DR_RETAIL,GERMANY,RT_1CENT,*up,4,0, -DR_SMS_1,EUROPE,RT_SMS_5c,*up,4,0, - diff --git a/data/tariffplans/test/destinations/multiid/Destinations.csv b/data/tariffplans/test/destinations/multiid/Destinations.csv deleted file mode 100644 index 3bc073d07..000000000 --- a/data/tariffplans/test/destinations/multiid/Destinations.csv +++ /dev/null @@ -1,4 +0,0 @@ -#Tag,Prefix -GERMANY,+49 -EUROPE,+40 -EUROPE,+49 diff --git a/data/tariffplans/test/destinations/multiid/Rates.csv b/data/tariffplans/test/destinations/multiid/Rates.csv deleted file mode 100644 index fe4ee0664..000000000 --- a/data/tariffplans/test/destinations/multiid/Rates.csv +++ /dev/null @@ -1,3 +0,0 @@ -#Tag,ConnectFee,Rate,RateUnit,RateIncrement,GroupIntervalStart -RT_1CENT,0,1,1s,1s,0s -RT_SMS_5c,0,0.005,1,1,0 diff --git a/data/tariffplans/test/destinations/multiid/RatingPlans.csv b/data/tariffplans/test/destinations/multiid/RatingPlans.csv deleted file mode 100644 index 73b20244d..000000000 --- a/data/tariffplans/test/destinations/multiid/RatingPlans.csv +++ /dev/null @@ -1,3 +0,0 @@ -#Tag,DestinationRatesTag,TimingTag,Weight -RP_RETAIL,DR_RETAIL,ALWAYS,20 -RP_RETAIL,DR_SMS_1,ALWAYS,10 diff --git a/data/tariffplans/test/destinations/multiid/RatingProfiles.csv b/data/tariffplans/test/destinations/multiid/RatingProfiles.csv deleted file mode 100644 index 5ed82b7c6..000000000 --- a/data/tariffplans/test/destinations/multiid/RatingProfiles.csv +++ /dev/null @@ -1,2 +0,0 @@ -#Tenant,Category,Subject,ActivationTime,RatingPlanId,RatesFallbackSubject -cgrates.org,call,*any,2012-01-01T00:00:00Z,RP_RETAIL, \ No newline at end of file diff --git a/data/tariffplans/test/destinations/multiid/Timings.csv b/data/tariffplans/test/destinations/multiid/Timings.csv deleted file mode 100644 index 775f347c0..000000000 --- a/data/tariffplans/test/destinations/multiid/Timings.csv +++ /dev/null @@ -1,2 +0,0 @@ -#Tag,Years,Months,MonthDays,WeekDays,Time -ALWAYS,*any,*any,*any,*any,00:00:00 \ No newline at end of file diff --git a/data/tariffplans/test/destinations/removesome/Destinations.csv b/data/tariffplans/test/destinations/removesome/Destinations.csv deleted file mode 100644 index 3d333a794..000000000 --- a/data/tariffplans/test/destinations/removesome/Destinations.csv +++ /dev/null @@ -1,7 +0,0 @@ -#Tag,Prefix -GERMANY,+49 -GERMANY_MOBILE,+4915 -GERMANY_MOBILE,+4916 -GERMANY_MOBILE,+4917 -DATA_DEST,222 -EUROPE,+49 diff --git a/data/tariffplans/testit/Filters.csv b/data/tariffplans/testit/Filters.csv index 28ecb9928..040e4ec71 100644 --- a/data/tariffplans/testit/Filters.csv +++ b/data/tariffplans/testit/Filters.csv @@ -1,6 +1,5 @@ #Tenant[0],ID[1],Type[2],Path[3],Values[4],ActivationInterval[5] cgrates.org,FLTR_ACCOUNT_1001,*string,~*req.Account,1001,2014-07-29T15:00:00Z -cgrates.org,FLTR_DST_DE,*destinations,~*req.Destination,DST_DE_MOBILE,2014-07-29T15:00:00Z cgrates.org,FLTR_1,*string,~*req.Account,1003;1002,2014-07-29T15:00:00Z cgrates.org,FLTR_1,*prefix,~*req.Destination,10;20, cgrates.org,FLTR_1,*rsr,~*req.Destination,1002, diff --git a/dispatchers/caches_it_test.go b/dispatchers/caches_it_test.go index 162cb34a6..804d2c284 100644 --- a/dispatchers/caches_it_test.go +++ b/dispatchers/caches_it_test.go @@ -97,7 +97,6 @@ func testDspChcPing(t *testing.T) { func testDspChcLoadAfterFolder(t *testing.T) { var rcvStats map[string]*ltcache.CacheStats expStats := engine.GetDefaultEmptyCacheStats() - expStats[utils.CacheDestinations].Items = 4 expStats[utils.CacheLoadIDs].Items = 12 expStats[utils.CacheRPCConnections].Items = 1 args := utils.AttrCacheIDsWithAPIOpts{ @@ -129,7 +128,6 @@ func testDspChcLoadAfterFolder(t *testing.T) { expStats[utils.CacheFilters].Items = 7 expStats[utils.CacheResourceProfiles].Items = 1 expStats[utils.CacheResources].Items = 1 - expStats[utils.CacheReverseDestinations].Items = 4 expStats[utils.CacheStatQueueProfiles].Items = 2 expStats[utils.CacheStatQueues].Items = 2 expStats[utils.CacheRouteProfiles].Items = 3 @@ -161,8 +159,6 @@ func testDspChcLoadAfterFolder(t *testing.T) { func testDspChcPrecacheStatus(t *testing.T) { var reply map[string]string expected := map[string]string{ - utils.CacheDestinations: utils.MetaReady, - utils.CacheReverseDestinations: utils.MetaReady, utils.CacheResourceProfiles: utils.MetaReady, utils.CacheResources: utils.MetaReady, utils.CacheTimings: utils.MetaReady, @@ -208,7 +204,6 @@ func testDspChcPrecacheStatus(t *testing.T) { utils.CacheVersions: utils.MetaReady, utils.CacheTBLTPTimings: utils.MetaReady, - utils.CacheTBLTPDestinations: utils.MetaReady, utils.CacheTBLTPResources: utils.MetaReady, utils.CacheTBLTPStats: utils.MetaReady, utils.CacheTBLTPThresholds: utils.MetaReady, diff --git a/dispatchers/config_it_test.go b/dispatchers/config_it_test.go index 3151f3fc0..e5542ecc7 100644 --- a/dispatchers/config_it_test.go +++ b/dispatchers/config_it_test.go @@ -77,7 +77,6 @@ func testDspConfigSv1GetJSONSection(t *testing.T) { APIOpts: map[string]interface{}{ utils.OptsAPIKey: "cfg12345", }, - Section: "listen", }, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, reply) { diff --git a/dispatchers/rates_it_test.go b/dispatchers/rates_it_test.go index 3493975fb..cc6098144 100644 --- a/dispatchers/rates_it_test.go +++ b/dispatchers/rates_it_test.go @@ -103,22 +103,19 @@ func testDspRPrfCostForEvent(t *testing.T) { }, } var reply string - if err := allEngine.RPC.Call(utils.APIerSv1SetRateProfile, rPrf, &reply); err != nil { + if err := allEngine.RPC.Call(utils.AdminSv1SetRateProfile, rPrf, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Expected OK, received %+v", reply) } var rply *utils.RateProfile - if err := allEngine.RPC.Call(utils.APIerSv1GetRateProfile, &utils.TenantID{ + if err := allEngine.RPC.Call(utils.AdminSv1GetRateProfile, &utils.TenantID{ Tenant: "cgrates.org", ID: "DefaultRate", }, &rply); err != nil { t.Error(err) } - rtWeek, err := rPrf.Rates["RT_WEEK"].AsRate() - if err != nil { - t.Fatal(err) - } + exp := &utils.RateProfileCost{ ID: "DefaultRate", Cost: 0.12, @@ -127,7 +124,6 @@ func testDspRPrfCostForEvent(t *testing.T) { Increments: []*utils.RateSIncrement{{ IncrementStart: utils.NewDecimal(0, 0), Usage: utils.NewDecimal(int64(time.Minute), 0), - Rate: rtWeek, IntervalRateIndex: 0, CompressFactor: 1, }}, @@ -175,22 +171,19 @@ func testDspRPrfCostForEventWithoutFilters(t *testing.T) { }, } var reply string - if err := allEngine.RPC.Call(utils.APIerSv1SetRateProfile, rPrf, &reply); err != nil { + if err := allEngine.RPC.Call(utils.AdminSv1SetRateProfile, rPrf, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Expected OK, received %+v", reply) } var rply *utils.RateProfile - if err := allEngine.RPC.Call(utils.APIerSv1GetRateProfile, &utils.TenantID{ + if err := allEngine.RPC.Call(utils.AdminSv1GetRateProfile, &utils.TenantID{ Tenant: "cgrates.org", ID: "ID_RP", }, &rply); err != nil { t.Error(err) } - rtWeek, err := rPrf.Rates["RT_WEEK"].AsRate() - if err != nil { - t.Fatal(err) - } + exp := &utils.RateProfileCost{ ID: "ID_RP", Cost: 0.25, @@ -199,7 +192,6 @@ func testDspRPrfCostForEventWithoutFilters(t *testing.T) { Increments: []*utils.RateSIncrement{{ IncrementStart: utils.NewDecimal(0, 0), Usage: utils.NewDecimal(int64(time.Minute), 0), - Rate: rtWeek, IntervalRateIndex: 0, CompressFactor: 60, }}, diff --git a/engine/model_helpers.go b/engine/model_helpers.go index 0376c5fd4..015a2846a 100644 --- a/engine/model_helpers.go +++ b/engine/model_helpers.go @@ -146,46 +146,6 @@ func getColumnCount(s interface{}) int { return count } -type DestinationMdls []DestinationMdl - -// AsTPDestination converts DestinationMdls into *utils.TPDestination -func (tps DestinationMdls) AsTPDestinations() (result []*utils.TPDestination) { - md := make(map[string]*utils.TPDestination) // Should save us some CPU if we index here for big number of destinations to search - for _, tp := range tps { - if d, hasIt := md[tp.Tag]; !hasIt { - md[tp.Tag] = &utils.TPDestination{TPid: tp.Tpid, ID: tp.Tag, Prefixes: []string{tp.Prefix}} - } else { - d.Prefixes = append(d.Prefixes, tp.Prefix) - } - } - result = make([]*utils.TPDestination, len(md)) - i := 0 - for _, d := range md { - result[i] = d - i++ - } - return -} - -func APItoModelDestination(d *utils.TPDestination) (result DestinationMdls) { - if d != nil { - for _, p := range d.Prefixes { - result = append(result, DestinationMdl{ - Tpid: d.TPid, - Tag: d.ID, - Prefix: p, - }) - } - if len(d.Prefixes) == 0 { - result = append(result, DestinationMdl{ - Tpid: d.TPid, - Tag: d.ID, - }) - } - } - return -} - type TimingMdls []TimingMdl func (tps TimingMdls) AsMapTPTimings() (map[string]*utils.ApierTPTiming, error) { diff --git a/engine/model_helpers_test.go b/engine/model_helpers_test.go index afe68a374..b5ed71a70 100644 --- a/engine/model_helpers_test.go +++ b/engine/model_helpers_test.go @@ -49,73 +49,6 @@ func TestModelHelperCsvDump(t *testing.T) { } } -func TestTPDestinationAsExportSlice(t *testing.T) { - tpDst := &utils.TPDestination{ - TPid: "TEST_TPID", - ID: "TEST_DEST", - Prefixes: []string{"49", "49176", "49151"}, - } - expectedSlc := [][]string{ - {"TEST_DEST", "49"}, - {"TEST_DEST", "49176"}, - {"TEST_DEST", "49151"}, - } - mdst := APItoModelDestination(tpDst) - var slc [][]string - for _, md := range mdst { - lc, err := CsvDump(md) - if err != nil { - t.Error("Error dumping to csv: ", err) - } - slc = append(slc, lc) - } - if !reflect.DeepEqual(expectedSlc, slc) { - t.Errorf("Expecting: %+v, received: %+v", expectedSlc, slc) - } -} - -func TestTpDestinationsAPItoModelDestination(t *testing.T) { - d := &utils.TPDestination{} - eOut := DestinationMdls{ - DestinationMdl{}, - } - if rcv := APItoModelDestination(d); rcv != nil { - if !reflect.DeepEqual(rcv, eOut) { - t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(eOut), utils.ToJSON(rcv)) - } - - } - d = &utils.TPDestination{ - TPid: "TEST_TPID", - ID: "TEST_ID", - Prefixes: []string{"+491"}, - } - eOut = DestinationMdls{ - DestinationMdl{ - Tpid: "TEST_TPID", - Tag: "TEST_ID", - Prefix: "+491", - }, - } - if rcv := APItoModelDestination(d); rcv != nil { - if !reflect.DeepEqual(rcv, eOut) { - t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(eOut), utils.ToJSON(rcv)) - } - } -} - -func TestTpDestinationsAsTPDestinations(t *testing.T) { - tpd1 := DestinationMdl{Tpid: "TEST_TPID", Tag: "TEST_DEST", Prefix: "+491"} - tpd2 := DestinationMdl{Tpid: "TEST_TPID", Tag: "TEST_DEST", Prefix: "+492"} - tpd3 := DestinationMdl{Tpid: "TEST_TPID", Tag: "TEST_DEST", Prefix: "+493"} - eTPDestinations := []*utils.TPDestination{{TPid: "TEST_TPID", ID: "TEST_DEST", - Prefixes: []string{"+491", "+492", "+493"}}} - if tpDst := DestinationMdls([]DestinationMdl{tpd1, tpd2, tpd3}).AsTPDestinations(); !reflect.DeepEqual(eTPDestinations, tpDst) { - t.Errorf("Expecting: %+v, received: %+v", eTPDestinations, tpDst) - } - -} - func TestMapTPTimings(t *testing.T) { var tps []*utils.ApierTPTiming eOut := map[string]*utils.TPTiming{} diff --git a/engine/storage_sql.go b/engine/storage_sql.go index 1060c4d8e..b0485a1f1 100644 --- a/engine/storage_sql.go +++ b/engine/storage_sql.go @@ -276,28 +276,6 @@ func (sqls *SQLStorage) SetTPTimings(timings []*utils.ApierTPTiming) error { return nil } -func (sqls *SQLStorage) SetTPDestinations(dests []*utils.TPDestination) error { - if len(dests) == 0 { - return nil - } - tx := sqls.db.Begin() - for _, dst := range dests { - // Remove previous - if err := tx.Where(&DestinationMdl{Tpid: dst.TPid, Tag: dst.ID}).Delete(DestinationMdl{}).Error; err != nil { - tx.Rollback() - return err - } - for _, d := range APItoModelDestination(dst) { - if err := tx.Create(&d).Error; err != nil { - tx.Rollback() - return err - } - } - } - tx.Commit() - return nil -} - func (sqls *SQLStorage) SetTPResources(rls []*utils.TPResourceProfile) error { if len(rls) == 0 { return nil @@ -856,21 +834,6 @@ func (sqls *SQLStorage) GetCDRs(qryFltr *utils.CDRsFilter, remove bool) ([]*CDR, return cdrs, 0, nil } -func (sqls *SQLStorage) GetTPDestinations(tpid, id string) (uTPDsts []*utils.TPDestination, err error) { - var tpDests DestinationMdls - q := sqls.db.Where("tpid = ?", tpid) - if len(id) != 0 { - q = q.Where("tag = ?", id) - } - if err := q.Find(&tpDests).Error; err != nil { - return nil, err - } - if len(tpDests.AsTPDestinations()) == 0 { - return tpDests.AsTPDestinations(), utils.ErrNotFound - } - return tpDests.AsTPDestinations(), nil -} - func (sqls *SQLStorage) GetTPTimings(tpid, id string) ([]*utils.ApierTPTiming, error) { var tpTimings TimingMdls q := sqls.db.Where("tpid = ?", tpid) diff --git a/engine/z_loader_it_test.go b/engine/z_loader_it_test.go index 180ea8dd7..940940fa2 100644 --- a/engine/z_loader_it_test.go +++ b/engine/z_loader_it_test.go @@ -153,9 +153,6 @@ func testLoaderITRemoveLoad(t *testing.T) { if err != nil { t.Error(err) } - if err = loader.LoadDestinations(); err != nil { - t.Error("Failed loading destinations: ", err.Error()) - } if err = loader.LoadTimings(); err != nil { t.Error("Failed loading timings: ", err.Error()) } @@ -208,9 +205,6 @@ func testLoaderITLoadFromCSV(t *testing.T) { if err != nil { t.Error(err) } - if err = loader.LoadDestinations(); err != nil { - t.Error("Failed loading destinations: ", err.Error()) - } if err = loader.LoadTimings(); err != nil { t.Error("Failed loading timings: ", err.Error()) } @@ -247,16 +241,6 @@ func testLoaderITLoadFromCSV(t *testing.T) { } func testLoaderITWriteToDatabase(t *testing.T) { - for k, d := range loader.destinations { - rcv, err := loader.dm.GetDestination(k, false, true, utils.NonTransactional) - if err != nil { - t.Error("Failed GetDestination: ", err.Error()) - } - if !reflect.DeepEqual(d, rcv) { - t.Errorf("Expecting: %v, received: %v", d, rcv) - } - } - for k, tm := range loader.timings { rcv, err := loader.dm.GetTiming(k, true, utils.NonTransactional) if err != nil { @@ -414,9 +398,6 @@ func testLoaderITImportToStorDb(t *testing.T) { // Loads data from storDb into dataDb func testLoaderITLoadFromStorDb(t *testing.T) { loader, _ := NewTpReader(dataDbCsv.DataDB(), storDb, utils.TestSQL, "", []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches)}, nil, false) - if err := loader.LoadDestinations(); err != nil && err.Error() != utils.NotFoundCaps { - t.Error("Failed loading destinations: ", err.Error()) - } if err := loader.LoadTimings(); err != nil && err.Error() != utils.NotFoundCaps { t.Error("Failed loading timings: ", err.Error()) } diff --git a/engine/z_onstor_it_test.go b/engine/z_onstor_it_test.go index 2b2b5dfcd..dde89f0db 100644 --- a/engine/z_onstor_it_test.go +++ b/engine/z_onstor_it_test.go @@ -43,13 +43,8 @@ var ( sTestsOnStorIT = []func(t *testing.T){ testOnStorITFlush, testOnStorITIsDBEmpty, - testOnStorITCacheDestinations, - testOnStorITCacheReverseDestinations, - // ToDo: test cache flush for a prefix // ToDo: testOnStorITLoadAccountingCache - testOnStorITCRUDDestinations, - testOnStorITCRUDReverseDestinations, testOnStorITResource, testOnStorITResourceProfile, testOnStorITTiming, @@ -133,147 +128,6 @@ func testOnStorITIsDBEmpty(t *testing.T) { } } -func testOnStorITCacheDestinations(t *testing.T) { - if onStor.dataDB.GetStorageType() == utils.Internal { - t.SkipNow() - } - - if err := onStor.CacheDataFromDB(context.TODO(), "INVALID", nil, false); err == nil || err.Error() != utils.UnsupportedCachePrefix { - t.Error(err) - } - dst := &Destination{ID: "TEST_CACHE", Prefixes: []string{"+491", "+492", "+493"}} - if err := onStor.SetDestination(dst, utils.NonTransactional); err != nil { - t.Error(err) - } - - if _, hasIt := Cache.Get(utils.CacheDestinations, dst.ID); hasIt { - t.Error("Already in cache") - } - if err := onStor.CacheDataFromDB(context.TODO(), utils.DestinationPrefix, []string{dst.ID}, true); err != nil { // Should not cache due to mustBeCached - t.Error(err) - } - if _, hasIt := Cache.Get(utils.CacheDestinations, dst.ID); hasIt { - t.Error("Should not be in cache") - } - if err := onStor.CacheDataFromDB(context.TODO(), utils.DestinationPrefix, []string{dst.ID}, false); err != nil { - t.Error(err) - } - if itm, hasIt := Cache.Get(utils.CacheDestinations, dst.ID); !hasIt { - t.Error("Did not cache") - } else if !reflect.DeepEqual(dst, itm.(*Destination)) { - t.Error("Wrong item in the cache") - } -} - -func testOnStorITCacheReverseDestinations(t *testing.T) { - dst := &Destination{ID: "TEST_CACHE", Prefixes: []string{"+491", "+492", "+493"}} - if err := onStor.SetReverseDestination(dst.ID, dst.Prefixes, utils.NonTransactional); err != nil { - t.Error(err) - } - for _, prfx := range dst.Prefixes { - if _, hasIt := Cache.Get(utils.CacheReverseDestinations, dst.ID); hasIt && - onStor.dataDB.GetStorageType() != utils.Internal { - t.Errorf("Prefix: %s already in cache", prfx) - } - } - if err := onStor.CacheDataFromDB(context.TODO(), utils.ReverseDestinationPrefix, dst.Prefixes, false); err != nil { - t.Error(err) - } - if onStor.dataDB.GetStorageType() != utils.Internal { - for _, prfx := range dst.Prefixes { - if itm, hasIt := Cache.Get(utils.CacheReverseDestinations, prfx); !hasIt { - t.Error("Did not cache") - } else if !reflect.DeepEqual([]string{dst.ID}, itm.([]string)) { - t.Error("Wrong item in the cache") - } - } - } -} - -func testOnStorITCRUDDestinations(t *testing.T) { - dst := &Destination{ID: "CRUDDestination2", Prefixes: []string{"+491", "+492", "+493"}} - if _, rcvErr := onStor.GetDestination(dst.ID, false, true, utils.NonTransactional); rcvErr != utils.ErrNotFound { - t.Error(rcvErr) - } - if err := onStor.SetDestination(dst, utils.NonTransactional); err != nil { - t.Error(err) - } - if rcv, err := onStor.GetDestination(dst.ID, false, true, utils.NonTransactional); err != nil { - t.Error(err) - } else if !reflect.DeepEqual(dst, rcv) { - t.Errorf("Expecting: %v, received: %v", dst, rcv) - } - // FixMe - // if err = onStor.DataDB().SelectDatabase("13"); err != nil { - // t.Error(err) - // } - // if _, rcvErr := onStor.GetDestination(dst.Id, false, utils.NonTransactional); rcvErr != utils.ErrNotFound { - // t.Error(rcvErr) - // } - // - // if rcv, err := onStor.GetDestination(dst.Id, false, utils.NonTransactional); err != nil { - // t.Error(err) - // } else if !reflect.DeepEqual(dst, rcv) { - // t.Errorf("Expecting: %v, received: %v", dst, rcv) - // } - // if err = onStor.DataDB().SelectDatabase(onStorCfg); err != nil { - // t.Error(err) - // } - - if err = onStor.RemoveDestination(dst.ID, utils.NonTransactional); err != nil { - t.Error(err) - } - if _, rcvErr := onStor.GetDestination(dst.ID, false, true, utils.NonTransactional); rcvErr != utils.ErrNotFound { - t.Error(rcvErr) - } -} - -func testOnStorITCRUDReverseDestinations(t *testing.T) { - dst := &Destination{ID: "CRUDReverseDestination", Prefixes: []string{"+494", "+495", "+496"}} - dst2 := &Destination{ID: "CRUDReverseDestination", Prefixes: []string{"+497", "+498", "+499"}} - if _, rcvErr := onStor.GetReverseDestination(dst.ID, false, true, utils.NonTransactional); rcvErr != utils.ErrNotFound { - t.Error(rcvErr) - } - if err := onStor.SetReverseDestination(dst.ID, dst.Prefixes, utils.NonTransactional); err != nil { - t.Error(err) - } - for i := range dst.Prefixes { - if rcv, err := onStor.GetReverseDestination(dst.Prefixes[i], false, true, utils.NonTransactional); err != nil { - t.Error(err) - } else if !reflect.DeepEqual([]string{dst.ID}, rcv) { - t.Errorf("Expecting: %v, received: %v", []string{dst.ID}, rcv) - } - } - if err := onStor.UpdateReverseDestination(dst, dst2, utils.NonTransactional); err != nil { - t.Error(err) - } - for i := range dst.Prefixes { - if rcv, err := onStor.GetReverseDestination(dst2.Prefixes[i], false, true, utils.NonTransactional); err != nil { - t.Error(err) - } else if !reflect.DeepEqual([]string{dst2.ID}, rcv) { - t.Errorf("Expecting: %v, received: %v", []string{dst.ID}, rcv) - } - } - // FixMe - // if err = onStor.DataDB().SelectDatabase("13"); err != nil { - // t.Error(err) - // } - // if _, rcvErr := onStor.GetReverseDestination(dst2.Id, false, utils.NonTransactional); rcvErr != utils.ErrNotFound { - // t.Error(rcvErr) - // } - // - for i := range dst.Prefixes { - if rcv, err := onStor.GetReverseDestination(dst2.Prefixes[i], true, true, utils.NonTransactional); err != nil { - t.Error(err) - } else if !reflect.DeepEqual([]string{dst2.ID}, rcv) { - t.Errorf("Expecting: %v, received: %v", []string{dst.ID}, rcv) - } - } - // if err = onStor.DataDB().SelectDatabase(onStorCfg); err != nil { - // t.Error(err) - // } -} - func testOnStorITResourceProfile(t *testing.T) { rL := &ResourceProfile{ Tenant: "cgrates.org", diff --git a/engine/z_stordb_it_test.go b/engine/z_stordb_it_test.go index 3af05ebed..4935046fa 100644 --- a/engine/z_stordb_it_test.go +++ b/engine/z_stordb_it_test.go @@ -55,7 +55,6 @@ var sTestsStorDBit = []func(t *testing.T){ testStorDBitCRUDTPAttributes, testStorDBitCRUDTPChargers, testStorDBitCRUDTpTimings, - testStorDBitCRUDTpDestinations, testStorDBitCRUDTpResources, testStorDBitCRUDTpStats, testStorDBitCRUDCDRs, @@ -973,91 +972,6 @@ func testStorDBitCRUDTpTimings(t *testing.T) { } } -func testStorDBitCRUDTpDestinations(t *testing.T) { - // READ - if _, err := storDB.GetTPDestinations("testTPid", ""); err != utils.ErrNotFound { - t.Error(err) - } - // WRITE - snd := []*utils.TPDestination{ - { - TPid: "testTPid", - ID: "testTag1", - Prefixes: []string{`0256`, `0257`, `0723`, `+49`}, - }, - { - TPid: "testTPid", - ID: "testTag2", - Prefixes: []string{`0256`, `0257`, `0723`, `+49`}, - }, - } - if err := storDB.SetTPDestinations(snd); err != nil { - t.Error(err) - } - // READ - if rcv, err := storDB.GetTPDestinations("testTPid", ""); err != nil { - t.Error(err) - } else { - prfs := make(map[string]bool) - for _, prf := range snd[0].Prefixes { - prfs[prf] = true - } - pfrOk := true - for i := range rcv[0].Prefixes { - found1 := prfs[rcv[0].Prefixes[i]] - found2 := prfs[rcv[1].Prefixes[i]] - if !found1 && !found2 { - pfrOk = false - } - } - if pfrOk { - rcv[0].Prefixes = snd[0].Prefixes - rcv[1].Prefixes = snd[0].Prefixes - } - if !(reflect.DeepEqual(snd[0], rcv[0]) || reflect.DeepEqual(snd[0], rcv[1])) { - t.Errorf("Expecting:\n%+v\nReceived:\n%+v\n||\n%+v", utils.ToJSON(snd[0]), utils.ToJSON(rcv[0]), utils.ToJSON(rcv[1])) - } - } - // UPDATE - snd[0].Prefixes = []string{`9999`, `0257`, `0723`, `+49`} - snd[1].Prefixes = []string{`9999`, `0257`, `0723`, `+49`} - if err := storDB.SetTPDestinations(snd); err != nil { - t.Error(err) - } - // READ - if rcv, err := storDB.GetTPDestinations("testTPid", ""); err != nil { - t.Error(err) - } else { - prfs := make(map[string]bool) - for _, prf := range snd[0].Prefixes { - prfs[prf] = true - } - pfrOk := true - for i := range rcv[0].Prefixes { - found1 := prfs[rcv[0].Prefixes[i]] - found2 := prfs[rcv[1].Prefixes[i]] - if !found1 && !found2 { - pfrOk = false - } - } - if pfrOk { - rcv[0].Prefixes = snd[0].Prefixes - rcv[1].Prefixes = snd[0].Prefixes - } - if !(reflect.DeepEqual(snd[0], rcv[0]) || reflect.DeepEqual(snd[0], rcv[1])) { - t.Errorf("Expecting:\n%+v\nReceived:\n%+v\n||\n%+v", utils.ToJSON(snd[0]), utils.ToJSON(rcv[0]), utils.ToJSON(rcv[1])) - } - } - // REMOVE - if err := storDB.RemTpData("", "testTPid", nil); err != nil { - t.Error(err) - } - // READ - if _, err := storDB.GetTPDestinations("testTPid", ""); err != utils.ErrNotFound { - t.Error(err) - } -} - func testStorDBitCRUDTpResources(t *testing.T) { // READ if _, err := storDB.GetTPResources("testTPid", "", ""); err != utils.ErrNotFound { diff --git a/loaders/loader_it_test.go b/loaders/loader_it_test.go index f33222a70..486d6b8db 100644 --- a/loaders/loader_it_test.go +++ b/loaders/loader_it_test.go @@ -215,7 +215,7 @@ func testLoaderCheckAttributes(t *testing.T) { eAttrPrf.Attributes[1].FilterIDs = nil } var reply *engine.AttributeProfile - if err := loaderRPC.Call(utils.APIerSv1GetAttributeProfile, + if err := loaderRPC.Call(utils.AdminSv1GetAttributeProfile, &utils.TenantIDWithAPIOpts{ TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ALS1"}, }, &reply); err != nil { @@ -393,7 +393,7 @@ func testLoaderCheckForCustomSep(t *testing.T) { eAttrPrf.Attributes[0].FilterIDs = nil } var reply *engine.AttributeProfile - if err := loaderRPC.Call(utils.APIerSv1GetAttributeProfile, + if err := loaderRPC.Call(utils.AdminSv1GetAttributeProfile, &utils.TenantIDWithAPIOpts{ TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_12012000001"}, }, &reply); err != nil { diff --git a/services/cdrs_it_test.go b/services/cdrs_it_test.go index 33311f134..0b7708e59 100644 --- a/services/cdrs_it_test.go +++ b/services/cdrs_it_test.go @@ -47,9 +47,6 @@ func TestCdrsReload(t *testing.T) { close(chS.GetPrecacheChannel(utils.CacheChargerProfiles)) close(chS.GetPrecacheChannel(utils.CacheChargerFilterIndexes)) - - close(chS.GetPrecacheChannel(utils.CacheDestinations)) - close(chS.GetPrecacheChannel(utils.CacheReverseDestinations)) close(chS.GetPrecacheChannel(utils.CacheTimings)) cfg.ChargerSCfg().Enabled = true diff --git a/services/datadb_it_test.go b/services/datadb_it_test.go index 2a6c49434..2cb66a90b 100644 --- a/services/datadb_it_test.go +++ b/services/datadb_it_test.go @@ -104,12 +104,6 @@ func TestDataDBReload(t *testing.T) { utils.MetaAccounts: { Replicate: false, Remote: false}, - utils.MetaReverseDestinations: { - Replicate: false, - Remote: false}, - utils.MetaDestinations: { - Replicate: false, - Remote: false}, utils.MetaActions: { Replicate: false, Remote: false}, @@ -209,18 +203,16 @@ func TestDataDBReloadBadType(t *testing.T) { utils.Thresholds: 4, utils.Routes: 2, // old version for Attributes - utils.Attributes: 5, - utils.Timing: 1, - utils.RQF: 5, - utils.Resource: 1, - utils.Subscribers: 1, - utils.Destinations: 1, - utils.ReverseDestinations: 1, - utils.Chargers: 2, - utils.Dispatchers: 2, - utils.LoadIDsVrs: 1, - utils.RateProfiles: 1, - utils.ActionProfiles: 1, + utils.Attributes: 5, + utils.Timing: 1, + utils.RQF: 5, + utils.Resource: 1, + utils.Subscribers: 1, + utils.Chargers: 2, + utils.Dispatchers: 2, + utils.LoadIDsVrs: 1, + utils.RateProfiles: 1, + utils.ActionProfiles: 1, }, true) if err != nil { t.Fatal(err) @@ -256,12 +248,6 @@ func TestDataDBReloadBadType(t *testing.T) { utils.MetaAccounts: { Replicate: false, Remote: false}, - utils.MetaReverseDestinations: { - Replicate: false, - Remote: false}, - utils.MetaDestinations: { - Replicate: false, - Remote: false}, utils.MetaActions: { Replicate: false, Remote: false}, @@ -367,12 +353,6 @@ func TestDataDBReloadErrorMarsheler(t *testing.T) { utils.MetaAccounts: { Replicate: false, Remote: false}, - utils.MetaReverseDestinations: { - Replicate: false, - Remote: false}, - utils.MetaDestinations: { - Replicate: false, - Remote: false}, utils.MetaActions: { Replicate: false, Remote: false}, @@ -462,18 +442,16 @@ func TestDataDBStartVersion(t *testing.T) { utils.Thresholds: 4, utils.Routes: 2, // old version for Attributes - utils.Attributes: 5, - utils.Timing: 1, - utils.RQF: 5, - utils.Resource: 1, - utils.Subscribers: 1, - utils.Destinations: 1, - utils.ReverseDestinations: 1, - utils.Chargers: 2, - utils.Dispatchers: 2, - utils.LoadIDsVrs: 1, - utils.RateProfiles: 1, - utils.ActionProfiles: 1, + utils.Attributes: 5, + utils.Timing: 1, + utils.RQF: 5, + utils.Resource: 1, + utils.Subscribers: 1, + utils.Chargers: 2, + utils.Dispatchers: 2, + utils.LoadIDsVrs: 1, + utils.RateProfiles: 1, + utils.ActionProfiles: 1, }, true) if err != nil { t.Fatal(err) @@ -520,18 +498,16 @@ func TestDataDBReloadCastError(t *testing.T) { utils.Thresholds: 4, utils.Routes: 2, // old version for Attributes - utils.Attributes: 5, - utils.Timing: 1, - utils.RQF: 5, - utils.Resource: 1, - utils.Subscribers: 1, - utils.Destinations: 1, - utils.ReverseDestinations: 1, - utils.Chargers: 2, - utils.Dispatchers: 2, - utils.LoadIDsVrs: 1, - utils.RateProfiles: 1, - utils.ActionProfiles: 1, + utils.Attributes: 5, + utils.Timing: 1, + utils.RQF: 5, + utils.Resource: 1, + utils.Subscribers: 1, + utils.Chargers: 2, + utils.Dispatchers: 2, + utils.LoadIDsVrs: 1, + utils.RateProfiles: 1, + utils.ActionProfiles: 1, }, true) if err != nil { t.Fatal(err) @@ -567,12 +543,6 @@ func TestDataDBReloadCastError(t *testing.T) { utils.MetaAccounts: { Replicate: false, Remote: false}, - utils.MetaReverseDestinations: { - Replicate: false, - Remote: false}, - utils.MetaDestinations: { - Replicate: false, - Remote: false}, utils.MetaActions: { Replicate: false, Remote: false}, @@ -665,18 +635,16 @@ func TestDataDBReloadIfaceAsDurationError(t *testing.T) { utils.Thresholds: 4, utils.Routes: 2, // old version for Attributes - utils.Attributes: 5, - utils.Timing: 1, - utils.RQF: 5, - utils.Resource: 1, - utils.Subscribers: 1, - utils.Destinations: 1, - utils.ReverseDestinations: 1, - utils.Chargers: 2, - utils.Dispatchers: 2, - utils.LoadIDsVrs: 1, - utils.RateProfiles: 1, - utils.ActionProfiles: 1, + utils.Attributes: 5, + utils.Timing: 1, + utils.RQF: 5, + utils.Resource: 1, + utils.Subscribers: 1, + utils.Chargers: 2, + utils.Dispatchers: 2, + utils.LoadIDsVrs: 1, + utils.RateProfiles: 1, + utils.ActionProfiles: 1, }, true) if err != nil { t.Fatal(err) @@ -712,12 +680,6 @@ func TestDataDBReloadIfaceAsDurationError(t *testing.T) { utils.MetaAccounts: { Replicate: false, Remote: false}, - utils.MetaReverseDestinations: { - Replicate: false, - Remote: false}, - utils.MetaDestinations: { - Replicate: false, - Remote: false}, utils.MetaActions: { Replicate: false, Remote: false}, @@ -842,12 +804,6 @@ func TestDataDBReloadError(t *testing.T) { utils.MetaAccounts: { Replicate: false, Remote: false}, - utils.MetaReverseDestinations: { - Replicate: false, - Remote: false}, - utils.MetaDestinations: { - Replicate: false, - Remote: false}, utils.MetaActions: { Replicate: false, Remote: false}, diff --git a/services/sessions_it_test.go b/services/sessions_it_test.go index 6050faa1c..a435f5215 100644 --- a/services/sessions_it_test.go +++ b/services/sessions_it_test.go @@ -144,8 +144,6 @@ func TestSessionSReload2(t *testing.T) { chS := engine.NewCacheS(cfg, nil, nil) close(chS.GetPrecacheChannel(utils.CacheChargerProfiles)) close(chS.GetPrecacheChannel(utils.CacheChargerFilterIndexes)) - close(chS.GetPrecacheChannel(utils.CacheDestinations)) - close(chS.GetPrecacheChannel(utils.CacheReverseDestinations)) close(chS.GetPrecacheChannel(utils.CacheTimings)) internalChan := make(chan birpc.ClientConnector, 1) @@ -196,8 +194,6 @@ func TestSessionSReload3(t *testing.T) { chS := engine.NewCacheS(cfg, nil, nil) close(chS.GetPrecacheChannel(utils.CacheChargerProfiles)) close(chS.GetPrecacheChannel(utils.CacheChargerFilterIndexes)) - close(chS.GetPrecacheChannel(utils.CacheDestinations)) - close(chS.GetPrecacheChannel(utils.CacheReverseDestinations)) close(chS.GetPrecacheChannel(utils.CacheTimings)) internalChan := make(chan birpc.ClientConnector, 1) diff --git a/services/stordb_it_test.go b/services/stordb_it_test.go index c3b41bb8e..5c7cfa883 100644 --- a/services/stordb_it_test.go +++ b/services/stordb_it_test.go @@ -178,7 +178,6 @@ func TestStorDBReloadVersion1(t *testing.T) { utils.TpResources: 1, utils.TpTiming: 1, utils.TpResource: 1, - utils.TpDestinations: 1, utils.TpChargers: 1, utils.TpDispatchers: 1, utils.TpRateProfiles: 1, @@ -247,7 +246,6 @@ func TestStorDBReloadVersion2(t *testing.T) { utils.TpResources: 1, utils.TpTiming: 1, utils.TpResource: 1, - utils.TpDestinations: 1, utils.TpChargers: 1, utils.TpDispatchers: 1, utils.TpRateProfiles: 1, @@ -313,7 +311,6 @@ func TestStorDBReloadVersion3(t *testing.T) { utils.TpResources: 1, utils.TpTiming: 1, utils.TpResource: 1, - utils.TpDestinations: 1, utils.TpChargers: 1, utils.TpDispatchers: 1, utils.TpRateProfiles: 1, diff --git a/utils/apitpdata.go b/utils/apitpdata.go index 9bdc0c3f1..c0f1f874d 100644 --- a/utils/apitpdata.go +++ b/utils/apitpdata.go @@ -83,13 +83,6 @@ func (pgnt Paginator) Clone() Paginator { } } -// TPDestination represents one destination in storDB -type TPDestination struct { - TPid string // Tariff plan id - ID string // Destination id - Prefixes []string // Prefixes attached to this destination -} - type ApierTPTiming struct { TPid string // Tariff plan id ID string // Timing id