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

Upgrade Attribute version and revisit fixed conflicts

Browse Source
This commit is contained in:
ionutboangiu
2021-05-20 08:36:23 +03:00
committed by Dan Christian Bogos
parent 6e24b6ca4b
commit 546c5f6035
5 changed files with 86 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apis/libadmin.go
View File

@@ -291,18 +291,6 @@ func composeCacheArgsForFilter(dm *engine.DataManager, ctx *context.Context, flt
args[cField] = append(args[cField], utils.ConcatenatedKey(tnt, indx))
}
}
// case utils.CacheAttributeFilterIndexes: // this is slow
// for attrID := range ids {
// var attr *engine.AttributeProfile
// if attr, err = dm.GetAttributeProfile(ctx, tnt, attrID, true, true, utils.NonTransactional); err != nil {
// return
// }
// for _, ctx := range attr.Contexts {
// for _, indx := range indxIDs {
// args[utils.AttributeFilterIndexIDs] = append(args[utils.AttributeFilterIndexIDs], utils.ConcatenatedKey(tnt, ctx, indx))
// }
// }
// }
case utils.CacheDispatcherFilterIndexes: // this is slow
for attrID := range ids {
var attr *engine.DispatcherProfile

157
apis/libadmin_test.go
View File

@@ -18,77 +18,88 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
package apis
// func TestCallCacheForFilter(t *testing.T) {
// cfg := config.NewDefaultCGRConfig()
// dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true), cfg.CacheCfg(), nil)
// tnt := "cgrates.org"
// flt := &engine.Filter{
// Tenant: tnt,
// ID: "FLTR1",
// Rules: []*engine.FilterRule{{
// Type: utils.MetaString,
// Element: "~*req.Account",
// Values: []string{"1001"},
// }},
// }
// if err := flt.Compile(); err != nil {
// t.Fatal(err)
// }
// if err := dm.SetFilter(context.TODO(), flt, true); err != nil {
// t.Fatal(err)
// }
// th := &engine.ThresholdProfile{
// Tenant: tnt,
// ID: "TH1",
// FilterIDs: []string{flt.ID},
// }
// if err := dm.SetThresholdProfile(th, true); err != nil {
// t.Fatal(err)
// }
// attr := &engine.AttributeProfile{
// Tenant: tnt,
// ID: "Attr1",
// FilterIDs: []string{flt.ID},
// }
// if err := dm.SetAttributeProfile(context.TODO(), attr, true); err != nil {
// t.Fatal(err)
// }
import (
"reflect"
"testing"
// exp := map[string][]string{
// utils.FilterIDs: {"cgrates.org:FLTR1"},
// utils.AttributeFilterIndexIDs: {"cgrates.org:*any:*string:*req.Account:1001"},
// utils.ThresholdFilterIndexIDs: {"cgrates.org:*string:*req.Account:1001"},
// }
// rpl, err := composeCacheArgsForFilter(dm, context.TODO(), flt, tnt, flt.TenantID(), map[string][]string{utils.FilterIDs: {"cgrates.org:FLTR1"}})
// if err != nil {
// t.Fatal(err)
// } else if !reflect.DeepEqual(rpl, exp) {
// t.Errorf("Expected %s ,received: %s", utils.ToJSON(exp), utils.ToJSON(rpl))
// }
// flt = &engine.Filter{
// Tenant: tnt,
// ID: "FLTR1",
// Rules: []*engine.FilterRule{{
// Type: utils.MetaString,
// Element: "~*req.Account",
// Values: []string{"1002"},
// }},
// }
// if err := flt.Compile(); err != nil {
// t.Fatal(err)
// }
// if err := dm.SetFilter(context.TODO(), flt, true); err != nil {
// t.Fatal(err)
// }
// exp = map[string][]string{
// utils.FilterIDs: {"cgrates.org:FLTR1"},
// utils.AttributeFilterIndexIDs: {"cgrates.org:*any:*string:*req.Account:1001", "cgrates.org:*any:*string:*req.Account:1002"},
// utils.ThresholdFilterIndexIDs: {"cgrates.org:*string:*req.Account:1001", "cgrates.org:*string:*req.Account:1002"},
// }
// rpl, err = composeCacheArgsForFilter(dm, context.TODO(), flt, tnt, flt.TenantID(), rpl)
// if err != nil {
// t.Fatal(err)
// } else if !reflect.DeepEqual(rpl, exp) {
// t.Errorf("Expected %s ,received: %s", utils.ToJSON(exp), utils.ToJSON(rpl))
// }
// }
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
func TestCallCacheForFilter(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true), cfg.CacheCfg(), nil)
tnt := "cgrates.org"
flt := &engine.Filter{
Tenant: tnt,
ID: "FLTR1",
Rules: []*engine.FilterRule{{
Type: utils.MetaString,
Element: "~*req.Account",
Values: []string{"1001"},
}},
}
if err := flt.Compile(); err != nil {
t.Fatal(err)
}
if err := dm.SetFilter(context.TODO(), flt, true); err != nil {
t.Fatal(err)
}
th := &engine.ThresholdProfile{
Tenant: tnt,
ID: "TH1",
FilterIDs: []string{flt.ID},
}
if err := dm.SetThresholdProfile(th, true); err != nil {
t.Fatal(err)
}
dsp := &engine.DispatcherProfile{
Tenant: tnt,
Subsystems: []string{utils.MetaAny},
ID: "Dsp1",
FilterIDs: []string{flt.ID},
}
if err := dm.SetDispatcherProfile(context.TODO(), dsp, true); err != nil {
t.Fatal(err)
}
exp := map[string][]string{
utils.FilterIDs: {"cgrates.org:FLTR1"},
utils.DispatcherFilterIndexIDs: {"cgrates.org:*any:*string:*req.Account:1001"},
utils.ThresholdFilterIndexIDs: {"cgrates.org:*string:*req.Account:1001"},
}
rpl, err := composeCacheArgsForFilter(dm, context.TODO(), flt, tnt, flt.TenantID(), map[string][]string{utils.FilterIDs: {"cgrates.org:FLTR1"}})
if err != nil {
t.Fatal(err)
} else if !reflect.DeepEqual(rpl, exp) {
t.Errorf("Expected %s ,received: %s", utils.ToJSON(exp), utils.ToJSON(rpl))
}
flt = &engine.Filter{
Tenant: tnt,
ID: "FLTR1",
Rules: []*engine.FilterRule{{
Type: utils.MetaString,
Element: "~*req.Account",
Values: []string{"1002"},
}},
}
if err := flt.Compile(); err != nil {
t.Fatal(err)
}
if err := dm.SetFilter(context.TODO(), flt, true); err != nil {
t.Fatal(err)
}
exp = map[string][]string{
utils.FilterIDs: {"cgrates.org:FLTR1"},
utils.DispatcherFilterIndexIDs: {"cgrates.org:*any:*string:*req.Account:1001", "cgrates.org:*any:*string:*req.Account:1002"},
utils.ThresholdFilterIndexIDs: {"cgrates.org:*string:*req.Account:1001", "cgrates.org:*string:*req.Account:1002"},
}
rpl, err = composeCacheArgsForFilter(dm, context.TODO(), flt, tnt, flt.TenantID(), rpl)
if err != nil {
t.Fatal(err)
} else if !reflect.DeepEqual(rpl, exp) {
t.Errorf("Expected %s ,received: %s", utils.ToJSON(exp), utils.ToJSON(rpl))
}
}

1
apis/rates_test.go
View File

@@ -594,7 +594,6 @@ func TestApisRateCostForEvent(t *testing.T) {
CGREvent: &utils.CGREvent{
Tenant: "tenant",
ID: "ID",
Time: nil,
Event: nil,
APIOpts: nil,
},

2
engine/version.go
View File

@@ -145,7 +145,7 @@ func CurrentDataDBVersions() Versions {
utils.Actions: 2,
utils.Thresholds: 4,
utils.Routes: 2,
utils.Attributes: 6,
utils.Attributes: 7,
utils.RQF: 5,
utils.Resource: 1,
utils.Subscribers: 1,

2
engine/version_test.go
View File

@@ -73,7 +73,7 @@ func TestVersionCompare(t *testing.T) {
func TestCurrentDBVersions(t *testing.T) {
expVersDataDB := Versions{
utils.StatS: 4, utils.Accounts: 3, utils.Actions: 2,
utils.Thresholds: 4, utils.Routes: 2, utils.Attributes: 6,
utils.Thresholds: 4, utils.Routes: 2, utils.Attributes: 7,
utils.RQF: 5, utils.Resource: 1,
utils.Subscribers: 1,
utils.Chargers: 2,