diff --git a/agents/asterisk_event.go b/agents/asterisk_event.go index 9799092bd..e079cb6dc 100644 --- a/agents/asterisk_event.go +++ b/agents/asterisk_event.go @@ -120,7 +120,7 @@ func (smaEv *SMAsteriskEvent) SetupTime() string { } func (smaEv *SMAsteriskEvent) Account() string { - cachedKey := utils.CGR_ACCOUNT + cachedKey := utils.CGRAccount cachedVal, hasIt := smaEv.cachedFields[cachedKey] if !hasIt { channelData, _ := smaEv.ariEv["channel"].(map[string]interface{}) @@ -132,7 +132,7 @@ func (smaEv *SMAsteriskEvent) Account() string { } func (smaEv *SMAsteriskEvent) Destination() string { - cachedKey := utils.CGR_DESTINATION + cachedKey := utils.CGRDestination cachedVal, hasIt := smaEv.cachedFields[cachedKey] if !hasIt { channelData, _ := smaEv.ariEv["channel"].(map[string]interface{}) @@ -144,27 +144,27 @@ func (smaEv *SMAsteriskEvent) Destination() string { } func (smaEv *SMAsteriskEvent) RequestType() string { - return smaEv.cachedFields[utils.CGR_REQTYPE] + return smaEv.cachedFields[utils.CGRReqType] } func (smaEv *SMAsteriskEvent) Tenant() string { - return smaEv.cachedFields[utils.CGR_TENANT] + return smaEv.cachedFields[utils.CGRTenant] } func (smaEv *SMAsteriskEvent) Category() string { - return smaEv.cachedFields[utils.CGR_CATEGORY] + return smaEv.cachedFields[utils.CGRCategory] } func (smaEv *SMAsteriskEvent) Subject() string { - return smaEv.cachedFields[utils.CGR_SUBJECT] + return smaEv.cachedFields[utils.CGRSubject] } func (smaEv *SMAsteriskEvent) PDD() string { - return smaEv.cachedFields[utils.CGR_PDD] + return smaEv.cachedFields[utils.CGRPdd] } func (smaEv *SMAsteriskEvent) Route() string { - return smaEv.cachedFields[utils.CGR_ROUTE] + return smaEv.cachedFields[utils.CGRRoute] } func (smaEv *SMAsteriskEvent) Subsystems() string { @@ -176,7 +176,7 @@ func (smaEv *SMAsteriskEvent) OriginHost() string { } func (smaEv *SMAsteriskEvent) DisconnectCause() string { - cachedKey := utils.CGR_DISCONNECT_CAUSE + cachedKey := utils.CGRDisconnectCause cachedVal, hasIt := smaEv.cachedFields[cachedKey] if !hasIt { cachedVal, _ = smaEv.ariEv["cause_txt"].(string) @@ -188,8 +188,8 @@ func (smaEv *SMAsteriskEvent) DisconnectCause() string { return cachedVal } -var primaryFields = utils.NewStringSet([]string{eventType, channelID, timestamp, utils.SetupTime, utils.CGR_ACCOUNT, utils.CGR_DESTINATION, utils.CGR_REQTYPE, - utils.CGR_TENANT, utils.CGR_CATEGORY, utils.CGR_SUBJECT, utils.CGR_PDD, utils.CGR_ROUTE, utils.CGR_DISCONNECT_CAUSE}) +var primaryFields = utils.NewStringSet([]string{eventType, channelID, timestamp, utils.SetupTime, utils.CGRAccount, utils.CGRDestination, utils.CGRReqType, + utils.CGRTenant, utils.CGRCategory, utils.CGRSubject, utils.CGRPdd, utils.CGRRoute, utils.CGRDisconnectCause}) func (smaEv *SMAsteriskEvent) ExtraParameters() (extraParams map[string]string) { extraParams = make(map[string]string) diff --git a/agents/fsagent.go b/agents/fsagent.go index 720ec3e99..17be67b15 100644 --- a/agents/fsagent.go +++ b/agents/fsagent.go @@ -195,7 +195,7 @@ func (fsa *FSsessions) onChannelPark(fsev FSEvent, connIdx int) { if authReply.Routes != nil { fsArray := SliceAsFsArray(authReply.Routes.RoutesWithParams()) if _, err := fsa.conns[connIdx].SendApiCmd(fmt.Sprintf("uuid_setvar %s %s %s\n\n", - fsev.GetUUID(), utils.CGR_ROUTES, fsArray)); err != nil { + fsev.GetUUID(), utils.CGRRoutes, fsArray)); err != nil { utils.Logger.Info(fmt.Sprintf("<%s> error setting routes: %s", utils.FreeSWITCHAgent, err.Error())) fsa.unparkCall(fsev.GetUUID(), connIdx, fsev.GetCallDestNr(utils.MetaDefault), err.Error()) diff --git a/agents/fsevent.go b/agents/fsevent.go index 0aaa309cc..4900d1e1d 100644 --- a/agents/fsevent.go +++ b/agents/fsevent.go @@ -35,14 +35,14 @@ import ( const ( varPrefix = "variable_" // Freswitch event proprities names - SUBJECT = varPrefix + utils.CGR_SUBJECT - ACCOUNT = varPrefix + utils.CGR_ACCOUNT - DESTINATION = varPrefix + utils.CGR_DESTINATION - REQTYPE = varPrefix + utils.CGR_REQTYPE //prepaid or postpaid - CATEGORY = varPrefix + utils.CGR_CATEGORY - VAR_CGR_ROUTE = varPrefix + utils.CGR_ROUTE + SUBJECT = varPrefix + utils.CGRSubject + ACCOUNT = varPrefix + utils.CGRAccount + DESTINATION = varPrefix + utils.CGRDestination + REQTYPE = varPrefix + utils.CGRReqType //prepaid or postpaid + CATEGORY = varPrefix + utils.CGRCategory + VAR_CGR_ROUTE = varPrefix + utils.CGRRoute UUID = "Unique-ID" // -Unique ID for this call leg - CSTMID = varPrefix + utils.CGR_TENANT + CSTMID = varPrefix + utils.CGRTenant CALL_DEST_NR = "Caller-Destination-Number" SIP_REQ_USER = "variable_sip_req_user" PARK_TIME = "Caller-Profile-Created-Time" @@ -68,8 +68,8 @@ const ( VarCGRFlags = varPrefix + utils.CGRFlags VarCGROpts = varPrefix + utils.CGROpts CGRResourceAllocation = "cgr_resource_allocation" - VAR_CGR_DISCONNECT_CAUSE = varPrefix + utils.CGR_DISCONNECT_CAUSE - VAR_CGR_CMPUTELCR = varPrefix + utils.CGR_COMPUTELCR + VAR_CGR_DISCONNECT_CAUSE = varPrefix + utils.CGRDisconnectCause + VAR_CGR_CMPUTELCR = varPrefix + utils.CGRComputeLCR FsConnID = "FsConnID" // used to share connID info in event for remote disconnects VarAnswerEpoch = "variable_answer_epoch" VarCGRACD = varPrefix + utils.CgrAcd diff --git a/agents/kamevent_test.go b/agents/kamevent_test.go index cbbd4275f..316a474c1 100644 --- a/agents/kamevent_test.go +++ b/agents/kamevent_test.go @@ -31,7 +31,7 @@ import ( var kamEv = KamEvent{KamTRIndex: "29223", KamTRLabel: "698469260", "callid": "ODVkMDI2Mzc2MDY5N2EzODhjNTAzNTdlODhiZjRlYWQ", "from_tag": "eb082607", "to_tag": "4ea9687f", "cgr_account": "dan", "cgr_reqtype": utils.MetaPrepaid, "cgr_subject": "dan", "cgr_destination": "+4986517174963", "cgr_tenant": "itsyscom.com", - "cgr_duration": "20", utils.CGR_ROUTE: "suppl2", utils.CGR_DISCONNECT_CAUSE: "200", "extra1": "val1", "extra2": "val2"} + "cgr_duration": "20", utils.CGRRoute: "suppl2", utils.CGRDisconnectCause: "200", "extra1": "val1", "extra2": "val2"} func TestNewKamEvent(t *testing.T) { evStr := `{"event":"CGR_CALL_END", @@ -47,19 +47,19 @@ func TestNewKamEvent(t *testing.T) { "cgr_disconnectcause": "200", "cgr_pdd": "4"}` eKamEv := KamEvent{ - "event": "CGR_CALL_END", - "callid": "46c01a5c249b469e76333fc6bfa87f6a@0:0:0:0:0:0:0:0", - "from_tag": "bf71ad59", - "to_tag": "7351fecf", - "cgr_reqtype": utils.MetaPostpaid, - "cgr_account": "1001", - "cgr_destination": "1002", - "cgr_answertime": "1419839310", - "cgr_duration": "3", - "cgr_pdd": "4", - utils.CGR_ROUTE: "supplier2", - utils.CGR_DISCONNECT_CAUSE: "200", - utils.OriginHost: utils.KamailioAgent, + "event": "CGR_CALL_END", + "callid": "46c01a5c249b469e76333fc6bfa87f6a@0:0:0:0:0:0:0:0", + "from_tag": "bf71ad59", + "to_tag": "7351fecf", + "cgr_reqtype": utils.MetaPostpaid, + "cgr_account": "1001", + "cgr_destination": "1002", + "cgr_answertime": "1419839310", + "cgr_duration": "3", + "cgr_pdd": "4", + utils.CGRRoute: "supplier2", + utils.CGRDisconnectCause: "200", + utils.OriginHost: utils.KamailioAgent, } if kamEv, err := NewKamEvent([]byte(evStr), utils.KamailioAgent, ""); err != nil { t.Error(err) @@ -74,8 +74,8 @@ func TestKamEvMissingParameter(t *testing.T) { "from_tag": "bf71ad59", "to_tag": "7351fecf", "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_answertime": "1419839310", "cgr_duration": "3", "cgr_pdd": "4", - utils.CGR_ROUTE: "supplier2", - utils.CGR_DISCONNECT_CAUSE: "200"} + utils.CGRRoute: "supplier2", + utils.CGRDisconnectCause: "200"} if missingParam := kamEv.MissingParameter(); missingParam != true { t.Errorf("Expecting: true, received:%+v ", missingParam) } @@ -88,16 +88,16 @@ func TestKamEvAsMapStringInterface(t *testing.T) { "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_destination": "1002", "cgr_answertime": "1419839310", "cgr_duration": "3", "cgr_pdd": "4", - utils.CGR_ROUTE: "supplier2", - utils.CGR_DISCONNECT_CAUSE: "200"} + utils.CGRRoute: "supplier2", + utils.CGRDisconnectCause: "200"} expMp := make(map[string]interface{}) expMp["cgr_account"] = "1001" expMp["cgr_duration"] = "3" expMp["cgr_pdd"] = "4" expMp["cgr_destination"] = "1002" - expMp[utils.CGR_ROUTE] = "supplier2" + expMp[utils.CGRRoute] = "supplier2" expMp["cgr_answertime"] = "1419839310" - expMp[utils.CGR_DISCONNECT_CAUSE] = "200" + expMp[utils.CGRDisconnectCause] = "200" expMp["callid"] = "46c01a5c249b469e76333fc6bfa87f6a@0:0:0:0:0:0:0:0" expMp["from_tag"] = "bf71ad59" expMp["to_tag"] = "7351fecf" @@ -117,8 +117,8 @@ func TestKamEvAsCGREvent(t *testing.T) { "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_destination": "1002", "cgr_answertime": "1419839310", "cgr_duration": "3", "cgr_pdd": "4", - utils.CGR_ROUTE: "supplier2", - utils.CGR_DISCONNECT_CAUSE: "200"} + utils.CGRRoute: "supplier2", + utils.CGRDisconnectCause: "200"} sTime, err := utils.ParseTimeDetectLayout(kamEv[utils.AnswerTime], timezone) if err != nil { return @@ -149,9 +149,9 @@ func TestKamEvV1AuthorizeArgs(t *testing.T) { "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_destination": "1002", "cgr_answertime": "1419839310", "cgr_duration": "3", "cgr_pdd": "4", - utils.CGR_ROUTE: "supplier2", - utils.CGR_DISCONNECT_CAUSE: "200", - utils.CGRFlags: "*accounts,*routes,*routes_event_cost,*routes_ignore_errors"} + utils.CGRRoute: "supplier2", + utils.CGRDisconnectCause: "200", + utils.CGRFlags: "*accounts,*routes,*routes_event_cost,*routes_ignore_errors"} sTime, err := utils.ParseTimeDetectLayout(kamEv[utils.AnswerTime], timezone) if err != nil { return @@ -201,8 +201,8 @@ func TestKamEvAsKamAuthReply(t *testing.T) { "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_destination": "1002", "cgr_answertime": "1419839310", "cgr_duration": "3", "cgr_pdd": "4", - utils.CGR_ROUTE: "supplier2", - utils.CGR_DISCONNECT_CAUSE: "200"} + utils.CGRRoute: "supplier2", + utils.CGRDisconnectCause: "200"} sTime, err := utils.ParseTimeDetectLayout(kamEv[utils.AnswerTime], timezone) if err != nil { return @@ -283,8 +283,8 @@ func TestKamEvV1InitSessionArgs(t *testing.T) { "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_destination": "1002", "cgr_answertime": "1419839310", "cgr_duration": "3", "cgr_pdd": "4", - utils.CGR_ROUTE: "supplier2", - utils.CGR_DISCONNECT_CAUSE: "200"} + utils.CGRRoute: "supplier2", + utils.CGRDisconnectCause: "200"} sTime, err := utils.ParseTimeDetectLayout(kamEv[utils.AnswerTime], timezone) if err != nil { return @@ -323,8 +323,8 @@ func TestKamEvV1TerminateSessionArgs(t *testing.T) { "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_destination": "1002", "cgr_answertime": "1419839310", "cgr_duration": "3", "cgr_pdd": "4", - utils.CGR_ROUTE: "supplier2", - utils.CGR_DISCONNECT_CAUSE: "200"} + utils.CGRRoute: "supplier2", + utils.CGRDisconnectCause: "200"} sTime, err := utils.ParseTimeDetectLayout(kamEv[utils.AnswerTime], timezone) if err != nil { return @@ -363,8 +363,8 @@ func TestKamEvV1ProcessMessageArgs(t *testing.T) { "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_destination": "1002", "cgr_answertime": "1419839310", "cgr_duration": "3", "cgr_pdd": "4", - utils.CGR_ROUTE: "supplier2", - utils.CGR_DISCONNECT_CAUSE: "200"} + utils.CGRRoute: "supplier2", + utils.CGRDisconnectCause: "200"} sTime, err := utils.ParseTimeDetectLayout(kamEv[utils.AnswerTime], timezone) if err != nil { return @@ -400,8 +400,8 @@ func TestKamEvAsKamProcessEventReply(t *testing.T) { "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_destination": "1002", "cgr_answertime": "1419839310", "cgr_duration": "3", "cgr_pdd": "4", - utils.CGR_ROUTE: "supplier2", - utils.CGR_DISCONNECT_CAUSE: "200"} + utils.CGRRoute: "supplier2", + utils.CGRDisconnectCause: "200"} sTime, err := utils.ParseTimeDetectLayout(kamEv[utils.AnswerTime], timezone) if err != nil { return diff --git a/apier/v1/accounts.go b/apier/v1/accounts.go index e14af67f6..c571446d9 100644 --- a/apier/v1/accounts.go +++ b/apier/v1/accounts.go @@ -442,10 +442,10 @@ type AttrAddBalance struct { } func (apierSv1 *APIerSv1) AddBalance(attr *AttrAddBalance, reply *string) error { - return apierSv1.modifyBalance(utils.TOPUP, attr, reply) + return apierSv1.modifyBalance(utils.MetaTopUp, attr, reply) } func (apierSv1 *APIerSv1) DebitBalance(attr *AttrAddBalance, reply *string) error { - return apierSv1.modifyBalance(utils.DEBIT, attr, reply) + return apierSv1.modifyBalance(utils.MetaDebit, attr, reply) } func (apierSv1 *APIerSv1) modifyBalance(aType string, attr *AttrAddBalance, reply *string) (err error) { @@ -512,7 +512,7 @@ func (apierSv1 *APIerSv1) modifyBalance(aType string, attr *AttrAddBalance, repl acts := engine.Actions{a, publishAction} if attr.Cdrlog { acts = engine.Actions{a, publishAction, &engine.Action{ - ActionType: utils.CDRLOG, + ActionType: utils.CDRLog, }} } at.SetActions(acts) @@ -581,7 +581,7 @@ func (apierSv1 *APIerSv1) SetBalance(attr *utils.AttrSetBalance, reply *string) } a := &engine.Action{ - ActionType: utils.SET_BALANCE, + ActionType: utils.MetaSetBalance, Balance: balance, } publishAction := &engine.Action{ @@ -590,7 +590,7 @@ func (apierSv1 *APIerSv1) SetBalance(attr *utils.AttrSetBalance, reply *string) acts := engine.Actions{a, publishAction} if attr.Cdrlog { acts = engine.Actions{a, publishAction, &engine.Action{ - ActionType: utils.CDRLOG, + ActionType: utils.CDRLog, }} } at.SetActions(acts) @@ -663,7 +663,7 @@ func (apierSv1 *APIerSv1) SetBalances(attr *utils.AttrSetBalances, reply *string } a := &engine.Action{ - ActionType: utils.SET_BALANCE, + ActionType: utils.MetaSetBalance, Balance: balFltr, } publishAction := &engine.Action{ @@ -672,7 +672,7 @@ func (apierSv1 *APIerSv1) SetBalances(attr *utils.AttrSetBalances, reply *string acts := engine.Actions{a, publishAction} if bal.Cdrlog { acts = engine.Actions{a, publishAction, &engine.Action{ - ActionType: utils.CDRLOG, + ActionType: utils.CDRLog, }} } at.SetActions(acts) @@ -712,7 +712,7 @@ func (apierSv1 *APIerSv1) RemoveBalances(attr *utils.AttrSetBalance, reply *stri } at.SetAccountIDs(utils.StringMap{accID: true}) a := &engine.Action{ - ActionType: utils.REMOVE_BALANCE, + ActionType: utils.MetaRemoveBalance, Balance: balance, } at.SetActions(engine.Actions{a}) diff --git a/apier/v1/accounts_it_test.go b/apier/v1/accounts_it_test.go index 5f1f61105..2be0dc8cf 100644 --- a/apier/v1/accounts_it_test.go +++ b/apier/v1/accounts_it_test.go @@ -342,7 +342,7 @@ func testAccITAddBalance(t *testing.T) { time.Sleep(50 * time.Millisecond) // verify the cdr from CdrLog var cdrs []*engine.ExternalCDR - req := utils.RPCCDRsFilter{Sources: []string{utils.CDRLOG}} + req := utils.RPCCDRsFilter{Sources: []string{utils.CDRLog}} if err := accRPC.Call(utils.APIerSv2GetCDRs, &req, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { @@ -366,7 +366,7 @@ func testAccITAddBalanceWithoutTenant(t *testing.T) { time.Sleep(50 * time.Millisecond) // verify the cdr from CdrLog var cdrs []*engine.ExternalCDR - req := utils.RPCCDRsFilter{Sources: []string{utils.CDRLOG}} + req := utils.RPCCDRsFilter{Sources: []string{utils.CDRLog}} if err := accRPC.Call(utils.APIerSv2GetCDRs, &req, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 2 { @@ -394,7 +394,7 @@ func testAccITSetBalance(t *testing.T) { time.Sleep(50 * time.Millisecond) // verify the cdr from CdrLog var cdrs []*engine.ExternalCDR - req := utils.RPCCDRsFilter{Sources: []string{utils.CDRLOG}} + req := utils.RPCCDRsFilter{Sources: []string{utils.CDRLog}} if err := accRPC.Call(utils.APIerSv2GetCDRs, &req, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 3 { @@ -421,7 +421,7 @@ func testAccITSetBalanceWithoutTenant(t *testing.T) { time.Sleep(50 * time.Millisecond) // verify the cdr from CdrLog var cdrs []*engine.ExternalCDR - req := utils.RPCCDRsFilter{Sources: []string{utils.CDRLOG}} + req := utils.RPCCDRsFilter{Sources: []string{utils.CDRLog}} if err := accRPC.Call(utils.APIerSv1GetCDRs, &req, &cdrs); err != nil { t.Error(err) } else if len(cdrs) != 4 { @@ -455,7 +455,7 @@ func testAccITSetBalanceWithExtraData(t *testing.T) { time.Sleep(50 * time.Millisecond) // verify the cdr from CdrLog var cdrs []*engine.ExternalCDR - req := utils.RPCCDRsFilter{Sources: []string{utils.CDRLOG}, Accounts: []string{"testAccITSetBalanceWithExtraData"}} + req := utils.RPCCDRsFilter{Sources: []string{utils.CDRLog}, Accounts: []string{"testAccITSetBalanceWithExtraData"}} if err := accRPC.Call(utils.APIerSv2GetCDRs, &req, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { @@ -490,7 +490,7 @@ func testAccITSetBalanceWithExtraData2(t *testing.T) { time.Sleep(50 * time.Millisecond) // verify the cdr from CdrLog var cdrs []*engine.ExternalCDR - req := utils.RPCCDRsFilter{Sources: []string{utils.CDRLOG}, Accounts: []string{"testAccITSetBalanceWithExtraData2"}} + req := utils.RPCCDRsFilter{Sources: []string{utils.CDRLog}, Accounts: []string{"testAccITSetBalanceWithExtraData2"}} if err := accRPC.Call(utils.APIerSv2GetCDRs, &req, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { @@ -951,9 +951,9 @@ func testAccITAccountWithTriggers(t *testing.T) { // add an action that contains topup and reset_triggers topupAction := &utils.AttrSetActions{ActionsId: "TOPUP_WITH_RESET_TRIGGER", Actions: []*utils.TPAction{ - {Identifier: utils.TOPUP_RESET, BalanceId: "testAccITAccountWithTriggers", + {Identifier: utils.MetaTopUpReset, BalanceId: "testAccITAccountWithTriggers", BalanceType: utils.MetaMonetary, Units: "5", Weight: 10.0}, - {Identifier: utils.RESET_TRIGGERS}, + {Identifier: utils.MetaResetTriggers}, }} if err := accRPC.Call(utils.APIerSv2SetActions, topupAction, &reply); err != nil { @@ -964,7 +964,7 @@ func testAccITAccountWithTriggers(t *testing.T) { // add an action to be executed when the trigger is triggered actTrigger := &utils.AttrSetActions{ActionsId: "ACT_TRIGGER", Actions: []*utils.TPAction{ - {Identifier: utils.TOPUP, BalanceId: "CustomBanalce", + {Identifier: utils.MetaTopUp, BalanceId: "CustomBanalce", BalanceType: utils.MetaMonetary, Units: "5", Weight: 10.0}, }} @@ -1085,7 +1085,7 @@ func testAccITAccountMonthlyEstimated(t *testing.T) { var reply string // add an action that contains topup topupAction := &utils.AttrSetActions{ActionsId: "TOPUP_ACTION", Actions: []*utils.TPAction{ - {Identifier: utils.TOPUP_RESET, BalanceId: "testAccITAccountMonthlyEstimated", + {Identifier: utils.MetaTopUpReset, BalanceId: "testAccITAccountMonthlyEstimated", BalanceType: utils.MetaMonetary, Units: "5", Weight: 10.0}, }} diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go index f8080c88b..bfb3021ca 100644 --- a/apier/v1/apier_it_test.go +++ b/apier/v1/apier_it_test.go @@ -1230,7 +1230,7 @@ func testApierExecuteActionWithoutTenant(t *testing.T) { } func testApierSetActions(t *testing.T) { - act1 := &V1TPAction{Identifier: utils.TOPUP_RESET, BalanceType: utils.MetaMonetary, Units: 75.0, ExpiryTime: utils.UNLIMITED, Weight: 20.0} + act1 := &V1TPAction{Identifier: utils.MetaTopUpReset, BalanceType: utils.MetaMonetary, Units: 75.0, ExpiryTime: utils.MetaUnlimited, Weight: 20.0} attrs1 := &V1AttrSetActions{ActionsId: "ACTS_1", Actions: []*V1TPAction{act1}} reply1 := utils.EmptyString if err := rater.Call(utils.APIerSv1SetActions, &attrs1, &reply1); err != nil { @@ -1246,9 +1246,9 @@ func testApierSetActions(t *testing.T) { func testApierGetActions(t *testing.T) { expectActs := []*utils.TPAction{ - {Identifier: utils.TOPUP_RESET, BalanceType: utils.MetaMonetary, + {Identifier: utils.MetaTopUpReset, BalanceType: utils.MetaMonetary, Units: "75", BalanceWeight: "0", BalanceBlocker: "false", - BalanceDisabled: "false", ExpiryTime: utils.UNLIMITED, Weight: 20.0}} + BalanceDisabled: "false", ExpiryTime: utils.MetaUnlimited, Weight: 20.0}} var reply []*utils.TPAction if err := rater.Call(utils.APIerSv1GetActions, utils.StringPointer("ACTS_1"), &reply); err != nil { diff --git a/apier/v1/remote_it_test.go b/apier/v1/remote_it_test.go index 57c2cfae3..48cf6fbbb 100644 --- a/apier/v1/remote_it_test.go +++ b/apier/v1/remote_it_test.go @@ -525,9 +525,9 @@ func testInternalRemoteITGetRatingProfile(t *testing.T) { func testInternalRemoteITGetAction(t *testing.T) { expectActs := []*utils.TPAction{ - {Identifier: utils.TOPUP_RESET, BalanceId: "test", BalanceType: utils.MetaMonetary, + {Identifier: utils.MetaTopUpReset, BalanceId: "test", BalanceType: utils.MetaMonetary, Units: "10", BalanceWeight: "10", BalanceBlocker: "false", - BalanceDisabled: "false", ExpiryTime: utils.UNLIMITED, Weight: 10.0}} + BalanceDisabled: "false", ExpiryTime: utils.MetaUnlimited, Weight: 10.0}} var reply []*utils.TPAction if err := internalRPC.Call(utils.APIerSv1GetActions, utils.StringPointer("ACT_TOPUP_RST_10"), &reply); err != nil { diff --git a/apier/v1/replicate_it_test.go b/apier/v1/replicate_it_test.go index ed93383c4..74cf687a4 100644 --- a/apier/v1/replicate_it_test.go +++ b/apier/v1/replicate_it_test.go @@ -830,10 +830,10 @@ func testInternalReplicateITActions(t *testing.T) { attrs1 := &V1AttrSetActions{ ActionsId: "ACTS_1", Actions: []*V1TPAction{{ - Identifier: utils.TOPUP_RESET, + Identifier: utils.MetaTopUpReset, BalanceType: utils.MetaMonetary, Units: 75.0, - ExpiryTime: utils.UNLIMITED, + ExpiryTime: utils.MetaUnlimited, Weight: 20.0}}} var reply string if err := internalRPC.Call(utils.APIerSv1SetActions, &attrs1, &reply); err != nil { @@ -846,13 +846,13 @@ func testInternalReplicateITActions(t *testing.T) { } // check eOut := []*utils.TPAction{{ - Identifier: utils.TOPUP_RESET, + Identifier: utils.MetaTopUpReset, BalanceType: utils.MetaMonetary, Units: "75", BalanceWeight: "0", BalanceBlocker: "false", BalanceDisabled: "false", - ExpiryTime: utils.UNLIMITED, + ExpiryTime: utils.MetaUnlimited, Weight: 20.0, }} if err := internalRPC.Call(utils.APIerSv1GetActions, utils.StringPointer("ACTS_1"), &reply1); err != nil { diff --git a/apier/v2/apier.go b/apier/v2/apier.go index 42112a8e9..1893cc3ce 100644 --- a/apier/v2/apier.go +++ b/apier/v2/apier.go @@ -332,7 +332,7 @@ func (apiv2 *APIerSv2) SetActions(attrs *utils.AttrSetActions, reply *string) er ExtraParameters: apiAct.ExtraParameters, Filter: apiAct.Filter, } - if apiAct.Identifier != utils.RESET_TRIGGERS { // add an exception for ResetTriggers + if apiAct.Identifier != utils.MetaResetTriggers { // add an exception for ResetTriggers a.Balance = &engine.BalanceFilter{ // TODO: update this part Uuid: utils.StringPointer(apiAct.BalanceUuid), ID: utils.StringPointer(apiAct.BalanceId), diff --git a/apier/v2/apierv2_it_test.go b/apier/v2/apierv2_it_test.go index 8f67012f6..4ad5e0cec 100644 --- a/apier/v2/apierv2_it_test.go +++ b/apier/v2/apierv2_it_test.go @@ -154,7 +154,7 @@ func testAPIerSv2itAddBalance(t *testing.T) { func testAPIerSv2itSetAction(t *testing.T) { attrs := utils.AttrSetActions{ActionsId: "DISABLE_ACCOUNT", Actions: []*utils.TPAction{ - {Identifier: utils.DISABLE_ACCOUNT, Weight: 10.0}, + {Identifier: utils.MetaDisableAccount, Weight: 10.0}, }} var reply string if err := apierRPC.Call(utils.APIerSv2SetActions, &attrs, &reply); err != nil { @@ -249,7 +249,7 @@ func testAPIerSv2itFraudMitigation(t *testing.T) { func testAPIerSv2itSetAccountWithAP(t *testing.T) { argActs1 := utils.AttrSetActions{ActionsId: "TestAPIerSv2itSetAccountWithAP_ACT_1", Actions: []*utils.TPAction{ - {Identifier: utils.TOPUP_RESET, + {Identifier: utils.MetaTopUpReset, BalanceType: utils.MetaMonetary, Units: "5.0", Weight: 20.0}, }} var reply string @@ -369,7 +369,7 @@ func testAPIerSv2itSetActionWithCategory(t *testing.T) { argActs1 := utils.AttrSetActions{ActionsId: "TestAPIerSv2itSetActionWithCategory_ACT", Actions: []*utils.TPAction{ - {Identifier: utils.TOPUP_RESET, + {Identifier: utils.MetaTopUpReset, BalanceType: utils.MetaMonetary, Categories: "test", Units: "5.0", Weight: 20.0}, }} @@ -527,7 +527,7 @@ func testAPIerSv2itGetActionsCount(t *testing.T) { t.Errorf("Expecting: 3, received : %+v", reply1) } attrs := utils.AttrSetActions{ActionsId: "DISABLE_ACCOUNT2", Actions: []*utils.TPAction{ - {Identifier: utils.DISABLE_ACCOUNT, Weight: 0.7}, + {Identifier: utils.MetaDisableAccount, Weight: 0.7}, }} var reply string if err := apierRPC.Call(utils.APIerSv2SetActions, &attrs, &reply); err != nil { @@ -560,7 +560,7 @@ func testAPIerSv2itGetActionsCount(t *testing.T) { t.Errorf("Expecting %+v, received: %+v", utils.ErrNotFound, err) } attrs = utils.AttrSetActions{ActionsId: "Test", Actions: []*utils.TPAction{ - {Identifier: utils.DISABLE_ACCOUNT, Weight: 0.7}, + {Identifier: utils.MetaDisableAccount, Weight: 0.7}, }} if err := apierRPC.Call(utils.APIerSv2SetActions, &attrs, &reply); err != nil { t.Error(err) diff --git a/apier/v2/cdrs_offline_it_test.go b/apier/v2/cdrs_offline_it_test.go index f2bb3f15a..4a64eedd1 100644 --- a/apier/v2/cdrs_offline_it_test.go +++ b/apier/v2/cdrs_offline_it_test.go @@ -216,12 +216,12 @@ func testV2CDRsOfflineBalanceUpdate(t *testing.T) { func testV2CDRsOfflineExpiryBalance(t *testing.T) { var reply string acc := &utils.AttrSetActions{ActionsId: "ACT_TOPUP_TEST2", Actions: []*utils.TPAction{ - {Identifier: utils.TOPUP, BalanceType: utils.MetaMonetary, BalanceId: "BalanceExpired1", Units: "5", + {Identifier: utils.MetaTopUp, BalanceType: utils.MetaMonetary, BalanceId: "BalanceExpired1", Units: "5", ExpiryTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC).String(), BalanceWeight: "10", Weight: 20.0}, - {Identifier: utils.TOPUP, BalanceType: utils.MetaMonetary, BalanceId: "BalanceExpired2", Units: "10", + {Identifier: utils.MetaTopUp, BalanceType: utils.MetaMonetary, BalanceId: "BalanceExpired2", Units: "10", ExpiryTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC).String(), BalanceWeight: "10", Weight: 20.0}, - {Identifier: utils.TOPUP, BalanceType: utils.MetaMonetary, BalanceId: "NewBalance", Units: "10", - ExpiryTime: utils.UNLIMITED, BalanceWeight: "10", Weight: 20.0}, + {Identifier: utils.MetaTopUp, BalanceType: utils.MetaMonetary, BalanceId: "NewBalance", Units: "10", + ExpiryTime: utils.MetaUnlimited, BalanceWeight: "10", Weight: 20.0}, }} if err := cdrsOfflineRpc.Call(utils.APIerSv2SetActions, acc, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) diff --git a/engine/action.go b/engine/action.go index 5c0c5d68a..1ae4f496b 100644 --- a/engine/action.go +++ b/engine/action.go @@ -72,41 +72,41 @@ type actionTypeFunc func(*Account, *Action, Actions, interface{}) error func getActionFunc(typ string) (actionTypeFunc, bool) { actionFuncMap := map[string]actionTypeFunc{ - utils.MetaLog: logAction, - utils.RESET_TRIGGERS: resetTriggersAction, - utils.CDRLOG: cdrLogAction, - utils.SET_RECURRENT: setRecurrentAction, - utils.UNSET_RECURRENT: unsetRecurrentAction, - utils.ALLOW_NEGATIVE: allowNegativeAction, - utils.DENY_NEGATIVE: denyNegativeAction, - utils.RESET_ACCOUNT: resetAccountAction, - utils.TOPUP_RESET: topupResetAction, - utils.TOPUP: topupAction, - utils.DEBIT_RESET: debitResetAction, - utils.DEBIT: debitAction, - utils.RESET_COUNTERS: resetCountersAction, - utils.ENABLE_ACCOUNT: enableAccountAction, - utils.DISABLE_ACCOUNT: disableAccountAction, - utils.MetaHTTPPost: callURL, - utils.HttpPostAsync: callURLAsync, - utils.MAIL_ASYNC: mailAsync, - utils.SET_DDESTINATIONS: setddestinations, - utils.REMOVE_ACCOUNT: removeAccountAction, - utils.REMOVE_BALANCE: removeBalanceAction, - utils.SET_BALANCE: setBalanceAction, - utils.TRANSFER_MONETARY_DEFAULT: transferMonetaryDefaultAction, - utils.CGR_RPC: cgrRPCAction, - utils.TopUpZeroNegative: topupZeroNegativeAction, - utils.SetExpiry: setExpiryAction, - utils.MetaPublishAccount: publishAccount, - utils.MetaRemoveSessionCosts: removeSessionCosts, - utils.MetaRemoveExpired: removeExpired, - utils.MetaPostEvent: postEvent, - utils.MetaCDRAccount: resetAccountCDR, - utils.MetaExport: export, - utils.MetaResetThreshold: resetThreshold, - utils.MetaResetStatQueue: resetStatQueue, - utils.MetaRemoteSetAccount: remoteSetAccount, + utils.MetaLog: logAction, + utils.MetaResetTriggers: resetTriggersAction, + utils.CDRLog: cdrLogAction, + utils.MetaSetRecurrent: setRecurrentAction, + utils.MetaUnsetRecurrent: unsetRecurrentAction, + utils.MetaAllowNegative: allowNegativeAction, + utils.MetaDenyNegative: denyNegativeAction, + utils.MetaResetAccount: resetAccountAction, + utils.MetaTopUpReset: topupResetAction, + utils.MetaTopUp: topupAction, + utils.MetaDebitReset: debitResetAction, + utils.MetaDebit: debitAction, + utils.MetaResetCounters: resetCountersAction, + utils.MetaEnableAccount: enableAccountAction, + utils.MetaDisableAccount: disableAccountAction, + utils.MetaHTTPPost: callURL, + utils.HttpPostAsync: callURLAsync, + utils.MetaMailAsync: mailAsync, + utils.MetaSetDDestinations: setddestinations, + utils.MetaRemoveAccount: removeAccountAction, + utils.MetaRemoveBalance: removeBalanceAction, + utils.MetaSetBalance: setBalanceAction, + utils.MetaTransferMonetaryDefault: transferMonetaryDefaultAction, + utils.MetaCgrRpc: cgrRPCAction, + utils.TopUpZeroNegative: topupZeroNegativeAction, + utils.SetExpiry: setExpiryAction, + utils.MetaPublishAccount: publishAccount, + utils.MetaRemoveSessionCosts: removeSessionCosts, + utils.MetaRemoveExpired: removeExpired, + utils.MetaPostEvent: postEvent, + utils.MetaCDRAccount: resetAccountCDR, + utils.MetaExport: export, + utils.MetaResetThreshold: resetThreshold, + utils.MetaResetStatQueue: resetStatQueue, + utils.MetaRemoteSetAccount: remoteSetAccount, } f, exists := actionFuncMap[typ] return f, exists @@ -162,14 +162,14 @@ func cdrLogAction(acc *Account, a *Action, acs Actions, extraData interface{}) ( // set stored cdr values var cdrs []*CDR for _, action := range acs { - if !utils.SliceHasMember([]string{utils.DEBIT, utils.DEBIT_RESET, utils.SET_BALANCE, utils.TOPUP, utils.TOPUP_RESET}, action.ActionType) || + if !utils.SliceHasMember([]string{utils.MetaDebit, utils.MetaDebitReset, utils.MetaSetBalance, utils.MetaTopUp, utils.MetaTopUpReset}, action.ActionType) || action.Balance == nil { continue // Only log specific actions } cdrLogProvider := newCdrLogProvider(acc, action) cdr := &CDR{ RunID: action.ActionType, - Source: utils.CDRLOG, + Source: utils.CDRLog, SetupTime: time.Now(), AnswerTime: time.Now(), OriginID: utils.GenUUID(), diff --git a/engine/action_plan.go b/engine/action_plan.go index 4c7c4573f..58520ffdf 100644 --- a/engine/action_plan.go +++ b/engine/action_plan.go @@ -263,7 +263,7 @@ func (at *ActionTiming) Execute(successActions, failedActions chan *Action) (err if successActions != nil { go func(a *Action) { successActions <- a }(a) } - if a.ActionType == utils.REMOVE_ACCOUNT { + if a.ActionType == utils.MetaRemoveAccount { removeAccountActionFound = true } } diff --git a/engine/action_trigger.go b/engine/action_trigger.go index f9e12ba99..d94121b30 100644 --- a/engine/action_trigger.go +++ b/engine/action_trigger.go @@ -100,7 +100,7 @@ func (at *ActionTrigger) Execute(ub *Account) (err error) { transactionFailed = false break } - if a.ActionType == utils.REMOVE_ACCOUNT { + if a.ActionType == utils.MetaRemoveAccount { removeAccountActionFound = true } } diff --git a/engine/actions_test.go b/engine/actions_test.go index 2482da4c4..57fa45c0d 100644 --- a/engine/actions_test.go +++ b/engine/actions_test.go @@ -603,7 +603,7 @@ func TestActionPlansRemoveMember(t *testing.T) { actions := []*Action{ { Id: "REMOVE", - ActionType: utils.REMOVE_ACCOUNT, + ActionType: utils.MetaRemoveAccount, }, } @@ -1421,7 +1421,7 @@ func TestActionRemove(t *testing.T) { t.Errorf("account to be removed not found: %v", err) } a := &Action{ - ActionType: utils.REMOVE_ACCOUNT, + ActionType: utils.MetaRemoveAccount, } at := &ActionTiming{ @@ -1438,7 +1438,7 @@ func TestActionRemove(t *testing.T) { func TestActionTopup(t *testing.T) { initialUb, _ := dm.GetAccount("vdf:minu") a := &Action{ - ActionType: utils.TOPUP, + ActionType: utils.MetaTopUp, Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary), Value: &utils.ValueFormula{Static: 25}, DestinationIDs: utils.StringMapPointer(utils.NewStringMap("RET")), Weight: utils.Float64Pointer(20)}, @@ -1461,7 +1461,7 @@ func TestActionTopup(t *testing.T) { func TestActionTopupLoaded(t *testing.T) { initialUb, _ := dm.GetAccount("vdf:minitsboy") a := &Action{ - ActionType: utils.TOPUP, + ActionType: utils.MetaTopUp, Balance: &BalanceFilter{Type: utils.StringPointer(utils.MetaMonetary), Value: &utils.ValueFormula{Static: 25}, DestinationIDs: utils.StringMapPointer(utils.NewStringMap("RET")), @@ -1501,7 +1501,7 @@ func TestActionTransactionFuncType(t *testing.T) { Timing: &RateInterval{}, actions: []*Action{ { - ActionType: utils.TOPUP, + ActionType: utils.MetaTopUp, Balance: &BalanceFilter{Value: &utils.ValueFormula{Static: 1.1}, Type: utils.StringPointer(utils.MetaMonetary)}, }, @@ -1539,12 +1539,12 @@ func TestActionTransactionBalanceType(t *testing.T) { Timing: &RateInterval{}, actions: []*Action{ { - ActionType: utils.TOPUP, + ActionType: utils.MetaTopUp, Balance: &BalanceFilter{Value: &utils.ValueFormula{Static: 1.1}, Type: utils.StringPointer(utils.MetaMonetary)}, }, { - ActionType: utils.TOPUP, + ActionType: utils.MetaTopUp, Balance: &BalanceFilter{Type: utils.StringPointer("test")}, }, }, @@ -1576,12 +1576,12 @@ func TestActionTransactionBalanceNotType(t *testing.T) { Timing: &RateInterval{}, actions: []*Action{ { - ActionType: utils.TOPUP, + ActionType: utils.MetaTopUp, Balance: &BalanceFilter{Value: &utils.ValueFormula{Static: 1.1}, Type: utils.StringPointer(utils.MetaVoice)}, }, { - ActionType: utils.TOPUP, + ActionType: utils.MetaTopUp, Balance: &BalanceFilter{Type: utils.StringPointer("test")}, }, }, @@ -1613,14 +1613,14 @@ func TestActionWithExpireWithoutExpire(t *testing.T) { Timing: &RateInterval{}, actions: []*Action{ { - ActionType: utils.TOPUP, + ActionType: utils.MetaTopUp, Balance: &BalanceFilter{ Type: utils.StringPointer(utils.MetaVoice), Value: &utils.ValueFormula{Static: 15}, }, }, { - ActionType: utils.TOPUP, + ActionType: utils.MetaTopUp, Balance: &BalanceFilter{ Type: utils.StringPointer(utils.MetaVoice), Value: &utils.ValueFormula{Static: 30}, @@ -1668,7 +1668,7 @@ func TestActionRemoveBalance(t *testing.T) { Timing: &RateInterval{}, actions: []*Action{ { - ActionType: utils.REMOVE_BALANCE, + ActionType: utils.MetaRemoveBalance, Balance: &BalanceFilter{ Type: utils.StringPointer(utils.MetaMonetary), DestinationIDs: utils.StringMapPointer(utils.NewStringMap("NAT", "RET")), @@ -1771,7 +1771,7 @@ func TestActionTransferMonetaryDefault(t *testing.T) { } a := &Action{ - ActionType: utils.TRANSFER_MONETARY_DEFAULT, + ActionType: utils.MetaTransferMonetaryDefault, } at := &ActionTiming{ @@ -1831,7 +1831,7 @@ func TestActionTransferMonetaryDefaultFilter(t *testing.T) { } a := &Action{ - ActionType: utils.TRANSFER_MONETARY_DEFAULT, + ActionType: utils.MetaTransferMonetaryDefault, Balance: &BalanceFilter{Weight: utils.Float64Pointer(20)}, } @@ -1892,7 +1892,7 @@ func TestActionConditionalTopup(t *testing.T) { } a := &Action{ - ActionType: utils.TOPUP, + ActionType: utils.MetaTopUp, Filter: `{"Type":"*monetary","Value":1,"Weight":10}`, Balance: &BalanceFilter{ Type: utils.StringPointer(utils.MetaMonetary), @@ -1956,7 +1956,7 @@ func TestActionConditionalTopupNoMatch(t *testing.T) { } a := &Action{ - ActionType: utils.TOPUP, + ActionType: utils.MetaTopUp, Filter: `{"Type":"*monetary","Value":2,"Weight":10}`, Balance: &BalanceFilter{ Type: utils.StringPointer(utils.MetaMonetary), @@ -2020,7 +2020,7 @@ func TestActionConditionalTopupExistingBalance(t *testing.T) { } a := &Action{ - ActionType: utils.TOPUP, + ActionType: utils.MetaTopUp, Filter: `{"Type":"*voice","Value":{"*gte":100}}`, Balance: &BalanceFilter{ Type: utils.StringPointer(utils.MetaMonetary), @@ -2121,7 +2121,7 @@ func TestActionConditionalDisabledIfNegative(t *testing.T) { } a1 := &Action{ - ActionType: utils.SET_BALANCE, + ActionType: utils.MetaSetBalance, Filter: "{\"*and\":[{\"Value\":{\"*lt\":0}},{\"ID\":{\"*eq\":\"*default\"}}]}", Balance: &BalanceFilter{ Type: utils.StringPointer("*sms"), @@ -2131,7 +2131,7 @@ func TestActionConditionalDisabledIfNegative(t *testing.T) { Weight: 9, } a2 := &Action{ - ActionType: utils.SET_BALANCE, + ActionType: utils.MetaSetBalance, Filter: "{\"*and\":[{\"Value\":{\"*lt\":0}},{\"ID\":{\"*eq\":\"*default\"}}]}", Balance: &BalanceFilter{ Type: utils.StringPointer("*sms"), @@ -2143,7 +2143,7 @@ func TestActionConditionalDisabledIfNegative(t *testing.T) { Weight: 8, } a3 := &Action{ - ActionType: utils.SET_BALANCE, + ActionType: utils.MetaSetBalance, Filter: "{\"*and\":[{\"Value\":{\"*lt\":0}},{\"ID\":{\"*eq\":\"*default\"}}]}", Balance: &BalanceFilter{ Type: utils.StringPointer("*sms"), @@ -2155,7 +2155,7 @@ func TestActionConditionalDisabledIfNegative(t *testing.T) { Weight: 8, } a4 := &Action{ - ActionType: utils.SET_BALANCE, + ActionType: utils.MetaSetBalance, Filter: "{\"*and\":[{\"Value\":{\"*lt\":0}},{\"ID\":{\"*eq\":\"*default\"}}]}", Balance: &BalanceFilter{ Type: utils.StringPointer("*data"), @@ -2167,7 +2167,7 @@ func TestActionConditionalDisabledIfNegative(t *testing.T) { Weight: 7, } a5 := &Action{ - ActionType: utils.SET_BALANCE, + ActionType: utils.MetaSetBalance, Filter: "{\"*and\":[{\"Value\":{\"*lt\":0}},{\"ID\":{\"*eq\":\"*default\"}}]}", Balance: &BalanceFilter{ Type: utils.StringPointer("*voice"), @@ -2241,7 +2241,7 @@ func TestActionSetBalance(t *testing.T) { } a := &Action{ - ActionType: utils.SET_BALANCE, + ActionType: utils.MetaSetBalance, Balance: &BalanceFilter{ ID: utils.StringPointer("m2"), Type: utils.StringPointer(utils.MetaMonetary), @@ -2500,7 +2500,7 @@ func TestValueFormulaDebit(t *testing.T) { func TestClonedAction(t *testing.T) { a := &Action{ Id: "test1", - ActionType: utils.TOPUP, + ActionType: utils.MetaTopUp, Balance: &BalanceFilter{ ID: utils.StringPointer(utils.MetaDefault), Value: &utils.ValueFormula{Static: 1}, @@ -2517,7 +2517,7 @@ func TestClonedActions(t *testing.T) { actions := Actions{ &Action{ Id: "RECUR_FOR_V3HSILLMILLD1G", - ActionType: utils.TOPUP, + ActionType: utils.MetaTopUp, Balance: &BalanceFilter{ ID: utils.StringPointer(utils.MetaDefault), Value: &utils.ValueFormula{Static: 1}, @@ -2527,7 +2527,7 @@ func TestClonedActions(t *testing.T) { }, &Action{ Id: "RECUR_FOR_V3HSILLMILLD5G", - ActionType: utils.DEBIT, + ActionType: utils.MetaDebit, Balance: &BalanceFilter{ ID: utils.StringPointer(utils.MetaDefault), Value: &utils.ValueFormula{Static: 2}, @@ -2548,7 +2548,7 @@ func TestCacheGetClonedActions(t *testing.T) { actions := Actions{ &Action{ Id: "RECUR_FOR_V3HSILLMILLD1G", - ActionType: utils.TOPUP, + ActionType: utils.MetaTopUp, Balance: &BalanceFilter{ ID: utils.StringPointer(utils.MetaDefault), Value: &utils.ValueFormula{Static: 1}, @@ -2558,7 +2558,7 @@ func TestCacheGetClonedActions(t *testing.T) { }, &Action{ Id: "REACT_FOR_V3HSILLMILL", - ActionType: utils.SET_BALANCE, + ActionType: utils.MetaSetBalance, Balance: &BalanceFilter{ ID: utils.StringPointer("for_v3hsillmill_sms_ill"), Type: utils.StringPointer(utils.MetaSMS), @@ -2644,7 +2644,7 @@ func TestCdrLogAction(t *testing.T) { } a := &Action{ Id: "CDRLog1", - ActionType: utils.CDRLOG, + ActionType: utils.CDRLog, ExtraParameters: "{\"BalanceID\":\"~*acnt.BalanceID\",\"ActionID\":\"~*act.ActionID\",\"BalanceValue\":\"~*acnt.BalanceValue\"}", Weight: 50, } @@ -2692,7 +2692,7 @@ func TestCdrLogAction(t *testing.T) { "RequestType": "*none", "RunID": "*debit", "SetupTime": mock.args.CGREvent.Event["SetupTime"], - "Source": utils.CDRLOG, + "Source": utils.CDRLog, "Subject": "1001", "Tenant": "cgrates.org", "ToR": "*monetary", diff --git a/engine/fscdr.go b/engine/fscdr.go index e74f7c089..82d8dd88d 100644 --- a/engine/fscdr.go +++ b/engine/fscdr.go @@ -135,12 +135,12 @@ func (fsCdr FSCdr) AsCDR(timezone string) (storCdr *CDR, err error) { Source: FS_CDR_SOURCE, OriginID: fsCdr.vars[FS_UUID], ToR: utils.MetaVoice, - RequestType: utils.FirstNonEmpty(fsCdr.vars[utils.CGR_REQTYPE], fsCdr.cgrCfg.GeneralCfg().DefaultReqType), - Tenant: utils.FirstNonEmpty(fsCdr.vars[utils.CGR_TENANT], fsCdr.cgrCfg.GeneralCfg().DefaultTenant), - Category: utils.FirstNonEmpty(fsCdr.vars[utils.CGR_CATEGORY], fsCdr.cgrCfg.GeneralCfg().DefaultCategory), - Account: fsCdr.firstDefined([]string{utils.CGR_ACCOUNT, FS_USERNAME}, FsUsername), - Subject: fsCdr.firstDefined([]string{utils.CGR_SUBJECT, utils.CGR_ACCOUNT, FS_USERNAME}, FsUsername), - Destination: utils.FirstNonEmpty(fsCdr.vars[utils.CGR_DESTINATION], fsCdr.vars[FS_CALL_DEST_NR], fsCdr.vars[FS_SIP_REQUSER]), + RequestType: utils.FirstNonEmpty(fsCdr.vars[utils.CGRReqType], fsCdr.cgrCfg.GeneralCfg().DefaultReqType), + Tenant: utils.FirstNonEmpty(fsCdr.vars[utils.CGRTenant], fsCdr.cgrCfg.GeneralCfg().DefaultTenant), + Category: utils.FirstNonEmpty(fsCdr.vars[utils.CGRCategory], fsCdr.cgrCfg.GeneralCfg().DefaultCategory), + Account: fsCdr.firstDefined([]string{utils.CGRAccount, FS_USERNAME}, FsUsername), + Subject: fsCdr.firstDefined([]string{utils.CGRSubject, utils.CGRAccount, FS_USERNAME}, FsUsername), + Destination: utils.FirstNonEmpty(fsCdr.vars[utils.CGRDestination], fsCdr.vars[FS_CALL_DEST_NR], fsCdr.vars[FS_SIP_REQUSER]), ExtraFields: fsCdr.getExtraFields(), ExtraInfo: fsCdr.vars["cgr_extrainfo"], CostSource: fsCdr.vars["cgr_costsource"], diff --git a/engine/fscdr_test.go b/engine/fscdr_test.go index fc763aeb3..12af37bcd 100644 --- a/engine/fscdr_test.go +++ b/engine/fscdr_test.go @@ -549,11 +549,11 @@ func TestFsCdrDDazRSRExtraFields(t *testing.T) { func TestFsCdrFirstDefined(t *testing.T) { newReader := bytes.NewReader(body) fsCdr, _ := NewFSCdr(newReader, fsCdrCfg) - value := fsCdr.firstDefined([]string{utils.CGR_SUBJECT, utils.CGR_ACCOUNT, FS_USERNAME}, FsUsername) + value := fsCdr.firstDefined([]string{utils.CGRSubject, utils.CGRAccount, FS_USERNAME}, FsUsername) if value != "1001" { t.Errorf("Expecting: 1001, received: %s", value) } - value = fsCdr.firstDefined([]string{utils.CGR_ACCOUNT, FS_USERNAME}, FsUsername) + value = fsCdr.firstDefined([]string{utils.CGRAccount, FS_USERNAME}, FsUsername) if value != "1001" { t.Errorf("Expecting: 1001, received: %s", value) } diff --git a/engine/loader_csv_test.go b/engine/loader_csv_test.go index 8da1c9856..3ff77f21a 100644 --- a/engine/loader_csv_test.go +++ b/engine/loader_csv_test.go @@ -640,8 +640,8 @@ func TestLoadActions(t *testing.T) { expected := []*Action{ { Id: "MINI", - ActionType: utils.TOPUP_RESET, - ExpirationString: utils.UNLIMITED, + ActionType: utils.MetaTopUpReset, + ExpirationString: utils.MetaUnlimited, ExtraParameters: "", Weight: 10, Balance: &BalanceFilter{ @@ -659,8 +659,8 @@ func TestLoadActions(t *testing.T) { }, { Id: "MINI", - ActionType: utils.TOPUP, - ExpirationString: utils.UNLIMITED, + ActionType: utils.MetaTopUp, + ExpirationString: utils.MetaUnlimited, ExtraParameters: "", Weight: 10, Balance: &BalanceFilter{ @@ -686,8 +686,8 @@ func TestLoadActions(t *testing.T) { expected = []*Action{ { Id: "SHARED", - ActionType: utils.TOPUP, - ExpirationString: utils.UNLIMITED, + ActionType: utils.MetaTopUp, + ExpirationString: utils.MetaUnlimited, Weight: 10, Balance: &BalanceFilter{ Type: utils.StringPointer(utils.MetaMonetary), @@ -710,7 +710,7 @@ func TestLoadActions(t *testing.T) { expected = []*Action{ { Id: "DEFEE", - ActionType: utils.CDRLOG, + ActionType: utils.CDRLog, ExtraParameters: `{"Category":"^ddi","MediationRunId":"^did_run"}`, Weight: 10, Balance: &BalanceFilter{ @@ -732,10 +732,10 @@ func TestLoadActions(t *testing.T) { expected = []*Action{ { Id: "TOPUP_RST_GNR_1000", - ActionType: utils.TOPUP_RESET, + ActionType: utils.MetaTopUpReset, ExtraParameters: `{"*voice": 60.0,"*data":1024.0,"*sms":1.0}`, Weight: 10, - ExpirationString: utils.UNLIMITED, + ExpirationString: utils.MetaUnlimited, Balance: &BalanceFilter{ Uuid: asGnrc[0].Balance.Uuid, Type: utils.StringPointer(utils.MetaGeneric), diff --git a/engine/tpreader.go b/engine/tpreader.go index c89529eb3..62a647a4d 100644 --- a/engine/tpreader.go +++ b/engine/tpreader.go @@ -647,7 +647,7 @@ func (tpr *TpReader) LoadActionTriggers() (err error) { } atrs[idx].Balance.Weight = utils.Float64Pointer(u) } - if atr.BalanceExpirationDate != "" && atr.BalanceExpirationDate != utils.MetaAny && atr.ExpirationDate != utils.UNLIMITED { + if atr.BalanceExpirationDate != "" && atr.BalanceExpirationDate != utils.MetaAny && atr.ExpirationDate != utils.MetaUnlimited { u, err := utils.ParseTimeDetectLayout(atr.BalanceExpirationDate, tpr.timezone) if err != nil { return err @@ -850,7 +850,7 @@ func (tpr *TpReader) LoadAccountActionsFiltered(qriedAA *utils.TPAccountActions) } atrs[idx].Balance.Weight = utils.Float64Pointer(u) } - if atr.BalanceExpirationDate != "" && atr.BalanceExpirationDate != utils.MetaAny && atr.ExpirationDate != utils.UNLIMITED { + if atr.BalanceExpirationDate != "" && atr.BalanceExpirationDate != utils.MetaAny && atr.ExpirationDate != utils.MetaUnlimited { u, err := utils.ParseTimeDetectLayout(atr.BalanceExpirationDate, tpr.timezone) if err != nil { return err diff --git a/engine/z_actions2_it_test.go b/engine/z_actions2_it_test.go index 914d2ab85..6dfca812a 100644 --- a/engine/z_actions2_it_test.go +++ b/engine/z_actions2_it_test.go @@ -248,7 +248,7 @@ func testActionsUpdateBalance(t *testing.T) { t.Errorf("Calling APIerSv1.SetAccount received: %s", reply) } topupAction := &utils.AttrSetActions{ActionsId: "ACT_TOPUP_RST", Actions: []*utils.TPAction{ - {Identifier: utils.TOPUP, BalanceId: "test", BalanceType: utils.MetaMonetary, Units: "5", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, + {Identifier: utils.MetaTopUp, BalanceId: "test", BalanceType: utils.MetaMonetary, Units: "5", ExpiryTime: utils.MetaUnlimited, Weight: 20.0}, }} if err := actsRPC.Call(utils.APIerSv2SetActions, topupAction, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) @@ -256,7 +256,7 @@ func testActionsUpdateBalance(t *testing.T) { t.Errorf("Calling APIerSv2.SetActions received: %s", reply) } changeBlockerAction := &utils.AttrSetActions{ActionsId: "ACT_BAL_UPDT", Actions: []*utils.TPAction{ - {Identifier: utils.SET_BALANCE, BalanceId: "test", BalanceBlocker: "true"}, + {Identifier: utils.MetaSetBalance, BalanceId: "test", BalanceBlocker: "true"}, }} if err := actsRPC.Call(utils.APIerSv2SetActions, changeBlockerAction, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) diff --git a/engine/z_actions_it_test.go b/engine/z_actions_it_test.go index 0729418ae..f6a2cb581 100644 --- a/engine/z_actions_it_test.go +++ b/engine/z_actions_it_test.go @@ -128,8 +128,8 @@ func testActionsitSetCdrlogDebit(t *testing.T) { t.Errorf("Calling APIerSv1.SetAccount received: %s", reply) } attrsAA := &utils.AttrSetActions{ActionsId: "ACTS_1", Actions: []*utils.TPAction{ - {Identifier: utils.DEBIT, BalanceType: utils.MetaMonetary, Units: "5", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, - {Identifier: utils.CDRLOG}, + {Identifier: utils.MetaDebit, BalanceType: utils.MetaMonetary, Units: "5", ExpiryTime: utils.MetaUnlimited, Weight: 20.0}, + {Identifier: utils.CDRLog}, }} if err := actsLclRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) @@ -143,20 +143,20 @@ func testActionsitSetCdrlogDebit(t *testing.T) { t.Errorf("Calling APIerSv1.ExecuteAction received: %s", reply) } var rcvedCdrs []*ExternalCDR - if err := actsLclRpc.Call(utils.APIerSv2GetCDRs, &utils.RPCCDRsFilter{Sources: []string{utils.CDRLOG}, + if err := actsLclRpc.Call(utils.APIerSv2GetCDRs, &utils.RPCCDRsFilter{Sources: []string{utils.CDRLog}, Accounts: []string{attrsSetAccount.Account}}, &rcvedCdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(rcvedCdrs) != 1 { t.Error("Unexpected number of CDRs returned: ", len(rcvedCdrs)) } else if rcvedCdrs[0].ToR != utils.MetaMonetary || rcvedCdrs[0].OriginHost != "127.0.0.1" || - rcvedCdrs[0].Source != utils.CDRLOG || + rcvedCdrs[0].Source != utils.CDRLog || rcvedCdrs[0].RequestType != utils.MetaNone || rcvedCdrs[0].Tenant != "cgrates.org" || rcvedCdrs[0].Account != "dan2904" || rcvedCdrs[0].Subject != "dan2904" || rcvedCdrs[0].Usage != "1" || - rcvedCdrs[0].RunID != utils.DEBIT || + rcvedCdrs[0].RunID != utils.MetaDebit || strconv.FormatFloat(rcvedCdrs[0].Cost, 'f', -1, 64) != attrsAA.Actions[0].Units { t.Errorf("Received: %+v", rcvedCdrs[0]) } @@ -171,8 +171,8 @@ func testActionsitSetCdrlogTopup(t *testing.T) { t.Errorf("Calling APIerSv1.SetAccount received: %s", reply) } attrsAA := &utils.AttrSetActions{ActionsId: "ACTS_2", Actions: []*utils.TPAction{ - {Identifier: utils.TOPUP, BalanceType: utils.MetaMonetary, Units: "5", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, - {Identifier: utils.CDRLOG}, + {Identifier: utils.MetaTopUp, BalanceType: utils.MetaMonetary, Units: "5", ExpiryTime: utils.MetaUnlimited, Weight: 20.0}, + {Identifier: utils.CDRLog}, }} if err := actsLclRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) @@ -186,20 +186,20 @@ func testActionsitSetCdrlogTopup(t *testing.T) { t.Errorf("Calling APIerSv1.ExecuteAction received: %s", reply) } var rcvedCdrs []*ExternalCDR - if err := actsLclRpc.Call(utils.APIerSv2GetCDRs, &utils.RPCCDRsFilter{Sources: []string{utils.CDRLOG}, + if err := actsLclRpc.Call(utils.APIerSv2GetCDRs, &utils.RPCCDRsFilter{Sources: []string{utils.CDRLog}, Accounts: []string{attrsSetAccount.Account}}, &rcvedCdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(rcvedCdrs) != 1 { t.Error("Unexpected number of CDRs returned: ", len(rcvedCdrs)) } else if rcvedCdrs[0].ToR != utils.MetaMonetary || rcvedCdrs[0].OriginHost != "127.0.0.1" || - rcvedCdrs[0].Source != utils.CDRLOG || + rcvedCdrs[0].Source != utils.CDRLog || rcvedCdrs[0].RequestType != utils.MetaNone || rcvedCdrs[0].Tenant != "cgrates.org" || rcvedCdrs[0].Account != "dan2905" || rcvedCdrs[0].Subject != "dan2905" || rcvedCdrs[0].Usage != "1" || - rcvedCdrs[0].RunID != utils.TOPUP || + rcvedCdrs[0].RunID != utils.MetaTopUp || strconv.FormatFloat(rcvedCdrs[0].Cost, 'f', -1, 64) != attrsAA.Actions[0].Units { t.Errorf("Received: %+v", rcvedCdrs[0]) } @@ -209,9 +209,9 @@ func testActionsitCdrlogEmpty(t *testing.T) { var reply string attrsSetAccount := &utils.AttrSetAccount{Tenant: "cgrates.org", Account: "dan2904"} attrsAA := &utils.AttrSetActions{ActionsId: "ACTS_3", Actions: []*utils.TPAction{ - {Identifier: utils.DEBIT, BalanceType: utils.MetaMonetary, DestinationIds: "RET", - Units: "5", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, - {Identifier: utils.CDRLOG}, + {Identifier: utils.MetaDebit, BalanceType: utils.MetaMonetary, DestinationIds: "RET", + Units: "5", ExpiryTime: utils.MetaUnlimited, Weight: 20.0}, + {Identifier: utils.CDRLog}, }} if err := actsLclRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) @@ -225,15 +225,15 @@ func testActionsitCdrlogEmpty(t *testing.T) { t.Errorf("Calling APIerSv1.ExecuteAction received: %s", reply) } var rcvedCdrs []*ExternalCDR - if err := actsLclRpc.Call(utils.APIerSv2GetCDRs, &utils.RPCCDRsFilter{Sources: []string{utils.CDRLOG}, - Accounts: []string{attrsSetAccount.Account}, RunIDs: []string{utils.DEBIT}}, &rcvedCdrs); err != nil { + if err := actsLclRpc.Call(utils.APIerSv2GetCDRs, &utils.RPCCDRsFilter{Sources: []string{utils.CDRLog}, + Accounts: []string{attrsSetAccount.Account}, RunIDs: []string{utils.MetaDebit}}, &rcvedCdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(rcvedCdrs) != 2 { t.Error("Unexpected number of CDRs returned: ", len(rcvedCdrs)) } else { for _, cdr := range rcvedCdrs { - if cdr.RunID != utils.DEBIT { - t.Errorf("Expecting : DEBIT, received: %+v", cdr.RunID) + if cdr.RunID != utils.MetaDebit { + t.Errorf("Expecting : MetaDebit, received: %+v", cdr.RunID) } } } @@ -244,12 +244,12 @@ func testActionsitCdrlogWithParams(t *testing.T) { attrsSetAccount := &utils.AttrSetAccount{Tenant: "cgrates.org", Account: "dan2904"} attrsAA := &utils.AttrSetActions{ActionsId: "ACTS_4", Actions: []*utils.TPAction{ - {Identifier: utils.DEBIT, BalanceType: utils.MetaMonetary, - DestinationIds: "RET", Units: "25", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, - {Identifier: utils.CDRLOG, + {Identifier: utils.MetaDebit, BalanceType: utils.MetaMonetary, + DestinationIds: "RET", Units: "25", ExpiryTime: utils.MetaUnlimited, Weight: 20.0}, + {Identifier: utils.CDRLog, ExtraParameters: `{"RequestType":"*pseudoprepaid","Subject":"DifferentThanAccount", "ToR":"~ActionType:s/^\\*(.*)$/did_$1/"}`}, - {Identifier: utils.DEBIT_RESET, BalanceType: utils.MetaMonetary, - DestinationIds: "RET", Units: "25", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, + {Identifier: utils.MetaDebitReset, BalanceType: utils.MetaMonetary, + DestinationIds: "RET", Units: "25", ExpiryTime: utils.MetaUnlimited, Weight: 20.0}, }, } if err := actsLclRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { @@ -264,14 +264,14 @@ func testActionsitCdrlogWithParams(t *testing.T) { t.Errorf("Calling APIerSv1.ExecuteAction received: %s", reply) } var rcvedCdrs []*ExternalCDR - if err := actsLclRpc.Call(utils.APIerSv2GetCDRs, &utils.RPCCDRsFilter{Sources: []string{utils.CDRLOG}, - Accounts: []string{attrsSetAccount.Account}, RunIDs: []string{utils.DEBIT}, RequestTypes: []string{"*pseudoprepaid"}}, &rcvedCdrs); err != nil { + if err := actsLclRpc.Call(utils.APIerSv2GetCDRs, &utils.RPCCDRsFilter{Sources: []string{utils.CDRLog}, + Accounts: []string{attrsSetAccount.Account}, RunIDs: []string{utils.MetaDebit}, RequestTypes: []string{"*pseudoprepaid"}}, &rcvedCdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(rcvedCdrs) != 1 { t.Error("Unexpected number of CDRs returned: ", len(rcvedCdrs)) } - if err := actsLclRpc.Call(utils.APIerSv2GetCDRs, &utils.RPCCDRsFilter{Sources: []string{utils.CDRLOG}, - Accounts: []string{attrsSetAccount.Account}, RunIDs: []string{utils.DEBIT_RESET}, RequestTypes: []string{"*pseudoprepaid"}}, &rcvedCdrs); err != nil { + if err := actsLclRpc.Call(utils.APIerSv2GetCDRs, &utils.RPCCDRsFilter{Sources: []string{utils.CDRLog}, + Accounts: []string{attrsSetAccount.Account}, RunIDs: []string{utils.MetaDebitReset}, RequestTypes: []string{"*pseudoprepaid"}}, &rcvedCdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(rcvedCdrs) != 1 { t.Error("Unexpected number of CDRs returned: ", len(rcvedCdrs)) @@ -284,9 +284,9 @@ func testActionsitCdrlogWithParams2(t *testing.T) { attrsAA := &utils.AttrSetActions{ ActionsId: "CustomAction", Actions: []*utils.TPAction{ - {Identifier: utils.DEBIT, BalanceType: utils.MetaMonetary, - DestinationIds: "RET", Units: "25", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, - {Identifier: utils.CDRLOG, + {Identifier: utils.MetaDebit, BalanceType: utils.MetaMonetary, + DestinationIds: "RET", Units: "25", ExpiryTime: utils.MetaUnlimited, Weight: 20.0}, + {Identifier: utils.CDRLog, ExtraParameters: `{"RequestType":"*pseudoprepaid", "Usage":"10", "Subject":"testActionsitCdrlogWithParams2", "ToR":"~ActionType:s/^\\*(.*)$/did_$1/"}`}, }, } @@ -302,7 +302,7 @@ func testActionsitCdrlogWithParams2(t *testing.T) { t.Errorf("Calling APIerSv1.ExecuteAction received: %s", reply) } var rcvedCdrs []*ExternalCDR - if err := actsLclRpc.Call(utils.APIerSv2GetCDRs, &utils.RPCCDRsFilter{Sources: []string{utils.CDRLOG}, + if err := actsLclRpc.Call(utils.APIerSv2GetCDRs, &utils.RPCCDRsFilter{Sources: []string{utils.CDRLog}, Accounts: []string{attrsSetAccount.Account}, Subjects: []string{"testActionsitCdrlogWithParams2"}}, &rcvedCdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(rcvedCdrs) != 1 { @@ -325,8 +325,8 @@ func testActionsitThresholdCDrLog(t *testing.T) { t.Errorf("Calling APIerSv1.SetAccount received: %s", reply) } attrsAA := &utils.AttrSetActions{ActionsId: "ACT_TH_CDRLOG", Actions: []*utils.TPAction{ - {Identifier: utils.TOPUP, BalanceType: utils.MetaMonetary, Units: "5", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, - {Identifier: utils.CDRLOG}, + {Identifier: utils.MetaTopUp, BalanceType: utils.MetaMonetary, Units: "5", ExpiryTime: utils.MetaUnlimited, Weight: 20.0}, + {Identifier: utils.CDRLog}, }} if err := actsLclRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) @@ -410,20 +410,20 @@ func testActionsitThresholdCDrLog(t *testing.T) { t.Errorf("Expecting ids: %s, received: %s", eIDs, ids) } var rcvedCdrs []*ExternalCDR - if err := actsLclRpc.Call(utils.APIerSv2GetCDRs, &utils.RPCCDRsFilter{Sources: []string{utils.CDRLOG}, + if err := actsLclRpc.Call(utils.APIerSv2GetCDRs, &utils.RPCCDRsFilter{Sources: []string{utils.CDRLog}, Accounts: []string{attrsSetAccount.Account}}, &rcvedCdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(rcvedCdrs) != 1 { t.Error("Unexpected number of CDRs returned: ", len(rcvedCdrs)) } else if rcvedCdrs[0].ToR != utils.MetaMonetary || rcvedCdrs[0].OriginHost != "127.0.0.1" || - rcvedCdrs[0].Source != utils.CDRLOG || + rcvedCdrs[0].Source != utils.CDRLog || rcvedCdrs[0].RequestType != utils.MetaNone || rcvedCdrs[0].Tenant != "cgrates.org" || rcvedCdrs[0].Account != "th_acc" || rcvedCdrs[0].Subject != "th_acc" || rcvedCdrs[0].Usage != "1" || - rcvedCdrs[0].RunID != utils.TOPUP || + rcvedCdrs[0].RunID != utils.MetaTopUp || strconv.FormatFloat(rcvedCdrs[0].Cost, 'f', -1, 64) != attrsAA.Actions[0].Units { t.Errorf("Received: %+v", rcvedCdrs[0]) } @@ -462,7 +462,7 @@ func testActionsitCDRAccount(t *testing.T) { attrsAA := &utils.AttrSetActions{ ActionsId: "ACTS_RESET1", Actions: []*utils.TPAction{ - {Identifier: utils.MetaCDRAccount, ExpiryTime: utils.UNLIMITED, Weight: 20.0}, + {Identifier: utils.MetaCDRAccount, ExpiryTime: utils.MetaUnlimited, Weight: 20.0}, }, } if err := actsLclRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { @@ -543,7 +543,7 @@ func testActionsitThresholdCgrRpcAction(t *testing.T) { var reply string attrsAA := &utils.AttrSetActions{ActionsId: "ACT_TH_CGRRPC", Actions: []*utils.TPAction{ - {Identifier: utils.CGR_RPC, ExtraParameters: `{"Address": "127.0.0.1:2012", + {Identifier: utils.MetaCgrRpc, ExtraParameters: `{"Address": "127.0.0.1:2012", "Transport": "*json", "Method": "RALsV1.Ping", "Attempts":1, @@ -702,8 +702,8 @@ func testActionsitSetSDestinations(t *testing.T) { t.Errorf("Calling APIerSv1.SetAccount received: %s", reply) } attrsAA := &utils.AttrSetActions{ActionsId: "ACT_AddBalance", Actions: []*utils.TPAction{ - {Identifier: utils.TOPUP, BalanceType: utils.MetaMonetary, DestinationIds: "*ddc_test", - Units: "5", ExpiryTime: utils.UNLIMITED, Weight: 20.0}, + {Identifier: utils.MetaTopUp, BalanceType: utils.MetaMonetary, DestinationIds: "*ddc_test", + Units: "5", ExpiryTime: utils.MetaUnlimited, Weight: 20.0}, }} if err := actsLclRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) @@ -805,7 +805,7 @@ func testActionsitSetSDestinations(t *testing.T) { //Execute setDDestinations attrSetDDest := &utils.AttrSetActions{ActionsId: "ACT_setDDestination", Actions: []*utils.TPAction{ - {Identifier: utils.SET_DDESTINATIONS, ExtraParameters: "DistinctMetricProfile"}, + {Identifier: utils.MetaSetDDestinations, ExtraParameters: "DistinctMetricProfile"}, }} if err := actsLclRpc.Call(utils.APIerSv2SetActions, attrSetDDest, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) @@ -850,7 +850,7 @@ func testActionsitresetAccountCDR(t *testing.T) { attrsAA := &utils.AttrSetActions{ ActionsId: "resetAccountCDR", Actions: []*utils.TPAction{ - {Identifier: utils.MetaCDRAccount, ExpiryTime: utils.UNLIMITED, Weight: 20.0}, + {Identifier: utils.MetaCDRAccount, ExpiryTime: utils.MetaUnlimited, Weight: 20.0}, }, } if err := actsLclRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { diff --git a/engine/z_onstor_it_test.go b/engine/z_onstor_it_test.go index fcfeef780..57f56bd32 100644 --- a/engine/z_onstor_it_test.go +++ b/engine/z_onstor_it_test.go @@ -693,8 +693,8 @@ func testOnStorITActions(t *testing.T) { acts := Actions{ &Action{ Id: "MINI", - ActionType: utils.TOPUP_RESET, - ExpirationString: utils.UNLIMITED, + ActionType: utils.MetaTopUpReset, + ExpirationString: utils.MetaUnlimited, Weight: 10, Balance: &BalanceFilter{ Type: utils.StringPointer(utils.MetaMonetary), @@ -717,8 +717,8 @@ func testOnStorITActions(t *testing.T) { }, &Action{ Id: "MINI", - ActionType: utils.TOPUP, - ExpirationString: utils.UNLIMITED, + ActionType: utils.MetaTopUp, + ExpirationString: utils.MetaUnlimited, Weight: 10, Balance: &BalanceFilter{ Type: utils.StringPointer(utils.MetaVoice), @@ -781,8 +781,8 @@ func testOnStorITActions(t *testing.T) { acts = Actions{ &Action{ Id: "MINI", - ActionType: utils.TOPUP_RESET, - ExpirationString: utils.UNLIMITED, + ActionType: utils.MetaTopUpReset, + ExpirationString: utils.MetaUnlimited, Weight: 10, Balance: &BalanceFilter{ Type: utils.StringPointer(utils.MetaMonetary), @@ -805,8 +805,8 @@ func testOnStorITActions(t *testing.T) { }, &Action{ Id: "MINI", - ActionType: utils.TOPUP, - ExpirationString: utils.UNLIMITED, + ActionType: utils.MetaTopUp, + ExpirationString: utils.MetaUnlimited, Weight: 10, Balance: &BalanceFilter{ Type: utils.StringPointer(utils.MetaVoice), @@ -831,8 +831,8 @@ func testOnStorITActions(t *testing.T) { }, &Action{ Id: "MINI", - ActionType: utils.DEBIT, - ExpirationString: utils.UNLIMITED, + ActionType: utils.MetaDebit, + ExpirationString: utils.MetaUnlimited, Weight: 20, Balance: &BalanceFilter{ Type: utils.StringPointer(utils.MetaVoice), diff --git a/general_tests/accounts_it_test.go b/general_tests/accounts_it_test.go index 68c5d4f22..7ae11b14c 100644 --- a/general_tests/accounts_it_test.go +++ b/general_tests/accounts_it_test.go @@ -240,7 +240,7 @@ func testV1AccSendToThreshold(t *testing.T) { // Add a disable and log action attrsAA := &utils.AttrSetActions{ActionsId: "DISABLE_LOG", Actions: []*utils.TPAction{ - {Identifier: utils.DISABLE_ACCOUNT}, + {Identifier: utils.MetaDisableAccount}, {Identifier: utils.MetaLog}, }} if err := accRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { diff --git a/general_tests/cdrs_processevent_it_test.go b/general_tests/cdrs_processevent_it_test.go index 64056a965..e68c38bbd 100644 --- a/general_tests/cdrs_processevent_it_test.go +++ b/general_tests/cdrs_processevent_it_test.go @@ -452,7 +452,7 @@ func testV1CDRsProcessEventThreshold(t *testing.T) { Actions: []*utils.TPAction{ {Identifier: utils.MetaLog}, { - Identifier: utils.TOPUP_RESET, BalanceType: utils.MetaVoice, + Identifier: utils.MetaTopUpReset, BalanceType: utils.MetaVoice, Units: "10", ExpiryTime: "*unlimited", DestinationIds: "*any", BalanceWeight: "10", Weight: 10}, }, diff --git a/general_tests/doubleremove_it_test.go b/general_tests/doubleremove_it_test.go index 92377ee8b..d294b8c0a 100644 --- a/general_tests/doubleremove_it_test.go +++ b/general_tests/doubleremove_it_test.go @@ -187,10 +187,10 @@ func testdoubleRemoveActions(t *testing.T) { ActionsId: "ACTS_1", Actions: []*v1.V1TPAction{ { - Identifier: utils.TOPUP_RESET, + Identifier: utils.MetaTopUpReset, BalanceType: utils.MetaMonetary, Units: 75.0, - ExpiryTime: utils.UNLIMITED, + ExpiryTime: utils.MetaUnlimited, Weight: 20.0}}, } var reply string @@ -206,13 +206,13 @@ func testdoubleRemoveActions(t *testing.T) { // check eOut := []*utils.TPAction{ { - Identifier: utils.TOPUP_RESET, + Identifier: utils.MetaTopUpReset, BalanceType: utils.MetaMonetary, Units: "75", BalanceWeight: "0", BalanceBlocker: "false", BalanceDisabled: "false", - ExpiryTime: utils.UNLIMITED, + ExpiryTime: utils.MetaUnlimited, Weight: 20.0, }} if err := sesRPC.Call(utils.APIerSv1GetActions, utils.StringPointer("ACTS_1"), &reply1); err != nil { diff --git a/general_tests/export_it_test.go b/general_tests/export_it_test.go index e78e5c09c..92be69d44 100644 --- a/general_tests/export_it_test.go +++ b/general_tests/export_it_test.go @@ -423,7 +423,7 @@ func testExpVerifyActionProfiles(t *testing.T) { { ID: "TOPUP", FilterIDs: []string{}, - Type: utils.TOPUP, + Type: utils.MetaTopUp, Path: utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestBalance" + utils.NestingSep + utils.Value, Value: config.NewRSRParsersMustCompile("10", utils.InfieldSep), }, @@ -431,28 +431,28 @@ func testExpVerifyActionProfiles(t *testing.T) { { ID: "SET_BALANCE_TEST_DATA", FilterIDs: []string{}, - Type: utils.SET_BALANCE, + Type: utils.MetaSetBalance, Path: utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestDataBalance" + utils.NestingSep + utils.Type, Value: config.NewRSRParsersMustCompile(utils.MetaData, utils.InfieldSep), }, { ID: "TOPUP_TEST_DATA", FilterIDs: []string{}, - Type: utils.TOPUP, + Type: utils.MetaTopUp, Path: utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestDataBalance" + utils.NestingSep + utils.Value, Value: config.NewRSRParsersMustCompile("1024", utils.InfieldSep), }, { ID: "SET_BALANCE_TEST_VOICE", FilterIDs: []string{}, - Type: utils.SET_BALANCE, + Type: utils.MetaSetBalance, Path: utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestVoiceBalance" + utils.NestingSep + utils.Type, Value: config.NewRSRParsersMustCompile(utils.MetaVoice, utils.InfieldSep), }, { ID: "TOPUP_TEST_VOICE", FilterIDs: []string{}, - Type: utils.TOPUP, + Type: utils.MetaTopUp, Path: utils.DynamicDataPrefix + utils.MetaCounterBalance + utils.NestingSep + "TestVoiceBalance" + utils.NestingSep + utils.Value, Value: config.NewRSRParsersMustCompile("15m15s", utils.InfieldSep), }, diff --git a/general_tests/rpccaching_it_test.go b/general_tests/rpccaching_it_test.go index 41ca423b5..030379135 100644 --- a/general_tests/rpccaching_it_test.go +++ b/general_tests/rpccaching_it_test.go @@ -143,7 +143,7 @@ func testRPCMethodsAddData(t *testing.T) { var reply string // Add a disable and log action attrsAA := &utils.AttrSetActions{ActionsId: "DISABLE_LOG", Actions: []*utils.TPAction{ - {Identifier: utils.DISABLE_ACCOUNT}, + {Identifier: utils.MetaDisableAccount}, {Identifier: utils.MetaLog}, }} if err := rpcRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { @@ -153,7 +153,7 @@ func testRPCMethodsAddData(t *testing.T) { } // Add an enable and log action attrsAA2 := &utils.AttrSetActions{ActionsId: "ENABLE_LOG", Actions: []*utils.TPAction{ - {Identifier: utils.ENABLE_ACCOUNT}, + {Identifier: utils.MetaEnableAccount}, {Identifier: utils.MetaLog}, }} if err := rpcRpc.Call(utils.APIerSv2SetActions, attrsAA2, &reply); err != nil && err.Error() != utils.ErrExists.Error() { diff --git a/scheduler/scheduler_test.go b/scheduler/scheduler_test.go index b58ccf6e5..6c66a4cb8 100644 --- a/scheduler/scheduler_test.go +++ b/scheduler/scheduler_test.go @@ -27,22 +27,22 @@ import ( func TestSchedulerUpdateActStats(t *testing.T) { sched := &Scheduler{actStatsInterval: time.Millisecond, actSuccessStats: make(map[string]map[time.Time]bool)} - sched.updateActStats(&engine.Action{Id: "REMOVE_1", ActionType: utils.REMOVE_ACCOUNT}, false) - if len(sched.actSuccessStats[utils.REMOVE_ACCOUNT]) != 1 { - t.Errorf("Wrong stats: %+v", sched.actSuccessStats[utils.REMOVE_ACCOUNT]) + sched.updateActStats(&engine.Action{Id: "REMOVE_1", ActionType: utils.MetaRemoveAccount}, false) + if len(sched.actSuccessStats[utils.MetaRemoveAccount]) != 1 { + t.Errorf("Wrong stats: %+v", sched.actSuccessStats[utils.MetaRemoveAccount]) } - sched.updateActStats(&engine.Action{Id: "REMOVE_2", ActionType: utils.REMOVE_ACCOUNT}, false) - if len(sched.actSuccessStats[utils.REMOVE_ACCOUNT]) != 2 { - t.Errorf("Wrong stats: %+v", sched.actSuccessStats[utils.REMOVE_ACCOUNT]) + sched.updateActStats(&engine.Action{Id: "REMOVE_2", ActionType: utils.MetaRemoveAccount}, false) + if len(sched.actSuccessStats[utils.MetaRemoveAccount]) != 2 { + t.Errorf("Wrong stats: %+v", sched.actSuccessStats[utils.MetaRemoveAccount]) } sched.updateActStats(&engine.Action{Id: "LOG1", ActionType: utils.MetaLog}, false) if len(sched.actSuccessStats[utils.MetaLog]) != 1 || - len(sched.actSuccessStats[utils.REMOVE_ACCOUNT]) != 2 { + len(sched.actSuccessStats[utils.MetaRemoveAccount]) != 2 { t.Errorf("Wrong stats: %+v", sched.actSuccessStats) } time.Sleep(sched.actStatsInterval) - sched.updateActStats(&engine.Action{Id: "REMOVE_3", ActionType: utils.REMOVE_ACCOUNT}, false) - if len(sched.actSuccessStats[utils.REMOVE_ACCOUNT]) != 1 || len(sched.actSuccessStats) != 1 { + sched.updateActStats(&engine.Action{Id: "REMOVE_3", ActionType: utils.MetaRemoveAccount}, false) + if len(sched.actSuccessStats[utils.MetaRemoveAccount]) != 1 || len(sched.actSuccessStats) != 1 { t.Errorf("Wrong stats: %+v", sched.actSuccessStats) } } diff --git a/utils/consts.go b/utils/consts.go index 1227fe208..5c142bfb2 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -1037,46 +1037,46 @@ const ( // Actions const ( - MetaLog = "*log" - RESET_TRIGGERS = "*reset_triggers" - SET_RECURRENT = "*set_recurrent" - UNSET_RECURRENT = "*unset_recurrent" - ALLOW_NEGATIVE = "*allow_negative" - DENY_NEGATIVE = "*deny_negative" - RESET_ACCOUNT = "*reset_account" - REMOVE_ACCOUNT = "*remove_account" - SET_BALANCE = "*set_balance" - REMOVE_BALANCE = "*remove_balance" - TOPUP_RESET = "*topup_reset" - TOPUP = "*topup" - DEBIT_RESET = "*debit_reset" - DEBIT = "*debit" - RESET_COUNTERS = "*reset_counters" - ENABLE_ACCOUNT = "*enable_account" - DISABLE_ACCOUNT = "*disable_account" - HttpPostAsync = "*http_post_async" - MAIL_ASYNC = "*mail_async" - UNLIMITED = "*unlimited" - CDRLOG = "*cdrlog" - SET_DDESTINATIONS = "*set_ddestinations" - TRANSFER_MONETARY_DEFAULT = "*transfer_monetary_default" - CGR_RPC = "*cgr_rpc" - TopUpZeroNegative = "*topup_zero_negative" - SetExpiry = "*set_expiry" - MetaPublishAccount = "*publish_account" - MetaRemoveSessionCosts = "*remove_session_costs" - MetaRemoveExpired = "*remove_expired" - MetaPostEvent = "*post_event" - MetaCDRAccount = "*reset_account_cdr" - MetaResetThreshold = "*reset_threshold" - MetaResetStatQueue = "*reset_stat_queue" - MetaRemoteSetAccount = "*remote_set_account" - ActionID = "ActionID" - ActionType = "ActionType" - ActionValue = "ActionValue" - BalanceValue = "BalanceValue" - BalanceUnits = "BalanceUnits" - ExtraParameters = "ExtraParameters" + MetaLog = "*log" + MetaResetTriggers = "*reset_triggers" + MetaSetRecurrent = "*set_recurrent" + MetaUnsetRecurrent = "*unset_recurrent" + MetaAllowNegative = "*allow_negative" + MetaDenyNegative = "*deny_negative" + MetaResetAccount = "*reset_account" + MetaRemoveAccount = "*remove_account" + MetaSetBalance = "*set_balance" + MetaRemoveBalance = "*remove_balance" + MetaTopUpReset = "*topup_reset" + MetaTopUp = "*topup" + MetaDebitReset = "*debit_reset" + MetaDebit = "*debit" + MetaResetCounters = "*reset_counters" + MetaEnableAccount = "*enable_account" + MetaDisableAccount = "*disable_account" + HttpPostAsync = "*http_post_async" + MetaMailAsync = "*mail_async" + MetaUnlimited = "*unlimited" + CDRLog = "*cdrlog" + MetaSetDDestinations = "*set_ddestinations" + MetaTransferMonetaryDefault = "*transfer_monetary_default" + MetaCgrRpc = "*cgr_rpc" + TopUpZeroNegative = "*topup_zero_negative" + SetExpiry = "*set_expiry" + MetaPublishAccount = "*publish_account" + MetaRemoveSessionCosts = "*remove_session_costs" + MetaRemoveExpired = "*remove_expired" + MetaPostEvent = "*post_event" + MetaCDRAccount = "*reset_account_cdr" + MetaResetThreshold = "*reset_threshold" + MetaResetStatQueue = "*reset_stat_queue" + MetaRemoteSetAccount = "*remote_set_account" + ActionID = "ActionID" + ActionType = "ActionType" + ActionValue = "ActionValue" + BalanceValue = "BalanceValue" + BalanceUnits = "BalanceUnits" + ExtraParameters = "ExtraParameters" ) // Migrator Metas @@ -1805,19 +1805,19 @@ const ( //cgr_ variables const ( - CGR_ACCOUNT = "cgr_account" - CGR_ROUTE = "cgr_route" - CGR_DESTINATION = "cgr_destination" - CGR_SUBJECT = "cgr_subject" - CGR_CATEGORY = "cgr_category" - CGR_REQTYPE = "cgr_reqtype" - CGR_TENANT = "cgr_tenant" - CGR_PDD = "cgr_pdd" - CGR_DISCONNECT_CAUSE = "cgr_disconnectcause" - CGR_COMPUTELCR = "cgr_computelcr" - CGR_ROUTES = "cgr_routes" - CGRFlags = "cgr_flags" - CGROpts = "cgr_opts" + CGRAccount = "cgr_account" + CGRRoute = "cgr_route" + CGRDestination = "cgr_destination" + CGRSubject = "cgr_subject" + CGRCategory = "cgr_category" + CGRReqType = "cgr_reqtype" + CGRTenant = "cgr_tenant" + CGRPdd = "cgr_pdd" + CGRDisconnectCause = "cgr_disconnectcause" + CGRComputeLCR = "cgr_computelcr" + CGRRoutes = "cgr_routes" + CGRFlags = "cgr_flags" + CGROpts = "cgr_opts" ) //CSV file name diff --git a/utils/coreutils.go b/utils/coreutils.go index c3f1a7078..bc1e3b32f 100644 --- a/utils/coreutils.go +++ b/utils/coreutils.go @@ -201,7 +201,7 @@ func getAddDuration(tmStr string) (addDur time.Duration, err error) { func ParseTimeDetectLayout(tmStr string, timezone string) (time.Time, error) { tmStr = strings.TrimSpace(tmStr) var nilTime time.Time - if len(tmStr) == 0 || tmStr == UNLIMITED { + if len(tmStr) == 0 || tmStr == MetaUnlimited { return nilTime, nil } loc, err := time.LoadLocation(timezone) @@ -209,7 +209,7 @@ func ParseTimeDetectLayout(tmStr string, timezone string) (time.Time, error) { return nilTime, err } switch { - case tmStr == UNLIMITED || tmStr == "": + case tmStr == MetaUnlimited || tmStr == "": // leave it at zero case tmStr == "*daily": return time.Now().AddDate(0, 0, 1), nil // add one day @@ -353,7 +353,7 @@ func ParseDurationWithNanosecs(durStr string) (d time.Duration, err error) { if durStr == "" { return } - if durStr == UNLIMITED { + if durStr == MetaUnlimited { durStr = "-1" } if _, err = strconv.ParseFloat(durStr, 64); err == nil { // Seconds format considered diff --git a/utils/coreutils_test.go b/utils/coreutils_test.go index 4475a4de7..e58888d7c 100644 --- a/utils/coreutils_test.go +++ b/utils/coreutils_test.go @@ -665,7 +665,7 @@ func TestParseDurationWithNanosecs(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", eOut, rcv) } eOut, _ = time.ParseDuration("-1ns") - if rcv, err := ParseDurationWithNanosecs(UNLIMITED); err != nil { + if rcv, err := ParseDurationWithNanosecs(MetaUnlimited); err != nil { t.Error(err) } else if !reflect.DeepEqual(rcv, eOut) { t.Errorf("Expecting: %+v, received: %+v", eOut, rcv)