From 6c4b0f0023e651b5526c1faaa51de53b276fdae6 Mon Sep 17 00:00:00 2001 From: DanB Date: Mon, 14 Mar 2016 11:51:04 +0100 Subject: [PATCH] More debug on diameter --- agents/dmtagent.go | 1 + agents/libdmt_test.go | 8 ++++++++ sessionmanager/smg_session.go | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/agents/dmtagent.go b/agents/dmtagent.go index 1e80363c2..26ab76fff 100644 --- a/agents/dmtagent.go +++ b/agents/dmtagent.go @@ -83,6 +83,7 @@ func (self DiameterAgent) processCCR(ccr *CCR, reqProcessor *config.DARequestPro utils.Logger.Info(fmt.Sprintf(" RequestProcessor: %s", reqProcessor.Id)) utils.Logger.Info(fmt.Sprintf(" 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) } diff --git a/agents/libdmt_test.go b/agents/libdmt_test.go index ec6455013..7d6924c42 100644 --- a/agents/libdmt_test.go +++ b/agents/libdmt_test.go @@ -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) } diff --git a/sessionmanager/smg_session.go b/sessionmanager/smg_session.go index 63fbc8115..74d538e68 100644 --- a/sessionmanager/smg_session.go +++ b/sessionmanager/smg_session.go @@ -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