added *accountID in CGROptionsSet

engine/exportrequest_test.go

@@ -555,8 +555,8 @@ func TestExportRequestSetFields(t *testing.T) {
 	Cache.Clear(nil)
 	onm := utils.NewOrderedNavigableMap()
 	fullPath := &utils.FullPath{
-		PathSlice: []string{utils.MetaReq, utils.MetaAccount},
-		Path:      utils.MetaReq + utils.MetaAccount,
+		PathSlice: []string{utils.MetaReq, utils.MetaAccountID},
+		Path:      utils.MetaReq + utils.MetaAccountID,
 	}
 	val := &utils.DataLeaf{
 		Data: "value1",

engine/thresholds.go

@@ -218,8 +218,8 @@ func (t *Threshold) ProcessEvent(args *utils.CGREvent, dm *DataManager, fltrS *F
 	} else {
 		acnt, _ = args.FieldAsString(utils.AccountField)
 	}
-	if _, has := args.APIOpts[utils.MetaAccount]; has {
-		acnt, _ = args.OptAsString(utils.MetaAccount)
+	if _, has := args.APIOpts[utils.MetaAccountID]; has {
+		acnt, _ = args.OptAsString(utils.MetaAccountID)
 	}
 	if acnt != utils.EmptyString {
 		tntAcnt = utils.ConcatenatedKey(args.Tenant, acnt)

utils/consts.go

@@ -350,7 +350,7 @@ const (
 	MetaBalance               = "*balance"
 	MetaLimit                 = "*limit"
 	MetaEventConnect          = "*event_connect"
-	MetaAccount               = "*accountID"
+	MetaAccountID             = "*accountID"
 	EventName                 = "EventName"
 	// action trigger threshold types
 	TriggerMinEventCounter   = "*min_event_counter"
@@ -2752,7 +2752,7 @@ var CGROptionsSet = NewStringSet([]string{OptsSessionsTTL,
 	OptsAttributesProfileIgnoreFilters, OptsStatsProfileIDs, OptsStatsProfileIgnoreFilters,
 	OptsThresholdsProfileIDs, OptsThresholdsProfileIgnoreFilters, OptsResourcesUsageID, OptsResourcesUsageTTL,
 	OptsResourcesUnits, OptsAttributeS, OptsThresholdS, OptsChargerS, OptsStatS, OptsRALs, OptsRerate,
-	OptsRefund})
+	OptsRefund, MetaAccountID})
 
 // EventExporter metrics
 const (