Adding Account and User attributes to tutorial/Users.csv, removing .Debug through code

This commit is contained in:
DanB
2015-07-31 18:14:08 +02:00
parent 8e997f0024
commit 679b89d49b
3 changed files with 5 additions and 3 deletions

View File

@@ -2,7 +2,11 @@
cgrates.org,1001,SysUserName,danb
cgrates.org,1001,SysPassword,hisPass321
cgrates.org,1001,Cli,+4986517174963
cgrates.org,1001,Account,1001
cgrates.org,1001,Subject,1001
cgrates.org,1001,Uuid,388539dfd4f5cefee8f488b78c6c244b9e19138e
cgrates.org,1002,SysUserName,rif
cgrates.org,1002,RifAttr,RifVal
cgrates.org,1002,Account,1002
cgrates.org,1002,Subject,1002
cgrates.org,1002,Uuid,27f37edec0670fa34cf79076b80ef5021e39c5b5
1 #Tenant[0] UserName[1] AttributeName[2] AttributeValue[3]
2 cgrates.org 1001 SysUserName danb
3 cgrates.org 1001 SysPassword hisPass321
4 cgrates.org 1001 Cli +4986517174963
5 cgrates.org 1001 Account 1001
6 cgrates.org 1001 Subject 1001
7 cgrates.org 1001 Uuid 388539dfd4f5cefee8f488b78c6c244b9e19138e
8 cgrates.org 1002 SysUserName rif
9 cgrates.org 1002 RifAttr RifVal
10 cgrates.org 1002 Account 1002
11 cgrates.org 1002 Subject 1002
12 cgrates.org 1002 Uuid 27f37edec0670fa34cf79076b80ef5021e39c5b5

View File

@@ -56,14 +56,12 @@ func (rs *Responder) GetCost(arg *CallDescriptor, reply *CallCost) (err error) {
if arg.Subject == "" {
arg.Subject = arg.Account
}
Logger.Debug(fmt.Sprintf("CD before load user profile: %+v, count: %d", arg, rs.cnt))
if upData, err := LoadUserProfile(arg, "ExtraFields"); err != nil {
return err
} else {
udRcv := upData.(*CallDescriptor)
*arg = *udRcv
}
Logger.Debug(fmt.Sprintf("CD after load user profile: %+v, count: %d", arg, rs.cnt))
if rs.Bal != nil {
r, e := rs.getCallCost(arg, "Responder.GetCost")
*reply, err = *r, e

View File

@@ -117,7 +117,7 @@ func TestTutLocalCacheStats(t *testing.T) {
}
var rcvStats *utils.CacheStats
expectedStats := &utils.CacheStats{Destinations: 4, RatingPlans: 3, RatingProfiles: 8, Actions: 7, SharedGroups: 1, RatingAliases: 1, AccountAliases: 1,
DerivedChargers: 1, LcrProfiles: 4, CdrStats: 6}
DerivedChargers: 1, LcrProfiles: 4, CdrStats: 6, Users: 2}
var args utils.AttrCacheStats
if err := tutLocalRpc.Call("ApierV1.GetCacheStats", args, &rcvStats); err != nil {
t.Error("Got error on ApierV1.GetCacheStats: ", err.Error())