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

One filter in tp_reader

Browse Source
This commit is contained in:
TeoV
2017-10-24 15:00:49 +03:00
committed by Dan Christian Bogos
parent 7a78d074c4
commit 3b880c8c8b
2 changed files with 15 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
engine/loader_csv_test.go
View File

@@ -1509,7 +1509,7 @@ func TestLoadThresholdProfiles(t *testing.T) {
}
}
func TestLoadFilterProfiles(t *testing.T) {
func TestLoadFilters(t *testing.T) {
eFilters := map[string]map[string]*utils.TPFilter{
"cgrates.org": map[string]*utils.TPFilter{
"FLTR_1": &utils.TPFilter{
@@ -1584,10 +1584,10 @@ func TestLoadFilterProfiles(t *testing.T) {
},
},
}
if len(csvr.flProfiles["cgrates.org"]) != len(eFilters["cgrates.org"]) {
t.Errorf("Failed to load FilterProfiles: %s", utils.ToIJSON(csvr.flProfiles))
} else if !reflect.DeepEqual(eFilters["cgrates.org"]["FLTR_1"], csvr.flProfiles["cgrates.org"]["FLTR_1"]) {
t.Errorf("Expecting: %+v, received: %+v", eFilters["cgrates.org"]["FLTR_1"], csvr.flProfiles["cgrates.org"]["FLTR_1"])
if len(csvr.filters["cgrates.org"]) != len(eFilters["cgrates.org"]) {
t.Errorf("Failed to load FilterProfiles: %s", utils.ToIJSON(csvr.filters))
} else if !reflect.DeepEqual(eFilters["cgrates.org"]["FLTR_1"], csvr.filters["cgrates.org"]["FLTR_1"]) {
t.Errorf("Expecting: %+v, received: %+v", eFilters["cgrates.org"]["FLTR_1"], csvr.filters["cgrates.org"]["FLTR_1"])
}
}
@@ -1637,27 +1637,3 @@ func TestLoadThresholds(t *testing.T) {
t.Errorf("Expecting: %+v, received: %+v", eThresholds, csvr.thresholds)
}
}
func TestLoadFilters(t *testing.T) {
eFilters := []*utils.TenantID{
&utils.TenantID{
Tenant: "cgrates.org",
ID: "FLTR_1",
},
&utils.TenantID{
Tenant: "cgrates.org",
ID: "FLTR_ACNT_dan",
},
&utils.TenantID{
Tenant: "cgrates.org",
ID: "FLTR_DST_DE",
},
&utils.TenantID{
Tenant: "cgrates.org",
ID: "FLTR_DST_NL",
},
}
if len(csvr.filters) != len(eFilters) {
t.Errorf("Failed to load filters: %s", utils.ToIJSON(csvr.filters))
}
}

42
engine/tp_reader.go
View File

@@ -57,11 +57,10 @@ type TpReader struct {
resProfiles map[string]map[string]*utils.TPResource
sqProfiles map[string]map[string]*utils.TPStats
thProfiles map[string]map[string]*utils.TPThreshold
flProfiles map[string]map[string]*utils.TPFilter
filters map[string]map[string]*utils.TPFilter
resources []*utils.TenantID // IDs of resources which need creation based on resourceProfiles
statQueues []*utils.TenantID // IDs of statQueues which need creation based on statQueueProfiles
thresholds []*utils.TenantID // IDs of thresholds which need creation based on thresholdProfiles
filters []*utils.TenantID
revDests,
revAliases,
acntActionPlans map[string][]string
@@ -136,7 +135,7 @@ func (tpr *TpReader) Init() {
tpr.resProfiles = make(map[string]map[string]*utils.TPResource)
tpr.sqProfiles = make(map[string]map[string]*utils.TPStats)
tpr.thProfiles = make(map[string]map[string]*utils.TPThreshold)
tpr.flProfiles = make(map[string]map[string]*utils.TPFilter)
tpr.filters = make(map[string]map[string]*utils.TPFilter)
tpr.revDests = make(map[string][]string)
tpr.revAliases = make(map[string][]string)
tpr.acntActionPlans = make(map[string][]string)
@@ -1701,17 +1700,7 @@ func (tpr *TpReader) LoadFilterFiltered(tag string) error {
}
mapTHs[th.Tenant][th.ID] = th
}
tpr.flProfiles = mapTHs
for tenant, mpID := range mapTHs {
for thID := range mpID {
thTntID := &utils.TenantID{Tenant: tenant, ID: thID}
if has, err := tpr.dm.DataDB().HasData(utils.FilterPrefix, thTntID.TenantID()); err != nil {
return err
} else if !has {
tpr.filters = append(tpr.filters, thTntID)
}
}
}
tpr.filters = mapTHs
return nil
}
@@ -2106,9 +2095,9 @@ func (tpr *TpReader) WriteToDatabase(flush, verbose, disable_reverse bool) (err
}
}
if verbose {
log.Print("FilterProfile:")
log.Print("Filters:")
}
for _, mpID := range tpr.flProfiles {
for _, mpID := range tpr.filters {
for _, tpTH := range mpID {
th, err := APItoFilter(tpTH, tpr.timezone)
if err != nil {
@@ -2122,17 +2111,6 @@ func (tpr *TpReader) WriteToDatabase(flush, verbose, disable_reverse bool) (err
}
}
}
if verbose {
log.Print("Filters:")
}
for _, thd := range tpr.filters {
if err = tpr.dm.SetFilter(&Filter{Tenant: thd.Tenant, ID: thd.ID}); err != nil {
return err
}
if verbose {
log.Print("\t", thd.TenantID())
}
}
if verbose {
log.Print("Timings:")
}
@@ -2243,11 +2221,11 @@ func (tpr *TpReader) WriteToDatabase(flush, verbose, disable_reverse bool) (err
}
}
*/
if len(tpr.flProfiles) > 0 {
if len(tpr.filters) > 0 {
if verbose {
log.Print("Indexing Filters")
}
for tenant, mpID := range tpr.flProfiles {
for tenant, mpID := range tpr.filters {
stIdxr, err := NewReqFilterIndexer(tpr.dm, utils.FilterIndex+tenant)
if err != nil {
return err
@@ -2335,7 +2313,7 @@ func (tpr *TpReader) ShowStatistics() {
// thresholds
log.Print("Thresholds: ", len(tpr.thProfiles))
// filters
log.Print("Filters: ", len(tpr.flProfiles))
log.Print("Filters: ", len(tpr.filters))
}
// Returns the identities loaded for a specific category, useful for cache reloads
@@ -2486,9 +2464,9 @@ func (tpr *TpReader) GetLoadedIds(categ string) ([]string, error) {
}
return keys, nil
case utils.FilterPrefix:
keys := make([]string, len(tpr.flProfiles))
keys := make([]string, len(tpr.filters))
i := 0
for k := range tpr.flProfiles {
for k := range tpr.filters {
keys[i] = k
i++
}