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

More debug on diameter

Browse Source
This commit is contained in:
DanB
2016-03-14 11:51:04 +01:00
parent e15cfac9e1
commit 6c4b0f0023
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
agents/dmtagent.go
View File

@@ -83,6 +83,7 @@ func (self DiameterAgent) processCCR(ccr *CCR, reqProcessor *config.DARequestPro
utils.Logger.Info(fmt.Sprintf("<DiameterAgent> RequestProcessor: %s", reqProcessor.Id))
utils.Logger.Info(fmt.Sprintf("<DiameterAgent> CCR message: %s", ccr.diamMessage))
}
utils.Logger.Debug(fmt.Sprintf("### DiameterAgent.processCCR: %+v, reqProcessor: %+v, cca: %+v", ccr, reqProcessor, cca))
if cca == nil || !reqProcessor.AppendCCA {
cca = NewBareCCAFromCCR(ccr, self.cgrCfg.DiameterAgentCfg().OriginHost, self.cgrCfg.DiameterAgentCfg().OriginRealm)
}

8
agents/libdmt_test.go
View File

@@ -321,6 +321,7 @@ func TestMessageSetAVPsWithPath(t *testing.T) {
diam.NewAVP(421, avp.Mbit, 0, datatype.Unsigned64(153600)), // "CC-Total-Octets"
},
}),
diam.NewAVP(432, avp.Mbit, 0, datatype.Unsigned32(10)),
},
})
eMessage.NewAVP("Multiple-Services-Credit-Control", avp.Mbit, 0, &diam.GroupedAVP{
@@ -331,6 +332,7 @@ func TestMessageSetAVPsWithPath(t *testing.T) {
diam.NewAVP(421, avp.Mbit, 0, datatype.Unsigned64(143600)), // "CC-Total-Octets"
},
}),
diam.NewAVP(432, avp.Mbit, 0, datatype.Unsigned32(11)), // Rating-Group
},
})
m = diam.NewMessage(diam.CreditControl, diam.RequestFlag, 4, eMessage.Header.HopByHopID, eMessage.Header.EndToEndID, nil)
@@ -340,12 +342,18 @@ func TestMessageSetAVPsWithPath(t *testing.T) {
if err := messageSetAVPsWithPath(m, []interface{}{"Multiple-Services-Credit-Control", "Granted-Service-Unit", "CC-Total-Octets"}, "153600", false, "UTC"); err != nil {
t.Error(err)
}
if err := messageSetAVPsWithPath(m, []interface{}{"Multiple-Services-Credit-Control", "Rating-Group"}, "10", false, "UTC"); err != nil {
t.Error(err)
}
if err := messageSetAVPsWithPath(m, []interface{}{"Multiple-Services-Credit-Control", "Granted-Service-Unit", "CC-Time"}, "2600", true, "UTC"); err != nil {
t.Error(err)
}
if err := messageSetAVPsWithPath(m, []interface{}{"Multiple-Services-Credit-Control", "Granted-Service-Unit", "CC-Total-Octets"}, "143600", false, "UTC"); err != nil {
t.Error(err)
}
if err := messageSetAVPsWithPath(m, []interface{}{"Multiple-Services-Credit-Control", "Rating-Group"}, "11", false, "UTC"); err != nil {
t.Error(err)
}
if fmt.Sprintf("%q", eMessage) != fmt.Sprintf("%q", m) { // test with fmt since reflect.DeepEqual does not perform properly here
t.Errorf("Expecting: %+v, received: %+v", eMessage, m)
}

2
sessionmanager/smg_session.go
View File

@@ -89,7 +89,7 @@ func (self *SMGSession) debit(dur time.Duration, lastUsed time.Duration) (time.D
}
// apply the lastUsed correction
dur += lastUsedCorrection
utils.Logger.Debug(fmt.Sprintf("### After lastUsedCorrection, durationIndex: %v, dur: %v, lastUsed: %v, lastUsedCorrection", self.cd.DurationIndex, dur, lastUsed, lastUsedCorrection))
utils.Logger.Debug(fmt.Sprintf("### After lastUsedCorrection, durationIndex: %+v, dur: %+v, lastUsed: %+v, lastUsedCorrection: %+v", self.cd.DurationIndex, dur, lastUsed, lastUsedCorrection))
// apply correction from previous run
dur -= self.extraDuration
self.extraDuration = 0