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

Merge pull request #1880 from Trial97/master

Browse Source 
Updated AttributeS and FilterS structure
This commit is contained in:
Dan Christian Bogos
2020-01-20 17:29:21 +01:00
committed by GitHub
parent e890884fc5 b34821c4cc
commit ed771248cb
116 changed files with 1949 additions and 1388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utils/apitpdata.go
View File

@@ -1077,11 +1077,11 @@ type TPFilterProfile struct {
ActivationInterval *TPActivationInterval // Time when this limit becomes active and expires
}
// TPFilterProfile is used in TPFilterProfile
// TPFilter is used in TPFilterProfile
type TPFilter struct {
Type string // Filter type (*string, *timing, *rsr_filters, *cdr_stats)
FieldName string // Name of the field providing us the Values to check (used in case of some )
Values []string // Filter definition
Type string // Filter type (*string, *timing, *rsr_filters, *cdr_stats)
Element string // Name of the field providing us the Values to check (used in case of some )
Values []string // Filter definition
}
// TPSupplier is used in TPSupplierProfile
@@ -1113,7 +1113,7 @@ type TPSupplierProfile struct {
// TPAttribute is used in TPAttributeProfile
type TPAttribute struct {
FilterIDs []string
FieldName string
Path string
Type string
Value string
}

12
utils/apitpdata_test.go
View File

@@ -797,7 +797,7 @@ func TestAppendToSMCostFilter(t *testing.T) {
expected := &SMCostFilter{
CGRIDs: []string{"CGRID1", "CGRID2"},
}
if smfltr, err = AppendToSMCostFilter(smfltr, "*string", DynamicDataPrefix+CGRID, []string{"CGRID1", "CGRID2"}, ""); err != nil {
if smfltr, err = AppendToSMCostFilter(smfltr, MetaString, DynamicDataPrefix+CGRID, []string{"CGRID1", "CGRID2"}, ""); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(smfltr, expected) {
t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
@@ -810,7 +810,7 @@ func TestAppendToSMCostFilter(t *testing.T) {
}
expected.RunIDs = []string{"RunID1", "RunID2"}
if smfltr, err = AppendToSMCostFilter(smfltr, "*string", DynamicDataPrefix+RunID, []string{"RunID1", "RunID2"}, ""); err != nil {
if smfltr, err = AppendToSMCostFilter(smfltr, MetaString, DynamicDataPrefix+RunID, []string{"RunID1", "RunID2"}, ""); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(smfltr, expected) {
t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
@@ -823,7 +823,7 @@ func TestAppendToSMCostFilter(t *testing.T) {
}
expected.OriginHosts = []string{"OriginHost1", "OriginHost2"}
if smfltr, err = AppendToSMCostFilter(smfltr, "*string", DynamicDataPrefix+OriginHost, []string{"OriginHost1", "OriginHost2"}, ""); err != nil {
if smfltr, err = AppendToSMCostFilter(smfltr, MetaString, DynamicDataPrefix+OriginHost, []string{"OriginHost1", "OriginHost2"}, ""); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(smfltr, expected) {
t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
@@ -836,7 +836,7 @@ func TestAppendToSMCostFilter(t *testing.T) {
}
expected.OriginIDs = []string{"OriginID1", "OriginID2"}
if smfltr, err = AppendToSMCostFilter(smfltr, "*string", DynamicDataPrefix+OriginID, []string{"OriginID1", "OriginID2"}, ""); err != nil {
if smfltr, err = AppendToSMCostFilter(smfltr, MetaString, DynamicDataPrefix+OriginID, []string{"OriginID1", "OriginID2"}, ""); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(smfltr, expected) {
t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
@@ -849,7 +849,7 @@ func TestAppendToSMCostFilter(t *testing.T) {
}
expected.CostSources = []string{"CostSource1", "CostSource2"}
if smfltr, err = AppendToSMCostFilter(smfltr, "*string", DynamicDataPrefix+CostSource, []string{"CostSource1", "CostSource2"}, ""); err != nil {
if smfltr, err = AppendToSMCostFilter(smfltr, MetaString, DynamicDataPrefix+CostSource, []string{"CostSource1", "CostSource2"}, ""); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(smfltr, expected) {
t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
@@ -891,7 +891,7 @@ func TestAppendToSMCostFilter(t *testing.T) {
if !reflect.DeepEqual(smfltr, expected) {
t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
}
if smfltr, err = AppendToSMCostFilter(smfltr, "*string", CGRID, []string{"CGRID1", "CGRID2"}, ""); err == nil || err.Error() != "FieldName: \"CGRID\" not supported" {
if smfltr, err = AppendToSMCostFilter(smfltr, MetaString, CGRID, []string{"CGRID1", "CGRID2"}, ""); err == nil || err.Error() != "FieldName: \"CGRID\" not supported" {
t.Errorf("Expected error: FieldName: \"CGRID\" not supported ,received %v", err)
}
if !reflect.DeepEqual(smfltr, expected) {

1
utils/consts.go
View File

@@ -502,6 +502,7 @@ const (
CGR_ACD = "cgr_acd"
FilterIDs = "FilterIDs"
FieldName = "FieldName"
Path = "Path"
MetaRound = "*round"
Pong = "Pong"
MetaEventCost = "*event_cost"