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

DiameterAgent with mysql integration tests passing for full path

Browse Source
This commit is contained in:
DanB
2020-02-04 18:41:44 +01:00
parent dce48fcc19
commit 797b85ea79
8 changed files with 36 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agents/agentreq.go
View File

@@ -172,8 +172,8 @@ func (ar *AgentRequest) SetFields(tplFlds []*config.FCTemplate) (err error) {
prevNMItem := valSet[len(valSet)-1] // could be we need nil protection here
*nMItm = *prevNMItem // inherit the particularities, ie AttributeName
nMItm.Data = utils.IfaceAsString(prevNMItem.Data) + utils.IfaceAsString(out)
valSet = valSet[:len(valSet)-1] // discard the last item since we have captured it in nmItem
}
valSet = valSet[:len(valSet)-1] // discard the last item
}
valSet = append(valSet, nMItm)
switch fldPath[0] {

6
agents/diam_it_test.go
View File

@@ -67,7 +67,6 @@ var (
// Test start here
func TestDiamItTcp(t *testing.T) {
engine.KillEngine(0)
switch *dbType {
case utils.MetaInternal:
diamConfigDIR = "diamagent_internal"
@@ -98,12 +97,10 @@ func TestDiamItDispatcher(t *testing.T) {
for _, stest := range sTestsDiam {
t.Run(diamConfigDIR, stest)
}
engine.KillEngine(100)
isDispatcherActive = false
}
func TestDiamItSctp(t *testing.T) {
engine.KillEngine(0)
switch *dbType {
case utils.MetaInternal:
diamConfigDIR = "diamsctpagent_internal"
@@ -122,7 +119,6 @@ func TestDiamItSctp(t *testing.T) {
}
func TestDiamItMaxConn(t *testing.T) {
engine.KillEngine(0)
switch *dbType {
case utils.MetaInternal:
diamConfigDIR = "diamagentmaxconn_internal"
@@ -143,7 +139,6 @@ func TestDiamItMaxConn(t *testing.T) {
}
func TestDiamItSessionDisconnect(t *testing.T) {
engine.KillEngine(0)
switch *dbType {
case utils.MetaInternal:
diamConfigDIR = "diamagent_internal"
@@ -380,6 +375,7 @@ func testDiamItDryRun(t *testing.T) {
} else if val != eVal {
t.Errorf("expecting: %s, received: <%s>", eVal, val)
}
eVal = "cgrates;1451911932;00082"
if avps, err := msg.FindAVPsWithPath([]interface{}{"Session-Id"}, dict.UndefinedVendorID); err != nil {
t.Error(err)

20
agents/diamagent.go
View File

@@ -153,7 +153,8 @@ func (da *DiameterAgent) handleMessage(c diam.Conn, m *diam.Message) {
utils.RemoteHost: c.RemoteAddr().String(),
}
// build the negative error answer
diamErr, err := diamErr(m, diam.UnableToComply, reqVars,
diamErr, err := diamErr(
m, diam.UnableToComply, reqVars,
da.cgrCfg.DiameterAgentCfg().Templates[utils.MetaErr],
da.cgrCfg.GeneralCfg().DefaultTenant,
da.cgrCfg.GeneralCfg().DefaultTimezone,
@@ -248,7 +249,7 @@ func (da *DiameterAgent) processRequest(reqProcessor *config.RequestProcessor,
reqProcessor.Filters, agReq); err != nil || !pass {
return pass, err
}
if agReq.CGRRequest, err = agReq.AsNavigableMap(reqProcessor.RequestFields); err != nil {
if err = agReq.SetFields(reqProcessor.RequestFields); err != nil {
return
}
cgrEv := agReq.CGRRequest.AsCGREvent(agReq.Tenant, utils.NestingSep)
@@ -406,10 +407,8 @@ func (da *DiameterAgent) processRequest(reqProcessor *config.RequestProcessor,
agReq.CGRReply.Set([]string{utils.Error}, err.Error(), false, false)
}
}
if nM, err := agReq.AsNavigableMap(reqProcessor.ReplyFields); err != nil {
return false, err
} else {
agReq.Reply.Merge(nM)
if err = agReq.SetFields(reqProcessor.ReplyFields); err != nil {
return
}
if reqProcessor.Flags.HasKey(utils.MetaLog) {
utils.Logger.Info(
@@ -454,15 +453,16 @@ func (da *DiameterAgent) V1DisconnectSession(args utils.AttrDisconnectSession, r
nil,
da.cgrCfg.GeneralCfg().DefaultTenant,
da.cgrCfg.GeneralCfg().DefaultTimezone, da.filterS, nil, nil)
nM, err := aReq.AsNavigableMap(da.cgrCfg.DiameterAgentCfg().Templates[da.cgrCfg.DiameterAgentCfg().ASRTemplate])
if err != nil {
if err = aReq.SetFields(da.cgrCfg.DiameterAgentCfg().Templates[da.cgrCfg.DiameterAgentCfg().ASRTemplate]); err != nil {
utils.Logger.Warning(
fmt.Sprintf("<%s> cannot disconnect session with OriginID: <%s>, err: %s",
utils.DiameterAgent, ssID, err.Error()))
return utils.ErrServerError
}
m := diam.NewRequest(dmd.m.Header.CommandCode, dmd.m.Header.ApplicationID, dmd.m.Dictionary())
if err = updateDiamMsgFromNavMap(m, nM, da.cgrCfg.GeneralCfg().DefaultTimezone); err != nil {
m := diam.NewRequest(dmd.m.Header.CommandCode,
dmd.m.Header.ApplicationID, dmd.m.Dictionary())
if err = updateDiamMsgFromNavMap(m, aReq.diamreq,
da.cgrCfg.GeneralCfg().DefaultTimezone); err != nil {
utils.Logger.Warning(
fmt.Sprintf("<%s> cannot disconnect session with OriginID: <%s>, err: %s",
utils.DiameterAgent, ssID, err.Error()))

5
agents/libdiam.go
View File

@@ -482,11 +482,10 @@ func diamErr(m *diam.Message, resCode uint32,
config.NewNavigableMap(nil),
config.NewNavigableMap(nil),
nil, tnt, tmz, filterS, nil, nil)
var rplyData *config.NavigableMap
if rplyData, err = aReq.AsNavigableMap(tpl); err != nil {
if err = aReq.SetFields(tpl); err != nil {
return
}
return diamAnswer(m, resCode, true, rplyData, tmz)
return diamAnswer(m, resCode, true, aReq.Reply, tmz)
}
func diamBareErr(m *diam.Message, resCode uint32) (a *diam.Message) {