Merge remote-tracking branch 'origin/master'

This commit is contained in:
Tripon Alexandru-Ionut
2018-10-05 15:54:39 +03:00
59 changed files with 2162 additions and 3630 deletions

View File

@@ -201,13 +201,14 @@ func (alS *AttributeService) processEvent(args *AttrArgsProcessEvent) (
}
rply.AlteredFields = append(rply.AlteredFields, fldName)
}
for _, valIface := range rply.CGREvent.Event {
if valIface == interface{}(utils.MetaAttributes) {
return nil, utils.NewCGRError(utils.AttributeSv1ProcessEvent,
utils.AttributesNotFoundCaps,
utils.AttributesNotFound,
utils.AttributesNotFound)
}
}
for _, valIface := range rply.CGREvent.Event {
if valIface == interface{}(utils.MetaAttributes) {
return nil, utils.NewCGRError(
utils.AttributeSv1ProcessEvent,
utils.AttributesNotFound,
utils.AttributesNotFound,
utils.AttributesNotFound)
}
}
return

View File

@@ -254,13 +254,13 @@ func TestWriteCdr(t *testing.T) {
var err error
wrBuf := &bytes.Buffer{}
cfg, _ := config.NewDefaultCGRConfig()
if hdrCfgFlds, err = config.FCTemplatesFromFCTemapltesJsonCfg(hdrJsnCfgFlds); err != nil {
if hdrCfgFlds, err = config.FCTemplatesFromFCTemplatesJsonCfg(hdrJsnCfgFlds); err != nil {
t.Error(err)
}
if contentCfgFlds, err = config.FCTemplatesFromFCTemapltesJsonCfg(contentJsnCfgFlds); err != nil {
if contentCfgFlds, err = config.FCTemplatesFromFCTemplatesJsonCfg(contentJsnCfgFlds); err != nil {
t.Error(err)
}
if trailerCfgFlds, err = config.FCTemplatesFromFCTemapltesJsonCfg(trailerJsnCfgFlds); err != nil {
if trailerCfgFlds, err = config.FCTemplatesFromFCTemplatesJsonCfg(trailerJsnCfgFlds); err != nil {
t.Error(err)
}
cdreCfg := &config.CdreConfig{