diff --git a/data/tariffplans/oldaccvsnew/AccountProfiles.csv b/data/tariffplans/oldaccvsnew/Accounts.csv similarity index 100% rename from data/tariffplans/oldaccvsnew/AccountProfiles.csv rename to data/tariffplans/oldaccvsnew/Accounts.csv diff --git a/data/tariffplans/testit/AccountProfiles.csv b/data/tariffplans/testit/Accounts.csv similarity index 100% rename from data/tariffplans/testit/AccountProfiles.csv rename to data/tariffplans/testit/Accounts.csv diff --git a/data/tariffplans/tutaccounts/AccountProfiles.csv b/data/tariffplans/tutaccounts/Accounts.csv similarity index 100% rename from data/tariffplans/tutaccounts/AccountProfiles.csv rename to data/tariffplans/tutaccounts/Accounts.csv diff --git a/utils/consts.go b/utils/consts.go index 1ec38c03b..e9cf08747 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -54,46 +54,46 @@ var ( CacheResourceFilterIndexes, CacheStatFilterIndexes, CacheThresholdFilterIndexes, CacheRouteFilterIndexes, CacheAttributeFilterIndexes, CacheChargerFilterIndexes, CacheDispatcherFilterIndexes, CacheLoadIDs, CacheRateProfiles, CacheRateProfilesFilterIndexes, CacheRateFilterIndexes, - CacheActionProfilesFilterIndexes, CacheAccountProfilesFilterIndexes, CacheReverseFilterIndexes, - CacheAccountProfiles}) + CacheActionProfilesFilterIndexes, CacheAccountsFilterIndexes, CacheReverseFilterIndexes, + CacheAccounts}) storDBPartition = NewStringSet([]string{CacheTBLTPTimings, CacheTBLTPDestinations, CacheTBLTPResources, CacheTBLTPStats, CacheTBLTPThresholds, CacheTBLTPFilters, CacheSessionCostsTBL, CacheCDRsTBL, CacheTBLTPRoutes, CacheTBLTPAttributes, CacheTBLTPChargers, CacheTBLTPDispatchers, - CacheTBLTPDispatcherHosts, CacheTBLTPRateProfiles, CacheTBLTPActionProfiles, CacheTBLTPAccountProfiles}) + CacheTBLTPDispatcherHosts, CacheTBLTPRateProfiles, CacheTBLTPActionProfiles, CacheTBLTPAccounts}) // CachePartitions enables creation of cache partitions CachePartitions = JoinStringSet(extraDBPartition, dataDBPartition, storDBPartition) CacheInstanceToPrefix = map[string]string{ - CacheDestinations: DestinationPrefix, - CacheReverseDestinations: ReverseDestinationPrefix, - CacheResourceProfiles: ResourceProfilesPrefix, - CacheResources: ResourcesPrefix, - CacheTimings: TimingsPrefix, - CacheStatQueueProfiles: StatQueueProfilePrefix, - CacheStatQueues: StatQueuePrefix, - CacheThresholdProfiles: ThresholdProfilePrefix, - CacheThresholds: ThresholdPrefix, - CacheFilters: FilterPrefix, - CacheRouteProfiles: RouteProfilePrefix, - CacheAttributeProfiles: AttributeProfilePrefix, - CacheChargerProfiles: ChargerProfilePrefix, - CacheDispatcherProfiles: DispatcherProfilePrefix, - CacheDispatcherHosts: DispatcherHostPrefix, - CacheRateProfiles: RateProfilePrefix, - CacheActionProfiles: ActionProfilePrefix, - CacheAccountProfiles: AccountProfilePrefix, - CacheResourceFilterIndexes: ResourceFilterIndexes, - CacheStatFilterIndexes: StatFilterIndexes, - CacheThresholdFilterIndexes: ThresholdFilterIndexes, - CacheRouteFilterIndexes: RouteFilterIndexes, - CacheAttributeFilterIndexes: AttributeFilterIndexes, - CacheChargerFilterIndexes: ChargerFilterIndexes, - CacheDispatcherFilterIndexes: DispatcherFilterIndexes, - CacheRateProfilesFilterIndexes: RateProfilesFilterIndexPrfx, - CacheActionProfilesFilterIndexes: ActionProfilesFilterIndexPrfx, - CacheAccountProfilesFilterIndexes: AccountProfileFilterIndexPrfx, + CacheDestinations: DestinationPrefix, + CacheReverseDestinations: ReverseDestinationPrefix, + CacheResourceProfiles: ResourceProfilesPrefix, + CacheResources: ResourcesPrefix, + CacheTimings: TimingsPrefix, + CacheStatQueueProfiles: StatQueueProfilePrefix, + CacheStatQueues: StatQueuePrefix, + CacheThresholdProfiles: ThresholdProfilePrefix, + CacheThresholds: ThresholdPrefix, + CacheFilters: FilterPrefix, + CacheRouteProfiles: RouteProfilePrefix, + CacheAttributeProfiles: AttributeProfilePrefix, + CacheChargerProfiles: ChargerProfilePrefix, + CacheDispatcherProfiles: DispatcherProfilePrefix, + CacheDispatcherHosts: DispatcherHostPrefix, + CacheRateProfiles: RateProfilePrefix, + CacheActionProfiles: ActionProfilePrefix, + CacheAccounts: AccountPrefix, + CacheResourceFilterIndexes: ResourceFilterIndexes, + CacheStatFilterIndexes: StatFilterIndexes, + CacheThresholdFilterIndexes: ThresholdFilterIndexes, + CacheRouteFilterIndexes: RouteFilterIndexes, + CacheAttributeFilterIndexes: AttributeFilterIndexes, + CacheChargerFilterIndexes: ChargerFilterIndexes, + CacheDispatcherFilterIndexes: DispatcherFilterIndexes, + CacheRateProfilesFilterIndexes: RateProfilesFilterIndexPrfx, + CacheActionProfilesFilterIndexes: ActionProfilesFilterIndexPrfx, + CacheAccountsFilterIndexes: AccountFilterIndexPrfx, CacheLoadIDs: LoadIDPrefix, CacheRateFilterIndexes: RateFilterIndexPrfx, @@ -102,18 +102,18 @@ var ( } CachePrefixToInstance map[string]string // will be built on init CacheIndexesToPrefix = map[string]string{ // used by match index to get all the ids when index selects is disabled and for compute indexes - CacheThresholdFilterIndexes: ThresholdProfilePrefix, - CacheResourceFilterIndexes: ResourceProfilesPrefix, - CacheStatFilterIndexes: StatQueueProfilePrefix, - CacheRouteFilterIndexes: RouteProfilePrefix, - CacheAttributeFilterIndexes: AttributeProfilePrefix, - CacheChargerFilterIndexes: ChargerProfilePrefix, - CacheDispatcherFilterIndexes: DispatcherProfilePrefix, - CacheRateProfilesFilterIndexes: RateProfilePrefix, - CacheRateFilterIndexes: RatePrefix, - CacheActionProfilesFilterIndexes: ActionProfilePrefix, - CacheAccountProfilesFilterIndexes: AccountProfilePrefix, - CacheReverseFilterIndexes: FilterPrefix, + CacheThresholdFilterIndexes: ThresholdProfilePrefix, + CacheResourceFilterIndexes: ResourceProfilesPrefix, + CacheStatFilterIndexes: StatQueueProfilePrefix, + CacheRouteFilterIndexes: RouteProfilePrefix, + CacheAttributeFilterIndexes: AttributeProfilePrefix, + CacheChargerFilterIndexes: ChargerProfilePrefix, + CacheDispatcherFilterIndexes: DispatcherProfilePrefix, + CacheRateProfilesFilterIndexes: RateProfilePrefix, + CacheRateFilterIndexes: RatePrefix, + CacheActionProfilesFilterIndexes: ActionProfilePrefix, + CacheAccountsFilterIndexes: AccountPrefix, + CacheReverseFilterIndexes: FilterPrefix, } CacheInstanceToCacheIndex = map[string]string{ @@ -146,7 +146,7 @@ var ( TBLTPDispatcherHosts: CacheTBLTPDispatcherHosts, TBLTPRateProfiles: CacheTBLTPRateProfiles, TBLTPActionProfiles: CacheTBLTPActionProfiles, - TBLTPAccountProfiles: CacheTBLTPAccountProfiles, + TBLTPAccounts: CacheTBLTPAccounts, } // ProtectedSFlds are the fields that sessions should not alter @@ -170,19 +170,19 @@ var ( RateProfileIDs: RateProfilePrefix, ActionProfileIDs: ActionProfilePrefix, - TimingIDs: TimingsPrefix, - AttributeFilterIndexIDs: AttributeFilterIndexes, - ResourceFilterIndexIDs: ResourceFilterIndexes, - StatFilterIndexIDs: StatFilterIndexes, - ThresholdFilterIndexIDs: ThresholdFilterIndexes, - RouteFilterIndexIDs: RouteFilterIndexes, - ChargerFilterIndexIDs: ChargerFilterIndexes, - DispatcherFilterIndexIDs: DispatcherFilterIndexes, - RateProfilesFilterIndexIDs: RateProfilesFilterIndexPrfx, - RateFilterIndexIDs: RateFilterIndexPrfx, - ActionProfilesFilterIndexIDs: ActionProfilesFilterIndexPrfx, - AccountProfilesFilterIndexIDs: AccountProfileFilterIndexPrfx, - FilterIndexIDs: FilterIndexPrfx, + TimingIDs: TimingsPrefix, + AttributeFilterIndexIDs: AttributeFilterIndexes, + ResourceFilterIndexIDs: ResourceFilterIndexes, + StatFilterIndexIDs: StatFilterIndexes, + ThresholdFilterIndexIDs: ThresholdFilterIndexes, + RouteFilterIndexIDs: RouteFilterIndexes, + ChargerFilterIndexIDs: ChargerFilterIndexes, + DispatcherFilterIndexIDs: DispatcherFilterIndexes, + RateProfilesFilterIndexIDs: RateProfilesFilterIndexPrfx, + RateFilterIndexIDs: RateFilterIndexPrfx, + ActionProfilesFilterIndexIDs: ActionProfilesFilterIndexPrfx, + AccountsFilterIndexIDs: AccountFilterIndexPrfx, + FilterIndexIDs: FilterIndexPrfx, } CacheInstanceToArg map[string]string ArgCacheToInstance = map[string]string{ @@ -203,19 +203,19 @@ var ( RateProfileIDs: CacheRateProfiles, ActionProfileIDs: CacheActionProfiles, - TimingIDs: CacheTimings, - AttributeFilterIndexIDs: CacheAttributeFilterIndexes, - ResourceFilterIndexIDs: CacheResourceFilterIndexes, - StatFilterIndexIDs: CacheStatFilterIndexes, - ThresholdFilterIndexIDs: CacheThresholdFilterIndexes, - RouteFilterIndexIDs: CacheRouteFilterIndexes, - ChargerFilterIndexIDs: CacheChargerFilterIndexes, - DispatcherFilterIndexIDs: CacheDispatcherFilterIndexes, - RateProfilesFilterIndexIDs: CacheRateProfilesFilterIndexes, - RateFilterIndexIDs: CacheRateFilterIndexes, - FilterIndexIDs: CacheReverseFilterIndexes, - ActionProfilesFilterIndexIDs: CacheActionProfilesFilterIndexes, - AccountProfilesFilterIndexIDs: CacheAccountProfilesFilterIndexes, + TimingIDs: CacheTimings, + AttributeFilterIndexIDs: CacheAttributeFilterIndexes, + ResourceFilterIndexIDs: CacheResourceFilterIndexes, + StatFilterIndexIDs: CacheStatFilterIndexes, + ThresholdFilterIndexIDs: CacheThresholdFilterIndexes, + RouteFilterIndexIDs: CacheRouteFilterIndexes, + ChargerFilterIndexIDs: CacheChargerFilterIndexes, + DispatcherFilterIndexIDs: CacheDispatcherFilterIndexes, + RateProfilesFilterIndexIDs: CacheRateProfilesFilterIndexes, + RateFilterIndexIDs: CacheRateFilterIndexes, + FilterIndexIDs: CacheReverseFilterIndexes, + ActionProfilesFilterIndexIDs: CacheActionProfilesFilterIndexes, + AccountsFilterIndexIDs: CacheAccountsFilterIndexes, } ConcurrentReqsLimit int ConcurrentReqsStrategy string @@ -356,7 +356,7 @@ const ( DispatcherProfilePrefix = "dpp_" RateProfilePrefix = "rtp_" ActionProfilePrefix = "acp_" - AccountProfilePrefix = "anp_" + AccountPrefix = "anp_" DispatcherHostPrefix = "dph_" ThresholdProfilePrefix = "thp_" StatQueuePrefix = "stq_" @@ -498,7 +498,7 @@ const ( DispatcherHosts = "DispatcherHosts" RateProfiles = "RateProfiles" ActionProfiles = "ActionProfiles" - AccountProfilesString = "AccountProfiles" + AccountsString = "Accounts" MetaEveryMinute = "*every_minute" MetaHourly = "*hourly" ID = "ID" @@ -904,7 +904,6 @@ const ( MetaRoutes = "*routes" MetaAttributes = "*attributes" MetaActionProfiles = "*action_profiles" - MetaAccountProfiles = "*account_profiles" MetaLoadIDs = "*load_ids" ) @@ -1037,7 +1036,7 @@ const ( TpDispatcherHosts = "TpDispatcherHosts" TpRateProfiles = "TpRateProfiles" TpActionProfiles = "TpActionProfiles" - TpAccountProfiles = "TpAccountProfiles" + TpAccounts = "TpAccounts" ) // Dispatcher Const @@ -1121,7 +1120,7 @@ const ( ReplicatorSv1GetRateProfile = "ReplicatorSv1.GetRateProfile" ReplicatorSv1GetActionProfile = "ReplicatorSv1.GetActionProfile" ReplicatorSv1GetDispatcherHost = "ReplicatorSv1.GetDispatcherHost" - ReplicatorSv1GetAccountProfile = "ReplicatorSv1.GetAccountProfile" + ReplicatorSv1GetAccount = "ReplicatorSv1.GetAccount" ReplicatorSv1GetItemLoadIDs = "ReplicatorSv1.GetItemLoadIDs" ReplicatorSv1SetThresholdProfile = "ReplicatorSv1.SetThresholdProfile" ReplicatorSv1SetThreshold = "ReplicatorSv1.SetThreshold" @@ -1140,7 +1139,7 @@ const ( ReplicatorSv1SetDispatcherProfile = "ReplicatorSv1.SetDispatcherProfile" ReplicatorSv1SetRateProfile = "ReplicatorSv1.SetRateProfile" ReplicatorSv1SetActionProfile = "ReplicatorSv1.SetActionProfile" - ReplicatorSv1SetAccountProfile = "ReplicatorSv1.SetAccountProfile" + ReplicatorSv1SetAccount = "ReplicatorSv1.SetAccount" ReplicatorSv1SetDispatcherHost = "ReplicatorSv1.SetDispatcherHost" ReplicatorSv1SetLoadIDs = "ReplicatorSv1.SetLoadIDs" ReplicatorSv1RemoveThreshold = "ReplicatorSv1.RemoveThreshold" @@ -1160,7 +1159,7 @@ const ( ReplicatorSv1RemoveRateProfile = "ReplicatorSv1.RemoveRateProfile" ReplicatorSv1RemoveActionProfile = "ReplicatorSv1.RemoveActionProfile" ReplicatorSv1RemoveDispatcherHost = "ReplicatorSv1.RemoveDispatcherHost" - ReplicatorSv1RemoveAccountProfile = "ReplicatorSv1.RemoveAccountProfile" + ReplicatorSv1RemoveAccount = "ReplicatorSv1.RemoveAccount" ReplicatorSv1GetIndexes = "ReplicatorSv1.GetIndexes" ReplicatorSv1SetIndexes = "ReplicatorSv1.SetIndexes" ReplicatorSv1RemoveIndexes = "ReplicatorSv1.RemoveIndexes" @@ -1273,15 +1272,15 @@ const ( APIerSv1SetTPRateProfile = "APIerSv1.SetTPRateProfile" APIerSv1GetTPRateProfileIds = "APIerSv1.GetTPRateProfileIds" APIerSv1RemoveTPRateProfile = "APIerSv1.RemoveTPRateProfile" - APIerSv1SetAccountProfile = "APIerSv1.SetAccountProfile" - APIerSv1GetAccountProfile = "APIerSv1.GetAccountProfile" - APIerSv1GetAccountProfileIDs = "APIerSv1.GetAccountProfileIDs" - APIerSv1RemoveAccountProfile = "APIerSv1.RemoveAccountProfile" - APIerSv1GetAccountProfileIDsCount = "APIerSv1.GetAccountProfileIDsCount" - APIerSv1GetTPAccountProfileIDs = "APIerSv1.GetTPAccountProfileIDs" - APIerSv1GetTPAccountProfile = "APIerSv1.GetTPAccountProfile" - APIerSv1SetTPAccountProfile = "APIerSv1.SetTPAccountProfile" - APIerSv1RemoveTPAccountProfile = "APIerSv1.RemoveTPAccountProfile" + APIerSv1SetAccount = "APIerSv1.SetAccount" + APIerSv1GetAccount = "APIerSv1.GetAccount" + APIerSv1GetAccountIDs = "APIerSv1.GetAccountIDs" + APIerSv1RemoveAccount = "APIerSv1.RemoveAccount" + APIerSv1GetAccountIDsCount = "APIerSv1.GetAccountIDsCount" + APIerSv1GetTPAccountIDs = "APIerSv1.GetTPAccountIDs" + APIerSv1GetTPAccount = "APIerSv1.GetTPAccount" + APIerSv1SetTPAccount = "APIerSv1.SetTPAccount" + APIerSv1RemoveTPAccount = "APIerSv1.RemoveTPAccount" ) // APIerSv1 TP APIs @@ -1341,15 +1340,15 @@ const ( ) const ( - AccountSv1 = "AccountSv1" - AccountSv1Ping = "AccountSv1.Ping" - AccountSv1AccountProfilesForEvent = "AccountSv1.AccountProfilesForEvent" - AccountSv1MaxAbstracts = "AccountSv1.MaxAbstracts" - AccountSv1DebitAbstracts = "AccountSv1.DebitAbstracts" - AccountSv1MaxConcretes = "AccountSv1.MaxConcretes" - AccountSv1DebitConcretes = "AccountSv1.DebitConcretes" - AccountSv1ActionSetBalance = "AccountSv1.ActionSetBalance" - AccountSv1ActionRemoveBalance = "AccountSv1.ActionRemoveBalance" + AccountSv1 = "AccountSv1" + AccountSv1Ping = "AccountSv1.Ping" + AccountSv1AccountsForEvent = "AccountSv1.AccountsForEvent" + AccountSv1MaxAbstracts = "AccountSv1.MaxAbstracts" + AccountSv1DebitAbstracts = "AccountSv1.DebitAbstracts" + AccountSv1MaxConcretes = "AccountSv1.MaxConcretes" + AccountSv1DebitConcretes = "AccountSv1.DebitConcretes" + AccountSv1ActionSetBalance = "AccountSv1.ActionSetBalance" + AccountSv1ActionRemoveBalance = "AccountSv1.ActionRemoveBalance" ) const ( @@ -1611,7 +1610,7 @@ const ( DispatcherHostsCsv = "DispatcherHosts.csv" RateProfilesCsv = "RateProfiles.csv" ActionProfilesCsv = "ActionProfiles.csv" - AccountProfilesCsv = "AccountProfiles.csv" + AccountsCsv = "Accounts.csv" ) // Table Name @@ -1633,59 +1632,59 @@ const ( TBLTPDispatcherHosts = "tp_dispatcher_hosts" TBLTPRateProfiles = "tp_rate_profiles" TBLTPActionProfiles = "tp_action_profiles" - TBLTPAccountProfiles = "tp_account_profiles" + TBLTPAccounts = "tp_accounts" ) // Cache Name const ( - CacheDestinations = "*destinations" - CacheReverseDestinations = "*reverse_destinations" - CacheResources = "*resources" - CacheResourceProfiles = "*resource_profiles" - CacheTimings = "*timings" - CacheEventResources = "*event_resources" - CacheStatQueueProfiles = "*statqueue_profiles" - CacheStatQueues = "*statqueues" - CacheThresholdProfiles = "*threshold_profiles" - CacheThresholds = "*thresholds" - CacheFilters = "*filters" - CacheRouteProfiles = "*route_profiles" - CacheAttributeProfiles = "*attribute_profiles" - CacheChargerProfiles = "*charger_profiles" - CacheDispatcherProfiles = "*dispatcher_profiles" - CacheDispatcherHosts = "*dispatcher_hosts" - CacheDispatchers = "*dispatchers" - CacheDispatcherRoutes = "*dispatcher_routes" - CacheDispatcherLoads = "*dispatcher_loads" - CacheRateProfiles = "*rate_profiles" - CacheActionProfiles = "*action_profiles" - CacheAccountProfiles = "*account_profiles" - CacheResourceFilterIndexes = "*resource_filter_indexes" - CacheStatFilterIndexes = "*stat_filter_indexes" - CacheThresholdFilterIndexes = "*threshold_filter_indexes" - CacheRouteFilterIndexes = "*route_filter_indexes" - CacheAttributeFilterIndexes = "*attribute_filter_indexes" - CacheChargerFilterIndexes = "*charger_filter_indexes" - CacheDispatcherFilterIndexes = "*dispatcher_filter_indexes" - CacheDiameterMessages = "*diameter_messages" - CacheRPCResponses = "*rpc_responses" - CacheClosedSessions = "*closed_sessions" - CacheRateProfilesFilterIndexes = "*rate_profile_filter_indexes" - CacheActionProfilesFilterIndexes = "*action_profile_filter_indexes" - CacheAccountProfilesFilterIndexes = "*account_profile_filter_indexes" - CacheRateFilterIndexes = "*rate_filter_indexes" - MetaPrecaching = "*precaching" - MetaReady = "*ready" - CacheLoadIDs = "*load_ids" - CacheRPCConnections = "*rpc_connections" - CacheCDRIDs = "*cdr_ids" - CacheUCH = "*uch" - CacheSTIR = "*stir" - CacheEventCharges = "*event_charges" - CacheReverseFilterIndexes = "*reverse_filter_indexes" - CacheVersions = "*versions" - CacheCapsEvents = "*caps_events" - CacheReplicationHosts = "*replication_hosts" + CacheDestinations = "*destinations" + CacheReverseDestinations = "*reverse_destinations" + CacheResources = "*resources" + CacheResourceProfiles = "*resource_profiles" + CacheTimings = "*timings" + CacheEventResources = "*event_resources" + CacheStatQueueProfiles = "*statqueue_profiles" + CacheStatQueues = "*statqueues" + CacheThresholdProfiles = "*threshold_profiles" + CacheThresholds = "*thresholds" + CacheFilters = "*filters" + CacheRouteProfiles = "*route_profiles" + CacheAttributeProfiles = "*attribute_profiles" + CacheChargerProfiles = "*charger_profiles" + CacheDispatcherProfiles = "*dispatcher_profiles" + CacheDispatcherHosts = "*dispatcher_hosts" + CacheDispatchers = "*dispatchers" + CacheDispatcherRoutes = "*dispatcher_routes" + CacheDispatcherLoads = "*dispatcher_loads" + CacheRateProfiles = "*rate_profiles" + CacheActionProfiles = "*action_profiles" + CacheAccounts = "*accounts" + CacheResourceFilterIndexes = "*resource_filter_indexes" + CacheStatFilterIndexes = "*stat_filter_indexes" + CacheThresholdFilterIndexes = "*threshold_filter_indexes" + CacheRouteFilterIndexes = "*route_filter_indexes" + CacheAttributeFilterIndexes = "*attribute_filter_indexes" + CacheChargerFilterIndexes = "*charger_filter_indexes" + CacheDispatcherFilterIndexes = "*dispatcher_filter_indexes" + CacheDiameterMessages = "*diameter_messages" + CacheRPCResponses = "*rpc_responses" + CacheClosedSessions = "*closed_sessions" + CacheRateProfilesFilterIndexes = "*rate_profile_filter_indexes" + CacheActionProfilesFilterIndexes = "*action_profile_filter_indexes" + CacheAccountsFilterIndexes = "*account_filter_indexes" + CacheRateFilterIndexes = "*rate_filter_indexes" + MetaPrecaching = "*precaching" + MetaReady = "*ready" + CacheLoadIDs = "*load_ids" + CacheRPCConnections = "*rpc_connections" + CacheCDRIDs = "*cdr_ids" + CacheUCH = "*uch" + CacheSTIR = "*stir" + CacheEventCharges = "*event_charges" + CacheReverseFilterIndexes = "*reverse_filter_indexes" + CacheVersions = "*versions" + CacheCapsEvents = "*caps_events" + CacheReplicationHosts = "*replication_hosts" // storDB CacheTBLTPTimings = "*tp_timings" @@ -1703,7 +1702,7 @@ const ( CacheTBLTPDispatcherHosts = "*tp_dispatcher_hosts" CacheTBLTPRateProfiles = "*tp_rate_profiles" CacheTBLTPActionProfiles = "*tp_action_profiles" - CacheTBLTPAccountProfiles = "*tp_account_profiles" + CacheTBLTPAccounts = "*tp_accounts" ) // Prefix for indexing @@ -1719,7 +1718,7 @@ const ( RateProfilesFilterIndexPrfx = "rpi_" RateFilterIndexPrfx = "rri_" ActionProfilesFilterIndexPrfx = "aci_" - AccountProfileFilterIndexPrfx = "ani_" + AccountFilterIndexPrfx = "ani_" FilterIndexPrfx = "fii_" ) @@ -2304,36 +2303,36 @@ const ( // ArgCache constats const ( - DestinationIDs = "DestinationIDs" - ReverseDestinationIDs = "ReverseDestinationIDs" - ResourceProfileIDs = "ResourceProfileIDs" - ResourceIDs = "ResourceIDs" - StatsQueueIDs = "StatsQueueIDs" - StatsQueueProfileIDs = "StatsQueueProfileIDs" - ThresholdIDs = "ThresholdIDs" - ThresholdProfileIDs = "ThresholdProfileIDs" - FilterIDs = "FilterIDs" - RouteProfileIDs = "RouteProfileIDs" - AttributeProfileIDs = "AttributeProfileIDs" - ChargerProfileIDs = "ChargerProfileIDs" - DispatcherProfileIDs = "DispatcherProfileIDs" - DispatcherHostIDs = "DispatcherHostIDs" - DispatcherRoutesIDs = "DispatcherRoutesIDs" - RateProfileIDs = "RateProfileIDs" - ActionProfileIDs = "ActionProfileIDs" - TimingIDs = "TimingIDs" - AttributeFilterIndexIDs = "AttributeFilterIndexIDs" - ResourceFilterIndexIDs = "ResourceFilterIndexIDs" - StatFilterIndexIDs = "StatFilterIndexIDs" - ThresholdFilterIndexIDs = "ThresholdFilterIndexIDs" - RouteFilterIndexIDs = "RouteFilterIndexIDs" - ChargerFilterIndexIDs = "ChargerFilterIndexIDs" - DispatcherFilterIndexIDs = "DispatcherFilterIndexIDs" - RateProfilesFilterIndexIDs = "RateProfilesFilterIndexIDs" - RateFilterIndexIDs = "RateFilterIndexIDs" - ActionProfilesFilterIndexIDs = "ActionProfilesFilterIndexIDs" - AccountProfilesFilterIndexIDs = "AccountProfilesFilterIndexIDs" - FilterIndexIDs = "FilterIndexIDs" + DestinationIDs = "DestinationIDs" + ReverseDestinationIDs = "ReverseDestinationIDs" + ResourceProfileIDs = "ResourceProfileIDs" + ResourceIDs = "ResourceIDs" + StatsQueueIDs = "StatsQueueIDs" + StatsQueueProfileIDs = "StatsQueueProfileIDs" + ThresholdIDs = "ThresholdIDs" + ThresholdProfileIDs = "ThresholdProfileIDs" + FilterIDs = "FilterIDs" + RouteProfileIDs = "RouteProfileIDs" + AttributeProfileIDs = "AttributeProfileIDs" + ChargerProfileIDs = "ChargerProfileIDs" + DispatcherProfileIDs = "DispatcherProfileIDs" + DispatcherHostIDs = "DispatcherHostIDs" + DispatcherRoutesIDs = "DispatcherRoutesIDs" + RateProfileIDs = "RateProfileIDs" + ActionProfileIDs = "ActionProfileIDs" + TimingIDs = "TimingIDs" + AttributeFilterIndexIDs = "AttributeFilterIndexIDs" + ResourceFilterIndexIDs = "ResourceFilterIndexIDs" + StatFilterIndexIDs = "StatFilterIndexIDs" + ThresholdFilterIndexIDs = "ThresholdFilterIndexIDs" + RouteFilterIndexIDs = "RouteFilterIndexIDs" + ChargerFilterIndexIDs = "ChargerFilterIndexIDs" + DispatcherFilterIndexIDs = "DispatcherFilterIndexIDs" + RateProfilesFilterIndexIDs = "RateProfilesFilterIndexIDs" + RateFilterIndexIDs = "RateFilterIndexIDs" + ActionProfilesFilterIndexIDs = "ActionProfilesFilterIndexIDs" + AccountsFilterIndexIDs = "AccountsFilterIndexIDs" + FilterIndexIDs = "FilterIndexIDs" ) // Poster and Event reader constants