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

Migrator for derived charging - removing hardcoded *destination

Browse Source
This commit is contained in:
DanB
2019-03-08 09:58:16 +01:00
parent 32efd573da
commit b41fee2bab
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
migrator/derived_chargers.go
View File

@@ -143,7 +143,7 @@ func (m *Migrator) derivedChargers2Chargers(dck *v1DerivedChargersWithKey) (err
skey := utils.SplitConcatenatedKey(dck.Key)
destination := ""
if len(dck.Value.DestinationIDs) != 0 {
destination = "*destination:~Destination:"
destination = fmt.Sprintf("%s:~%s:", utils.MetaDestinations, utils.Destination)
keys := dcGetMapKeys(dck.Value.DestinationIDs)
destination += strings.Join(keys, utils.INFIELD_SEP)
}
@@ -153,15 +153,14 @@ func (m *Migrator) derivedChargers2Chargers(dck *v1DerivedChargersWithKey) (err
filter = append(filter, destination)
}
if len(skey[2]) != 0 && skey[2] != utils.META_ANY {
filter = append(filter, "*string:~Category:"+skey[2])
filter = append(filter, fmt.Sprintf("%s:~%s:%s", utils.MetaString, utils.Category, skey[2]))
}
if len(skey[3]) != 0 && skey[3] != utils.META_ANY {
filter = append(filter, "*string:~Account:"+skey[3])
filter = append(filter, fmt.Sprintf("%s:~%s:%s", utils.MetaString, utils.Account, skey[3]))
}
if len(skey[4]) != 0 && skey[4] != utils.META_ANY {
filter = append(filter, "*string:~Subject:"+skey[4])
filter = append(filter, fmt.Sprintf("%s:~%s:%s", utils.MetaString, utils.Subject, skey[4]))
}
for i, dc := range dck.Value.Chargers {
attr := derivedChargers2AttributeProfile(dc, skey[1], fmt.Sprintf("%s_%v", dck.Key, i), filter)
ch := derivedChargers2Charger(dc, skey[1], fmt.Sprintf("%s_%v", dck.Key, i), filter)

4
migrator/derived_chargers_it_test.go
View File

@@ -162,7 +162,7 @@ func testDCITMigrateAndMove(t *testing.T) {
ID: fmt.Sprintf("%s_%v", derivch.Key, 0),
Contexts: []string{utils.META_ANY},
FilterIDs: []string{
"*destination:~Destination:1001;1002;1003",
"*destinations:~Destination:1001;1002;1003",
"*string:~Account:1003",
},
ActivationInterval: nil,
@@ -184,7 +184,7 @@ func testDCITMigrateAndMove(t *testing.T) {
Tenant: defaultTenant,
ID: fmt.Sprintf("%s_%v", derivch.Key, 0),
FilterIDs: []string{
"*destination:~Destination:1001;1002;1003",
"*destinations:~Destination:1001;1002;1003",
"*string:~Account:1003",
"*rsr::~filterhdr1:s/(.+)/special_run3/",
},