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

ApierV1.LoadTariffPlanFromFolder fix for shared groups load

Browse Source
This commit is contained in:
DanB
2015-03-14 10:34:48 +01:00
parent 3d4ffd9dd9
commit 50252c3efc
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
engine/loader_csv.go
View File

@@ -1050,13 +1050,13 @@ func (csvr *CSVReader) LoadAll() error {
func (csvr *CSVReader) GetLoadedIds(categ string) ([]string, error) {
switch categ {
case DESTINATION_PREFIX:
ids := make([]string, len(csvr.destinations))
keys := make([]string, len(csvr.destinations))
i := 0
for k := range csvr.destinations {
ids[i] = k
keys[i] = k
i++
}
return ids, nil
return keys, nil
case RATING_PLAN_PREFIX:
keys := make([]string, len(csvr.ratingPlans))
i := 0
@@ -1121,6 +1121,14 @@ func (csvr *CSVReader) GetLoadedIds(categ string) ([]string, error) {
i++
}
return keys, nil
case SHARED_GROUP_PREFIX:
keys := make([]string, len(csvr.sharedGroups))
i := 0
for k := range csvr.sharedGroups {
keys[i] = k
i++
}
return keys, nil
}
return nil, errors.New("Unsupported category")
}

6
general_tests/tutorial_fs_calls_test.go
View File

@@ -82,7 +82,7 @@ func TestTutFsCallsStartEngine(t *testing.T) {
if !*testCalls {
return
}
if _, err := engine.StartEngine(tutFsCallsCfgPath, 3000); err != nil {
if _, err := engine.StartEngine(tutFsCallsCfgPath, 1000); err != nil {
t.Fatal(err)
}
}
@@ -119,8 +119,8 @@ func TestTutFsCallsStartPjsuaListener(t *testing.T) {
}
var err error
acnts := []*engine.PjsuaAccount{
&engine.PjsuaAccount{Id: "sip:1004@10.10.10.102", Username: "1001", Password: "1234", Realm: "*", Registrar: "sip:10.10.10.102:5060"},
&engine.PjsuaAccount{Id: "sip:1007@10.10.10.102", Username: "1002", Password: "1234", Realm: "*", Registrar: "sip:10.10.10.102:5060"}}
&engine.PjsuaAccount{Id: "sip:1001@10.10.10.102", Username: "1001", Password: "1234", Realm: "*", Registrar: "sip:10.10.10.102:5060"},
&engine.PjsuaAccount{Id: "sip:1002@10.10.10.102", Username: "1002", Password: "1234", Realm: "*", Registrar: "sip:10.10.10.102:5060"}}
if tutFsCallsPjSuaListener, err = engine.StartPjsuaListener(acnts, *waitRater); err != nil {
t.Fatal(err)
}