From 75eb413e93ede026f6d3741c084934d2a4075881 Mon Sep 17 00:00:00 2001
From: Tripon Alexandru-Ionut <alexandru.tripon@itsyscom.com>
Date: Fri, 24 May 2019 12:12:06 +0300
Subject: [PATCH] Added test for DispatchertS with no attribute connection

---
 .../dispatchers_no_attributes/cgrates.json    | 47 +++++++++++++++++++
 dispatchers/attributes.go                     |  6 +--
 dispatchers/attributes_it_test.go             | 29 +++++++++++-
 dispatchers/caches.go                         | 28 +++++------
 dispatchers/cdrs.go                           | 16 +++----
 dispatchers/chargers.go                       |  6 +--
 dispatchers/config.go                         |  2 +-
 dispatchers/dispatchers.go                    |  4 +-
 dispatchers/guardian.go                       |  6 +--
 dispatchers/resources.go                      | 10 ++--
 dispatchers/responder.go                      | 20 ++++----
 dispatchers/scheduler.go                      |  4 +-
 dispatchers/servicemanager.go                 |  8 ++--
 dispatchers/sessions.go                       | 34 +++++++-------
 dispatchers/stats.go                          | 12 ++---
 dispatchers/suppliers.go                      |  6 +--
 dispatchers/thresholds.go                     | 10 ++--
 utils/consts.go                               | 37 ++++++++-------
 18 files changed, 180 insertions(+), 105 deletions(-)
 create mode 100755 data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json

diff --git a/data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json b/data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json
new file mode 100755
index 000000000..27f0f2181
--- /dev/null
+++ b/data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json
@@ -0,0 +1,47 @@
+{
+
+// Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
+// Copyright (C) ITsysCOM GmbH
+//
+// This file contains the default configuration hardcoded into CGRateS.
+// This is what you get when you load CGRateS with an empty configuration file.
+
+"general": {
+ 	"node_id": "DispatcherS1",
+	"log_level": 7,
+ 	"reconnects": 1,	
+},
+
+
+"listen": {
+ 	"rpc_json": ":2012",
+ 	"rpc_gob": ":2013",
+	"http": ":2080",
+},
+
+"stor_db": {
+	"db_type":"*internal",
+},
+
+"cache":{
+ 	"dispatcher_routes": {"limit": -1, "ttl": "2s"}
+},
+
+"scheduler": {
+	"enabled": true,				
+},
+
+"rals": {
+	"enabled": true,
+},
+
+"sessions": {
+	"enabled": true,
+	"listen_bijson": ":3014",
+},
+
+"dispatchers":{
+ 	"enabled": true,
+},
+
+}
\ No newline at end of file
diff --git a/dispatchers/attributes.go b/dispatchers/attributes.go
index 5421ddef3..4028e3f9f 100755
--- a/dispatchers/attributes.go
+++ b/dispatchers/attributes.go
@@ -29,7 +29,7 @@ func (dS *DispatcherService) AttributeSv1Ping(args *utils.CGREventWithArgDispatc
 	args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.AttributeSv1Ping,
 			args.Tenant,
@@ -50,7 +50,7 @@ func (dS *DispatcherService) AttributeSv1GetAttributeForEvent(args *engine.AttrA
 	reply *engine.AttributeProfile) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.AttributeSv1GetAttributeForEvent,
 			args.CGREvent.Tenant,
@@ -70,7 +70,7 @@ func (dS *DispatcherService) AttributeSv1ProcessEvent(args *engine.AttrArgsProce
 	reply *engine.AttrSProcessEventReply) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.AttributeSv1ProcessEvent,
 			args.CGREvent.Tenant,
diff --git a/dispatchers/attributes_it_test.go b/dispatchers/attributes_it_test.go
index 4737817ab..1d2d6b72c 100755
--- a/dispatchers/attributes_it_test.go
+++ b/dispatchers/attributes_it_test.go
@@ -54,6 +54,14 @@ func TestDspAttributeSMongo(t *testing.T) {
 	testDsp(t, sTestsDspAttr, "TestDspAttributeS", "all", "all2", "dispatchers_mongo", "tutorial", "oldtutorial", "dispatchers")
 }
 
+func TestDspAttributeSNoConn(t *testing.T) {
+	testDsp(t, []func(t *testing.T){
+		testDspAttrPingFailover,
+		testDspAttrPing,
+		testDspAttrPingNoArgDispatcher,
+	}, "TestDspAttributeS", "all", "all2", "dispatchers_no_attributes", "tutorial", "oldtutorial", "dispatchers")
+}
+
 func testDspAttrPingFailover(t *testing.T) {
 	var reply string
 	if err := allEngine.RCP.Call(utils.AttributeSv1Ping, new(utils.CGREvent), &reply); err != nil {
@@ -225,7 +233,7 @@ func testDspAttrTestMissingArgDispatcher(t *testing.T) {
 	}
 	var attrReply *engine.AttributeProfile
 	if err := dispEngine.RCP.Call(utils.AttributeSv1GetAttributeForEvent,
-		args, &attrReply); err == nil || err.Error() != utils.NewErrMandatoryIeMissing("ArgDispatcher").Error() {
+		args, &attrReply); err == nil || err.Error() != utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField).Error() {
 		t.Errorf("Error:%v rply=%s", err, utils.ToJSON(attrReply))
 	}
 }
@@ -502,3 +510,22 @@ func testDspAttrGetAttrInternal(t *testing.T) {
 			utils.ToJSON(eRply), utils.ToJSON(rplyEv))
 	}
 }
+
+func testDspAttrPingNoArgDispatcher(t *testing.T) {
+	var reply string
+	if err := allEngine.RCP.Call(utils.AttributeSv1Ping, new(utils.CGREvent), &reply); err != nil {
+		t.Error(err)
+	} else if reply != utils.Pong {
+		t.Errorf("Received: %s", reply)
+	}
+	if dispEngine.RCP == nil {
+		t.Fatal(dispEngine.RCP)
+	}
+	if err := dispEngine.RCP.Call(utils.AttributeSv1Ping, &utils.CGREventWithArgDispatcher{
+		CGREvent: &utils.CGREvent{Tenant: "cgrates.org"},
+	}, &reply); err != nil {
+		t.Error(err)
+	} else if reply != utils.Pong {
+		t.Errorf("Received: %s", reply)
+	}
+}
diff --git a/dispatchers/caches.go b/dispatchers/caches.go
index bb4752407..bcd8c5748 100644
--- a/dispatchers/caches.go
+++ b/dispatchers/caches.go
@@ -31,7 +31,7 @@ func (dS *DispatcherService) CacheSv1Ping(args *utils.CGREventWithArgDispatcher,
 	args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CacheSv1Ping, args.CGREvent.Tenant,
 			args.APIKey, args.CGREvent.Time); err != nil {
@@ -52,7 +52,7 @@ func (dS *DispatcherService) CacheSv1GetItemIDs(args *utils.ArgsGetCacheItemIDsW
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CacheSv1GetItemIDs, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -73,7 +73,7 @@ func (dS *DispatcherService) CacheSv1HasItem(args *utils.ArgsGetCacheItemWithArg
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CacheSv1HasItem, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -94,7 +94,7 @@ func (dS *DispatcherService) CacheSv1GetItemExpiryTime(args *utils.ArgsGetCacheI
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CacheSv1GetItemExpiryTime, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -115,7 +115,7 @@ func (dS *DispatcherService) CacheSv1RemoveItem(args *utils.ArgsGetCacheItemWith
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CacheSv1RemoveItem, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -136,7 +136,7 @@ func (dS *DispatcherService) CacheSv1Clear(args *utils.AttrCacheIDsWithArgDispat
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CacheSv1Clear, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -156,7 +156,7 @@ func (dS *DispatcherService) CacheSv1FlushCache(args utils.AttrReloadCacheWithAr
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CacheSv1FlushCache, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -177,7 +177,7 @@ func (dS *DispatcherService) CacheSv1GetCacheStats(args *utils.AttrCacheIDsWithA
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CacheSv1GetCacheStats, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -197,7 +197,7 @@ func (dS *DispatcherService) CacheSv1PrecacheStatus(args *utils.AttrCacheIDsWith
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CacheSv1PrecacheStatus, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -218,7 +218,7 @@ func (dS *DispatcherService) CacheSv1HasGroup(args *utils.ArgsGetGroupWithArgDis
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CacheSv1HasGroup, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -239,7 +239,7 @@ func (dS *DispatcherService) CacheSv1GetGroupItemIDs(args *utils.ArgsGetGroupWit
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CacheSv1GetGroupItemIDs, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -259,7 +259,7 @@ func (dS *DispatcherService) CacheSv1RemoveGroup(args *utils.ArgsGetGroupWithArg
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CacheSv1RemoveGroup, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -279,7 +279,7 @@ func (dS *DispatcherService) CacheSv1ReloadCache(args utils.AttrReloadCacheWithA
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CacheSv1ReloadCache, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -299,7 +299,7 @@ func (dS *DispatcherService) CacheSv1LoadCache(args utils.AttrReloadCacheWithArg
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CacheSv1LoadCache, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
diff --git a/dispatchers/cdrs.go b/dispatchers/cdrs.go
index 6c3ce8ca1..309b4033c 100644
--- a/dispatchers/cdrs.go
+++ b/dispatchers/cdrs.go
@@ -31,7 +31,7 @@ func (dS *DispatcherService) CDRsV1Ping(args *utils.CGREventWithArgDispatcher,
 	args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CDRsV1Ping, args.CGREvent.Tenant,
 			args.APIKey, args.CGREvent.Time); err != nil {
@@ -50,7 +50,7 @@ func (dS *DispatcherService) CDRsV1GetCDRs(args utils.RPCCDRsFilterWithArgDispat
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CDRsV1GetCDRs, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -69,7 +69,7 @@ func (dS *DispatcherService) CDRsV1CountCDRs(args *utils.RPCCDRsFilterWithArgDis
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CDRsV1CountCDRs, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -88,7 +88,7 @@ func (dS *DispatcherService) CDRsV1StoreSessionCost(args *engine.AttrCDRSStoreSM
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CDRsV1StoreSessionCost, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -107,7 +107,7 @@ func (dS *DispatcherService) CDRsV1RateCDRs(args *engine.ArgRateCDRs, reply *str
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CDRsV1RateCDRs, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -125,7 +125,7 @@ func (dS *DispatcherService) CDRsV1RateCDRs(args *engine.ArgRateCDRs, reply *str
 func (dS *DispatcherService) CDRsV1ProcessExternalCDR(args *engine.ExternalCDRWithArgDispatcher, reply *string) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CDRsV1ProcessExternalCDR,
 			args.Tenant,
@@ -144,7 +144,7 @@ func (dS *DispatcherService) CDRsV1ProcessExternalCDR(args *engine.ExternalCDRWi
 func (dS *DispatcherService) CDRsV1ProcessEvent(args *engine.ArgV1ProcessEvent, reply *string) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CDRsV1ProcessEvent, args.CGREvent.Tenant,
 			args.APIKey, args.CGREvent.Time); err != nil {
@@ -162,7 +162,7 @@ func (dS *DispatcherService) CDRsV1ProcessEvent(args *engine.ArgV1ProcessEvent,
 func (dS *DispatcherService) CDRsV1ProcessCDR(args *engine.CDRWithArgDispatcher, reply *string) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.CDRsV1ProcessCDR,
 			args.Tenant,
diff --git a/dispatchers/chargers.go b/dispatchers/chargers.go
index 740a6eefc..1be4034fb 100755
--- a/dispatchers/chargers.go
+++ b/dispatchers/chargers.go
@@ -27,7 +27,7 @@ func (dS *DispatcherService) ChargerSv1Ping(args *utils.CGREventWithArgDispatche
 	args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ChargerSv1Ping,
 			args.Tenant,
@@ -47,7 +47,7 @@ func (dS *DispatcherService) ChargerSv1GetChargersForEvent(args *utils.CGREventW
 	reply *engine.ChargerProfiles) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ChargerSv1GetChargersForEvent,
 			args.CGREvent.Tenant,
@@ -67,7 +67,7 @@ func (dS *DispatcherService) ChargerSv1ProcessEvent(args *utils.CGREventWithArgD
 	reply *[]*engine.ChrgSProcessEventReply) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ChargerSv1ProcessEvent,
 			args.CGREvent.Tenant,
diff --git a/dispatchers/config.go b/dispatchers/config.go
index a4cb8e2d7..203d7d042 100644
--- a/dispatchers/config.go
+++ b/dispatchers/config.go
@@ -29,7 +29,7 @@ func (dS *DispatcherService) ConfigSv1GetJSONSection(args *config.StringWithArgD
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ConfigSv1GetJSONSection, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
diff --git a/dispatchers/dispatchers.go b/dispatchers/dispatchers.go
index 857c2ab15..48b71727d 100755
--- a/dispatchers/dispatchers.go
+++ b/dispatchers/dispatchers.go
@@ -199,7 +199,7 @@ func (dS *DispatcherService) V1Apier(apier interface{}, args *utils.MethodParame
 
 	parameters, canCast := args.Parameters.(map[string]interface{})
 	if !canCast {
-		return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+		return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 	}
 
 	var argD *utils.ArgDispatcher
@@ -226,7 +226,7 @@ func (dS *DispatcherService) V1Apier(apier interface{}, args *utils.MethodParame
 	tenant = utils.FirstNonEmpty(tenant, config.CgrConfig().GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if argD == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(args.Method,
 			tenant,
diff --git a/dispatchers/guardian.go b/dispatchers/guardian.go
index b19026fe0..f209f7b99 100644
--- a/dispatchers/guardian.go
+++ b/dispatchers/guardian.go
@@ -30,7 +30,7 @@ func (dS *DispatcherService) GuardianSv1Ping(args *utils.CGREventWithArgDispatch
 	args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.GuardianSv1Ping,
 			args.CGREvent.Tenant,
@@ -52,7 +52,7 @@ func (dS *DispatcherService) GuardianSv1RemoteLock(args AttrRemoteLockWithApiKey
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.GuardianSv1RemoteLock, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -73,7 +73,7 @@ func (dS *DispatcherService) GuardianSv1RemoteUnlock(args AttrRemoteUnlockWithAp
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.GuardianSv1RemoteUnlock, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
diff --git a/dispatchers/resources.go b/dispatchers/resources.go
index e9eea84db..fd5e801d3 100755
--- a/dispatchers/resources.go
+++ b/dispatchers/resources.go
@@ -27,7 +27,7 @@ func (dS *DispatcherService) ResourceSv1Ping(args *utils.CGREventWithArgDispatch
 	args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ResourceSv1Ping,
 			args.CGREvent.Tenant,
@@ -47,7 +47,7 @@ func (dS *DispatcherService) ResourceSv1GetResourcesForEvent(args utils.ArgRSv1R
 	reply *engine.Resources) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ResourceSv1GetResourcesForEvent,
 			args.CGREvent.Tenant,
@@ -68,7 +68,7 @@ func (dS *DispatcherService) ResourceSv1AuthorizeResources(args utils.ArgRSv1Res
 	reply *string) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ResourceSv1AuthorizeResources,
 			args.CGREvent.Tenant,
@@ -89,7 +89,7 @@ func (dS *DispatcherService) ResourceSv1AllocateResources(args utils.ArgRSv1Reso
 	reply *string) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ResourceSv1AllocateResources,
 			args.CGREvent.Tenant,
@@ -110,7 +110,7 @@ func (dS *DispatcherService) ResourceSv1ReleaseResources(args utils.ArgRSv1Resou
 	reply *string) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ResourceSv1ReleaseResources,
 			args.CGREvent.Tenant,
diff --git a/dispatchers/responder.go b/dispatchers/responder.go
index f362281a0..0451f8480 100644
--- a/dispatchers/responder.go
+++ b/dispatchers/responder.go
@@ -30,7 +30,7 @@ func (dS *DispatcherService) ResponderPing(args *utils.CGREventWithArgDispatcher
 	reply *string) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ResponderPing,
 			args.CGREvent.Tenant,
@@ -51,7 +51,7 @@ func (dS *DispatcherService) ResponderStatus(args *utils.TenantWithArgDispatcher
 	tnt := utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ResponderStatus, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -70,7 +70,7 @@ func (dS *DispatcherService) ResponderGetCost(args *engine.CallDescriptorWithArg
 	reply *engine.CallCost) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ResponderGetCost, args.Tenant,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -89,7 +89,7 @@ func (dS *DispatcherService) ResponderDebit(args *engine.CallDescriptorWithArgDi
 	reply *engine.CallCost) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ResponderDebit, args.Tenant,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -108,7 +108,7 @@ func (dS *DispatcherService) ResponderMaxDebit(args *engine.CallDescriptorWithAr
 	reply *engine.CallCost) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ResponderMaxDebit, args.Tenant,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -127,7 +127,7 @@ func (dS *DispatcherService) ResponderRefundIncrements(args *engine.CallDescript
 	reply *engine.Account) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ResponderRefundIncrements, args.Tenant,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -146,7 +146,7 @@ func (dS *DispatcherService) ResponderRefundRounding(args *engine.CallDescriptor
 	reply *float64) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ResponderRefundRounding, args.Tenant,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -165,7 +165,7 @@ func (dS *DispatcherService) ResponderGetMaxSessionTime(args *engine.CallDescrip
 	reply *time.Duration) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ResponderGetMaxSessionTime, args.Tenant,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -185,7 +185,7 @@ func (dS *DispatcherService) ResponderShutdown(args *utils.TenantWithArgDispatch
 	tnt := utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ResponderShutdown, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -205,7 +205,7 @@ func (dS *DispatcherService) ResponderGetTimeout(args *utils.TenantWithArgDispat
 	tnt := utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ResponderGetTimeout, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
diff --git a/dispatchers/scheduler.go b/dispatchers/scheduler.go
index 5fdde1b8c..9288653ec 100644
--- a/dispatchers/scheduler.go
+++ b/dispatchers/scheduler.go
@@ -26,7 +26,7 @@ func (dS *DispatcherService) SchedulerSv1Ping(args *utils.CGREventWithArgDispatc
 	args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SchedulerSv1Ping,
 			args.CGREvent.Tenant,
@@ -46,7 +46,7 @@ func (dS *DispatcherService) SchedulerSv1Reload(args *utils.CGREventWithArgDispa
 	args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SchedulerSv1Ping,
 			args.CGREvent.Tenant,
diff --git a/dispatchers/servicemanager.go b/dispatchers/servicemanager.go
index 26ea209c6..416d14448 100644
--- a/dispatchers/servicemanager.go
+++ b/dispatchers/servicemanager.go
@@ -30,7 +30,7 @@ func (dS *DispatcherService) ServiceManagerV1Ping(args *utils.CGREventWithArgDis
 	args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ServiceManagerV1Ping,
 			args.Tenant,
@@ -51,7 +51,7 @@ func (dS *DispatcherService) ServiceManagerV1StartService(args ArgStartServiceWi
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ServiceManagerV1StartService, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -71,7 +71,7 @@ func (dS *DispatcherService) ServiceManagerV1StopService(args ArgStartServiceWit
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ServiceManagerV1StopService, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -91,7 +91,7 @@ func (dS *DispatcherService) ServiceManagerV1ServiceStatus(args ArgStartServiceW
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.ServiceManagerV1ServiceStatus, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
diff --git a/dispatchers/sessions.go b/dispatchers/sessions.go
index 2e5c70d91..29d104490 100755
--- a/dispatchers/sessions.go
+++ b/dispatchers/sessions.go
@@ -29,7 +29,7 @@ func (dS *DispatcherService) SessionSv1Ping(args *utils.CGREventWithArgDispatche
 	args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SessionSv1Ping,
 			args.CGREvent.Tenant,
@@ -49,7 +49,7 @@ func (dS *DispatcherService) SessionSv1AuthorizeEvent(args *sessions.V1Authorize
 	reply *sessions.V1AuthorizeReply) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SessionSv1AuthorizeEvent,
 			args.CGREvent.Tenant,
@@ -69,7 +69,7 @@ func (dS *DispatcherService) SessionSv1AuthorizeEventWithDigest(args *sessions.V
 	reply *sessions.V1AuthorizeReplyWithDigest) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SessionSv1AuthorizeEventWithDigest,
 			args.CGREvent.Tenant,
@@ -89,7 +89,7 @@ func (dS *DispatcherService) SessionSv1InitiateSession(args *sessions.V1InitSess
 	reply *sessions.V1InitSessionReply) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SessionSv1InitiateSession,
 			args.CGREvent.Tenant,
@@ -109,7 +109,7 @@ func (dS *DispatcherService) SessionSv1InitiateSessionWithDigest(args *sessions.
 	reply *sessions.V1InitReplyWithDigest) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SessionSv1InitiateSessionWithDigest,
 			args.CGREvent.Tenant,
@@ -129,7 +129,7 @@ func (dS *DispatcherService) SessionSv1UpdateSession(args *sessions.V1UpdateSess
 	reply *sessions.V1UpdateSessionReply) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SessionSv1UpdateSession,
 			args.CGREvent.Tenant,
@@ -150,7 +150,7 @@ func (dS *DispatcherService) SessionSv1SyncSessions(args *utils.TenantWithArgDis
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SessionSv1SyncSessions, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -169,7 +169,7 @@ func (dS *DispatcherService) SessionSv1TerminateSession(args *sessions.V1Termina
 	reply *string) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SessionSv1TerminateSession,
 			args.CGREvent.Tenant,
@@ -189,7 +189,7 @@ func (dS *DispatcherService) SessionSv1ProcessCDR(args *utils.CGREventWithArgDis
 	reply *string) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SessionSv1ProcessCDR,
 			args.CGREvent.Tenant,
@@ -209,7 +209,7 @@ func (dS *DispatcherService) SessionSv1ProcessEvent(args *sessions.V1ProcessEven
 	reply *sessions.V1ProcessEventReply) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SessionSv1ProcessEvent,
 			args.CGREvent.Tenant,
@@ -229,7 +229,7 @@ func (dS *DispatcherService) SessionSv1GetActiveSessions(args *utils.SessionFilt
 	reply *[]*sessions.ActiveSession) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SessionSv1GetActiveSessions,
 			args.Tenant, args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -248,7 +248,7 @@ func (dS *DispatcherService) SessionSv1GetActiveSessionsCount(args *utils.Sessio
 	reply *int) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SessionSv1GetActiveSessionsCount,
 			args.Tenant, args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -267,7 +267,7 @@ func (dS *DispatcherService) SessionSv1ForceDisconnect(args *utils.SessionFilter
 	reply *string) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SessionSv1ForceDisconnect,
 			args.Tenant, args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -286,7 +286,7 @@ func (dS *DispatcherService) SessionSv1GetPassiveSessions(args *utils.SessionFil
 	reply *[]*sessions.ActiveSession) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SessionSv1GetPassiveSessions,
 			args.Tenant, args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -305,7 +305,7 @@ func (dS *DispatcherService) SessionSv1GetPassiveSessionsCount(args *utils.Sessi
 	reply *int) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SessionSv1GetPassiveSessionsCount,
 			args.Tenant, args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -325,7 +325,7 @@ func (dS *DispatcherService) SessionSv1ReplicateSessions(args ArgsReplicateSessi
 	tnt := utils.FirstNonEmpty(args.TenantArg.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SessionSv1ReplicateSessions, tnt,
 			args.APIKey, utils.TimePointer(time.Now())); err != nil {
@@ -344,7 +344,7 @@ func (dS *DispatcherService) SessionSv1SetPassiveSession(args *sessions.Session,
 	reply *string) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SessionSv1SetPassiveSession,
 			args.Tenant,
diff --git a/dispatchers/stats.go b/dispatchers/stats.go
index 8a4893900..4f6b2e6b9 100755
--- a/dispatchers/stats.go
+++ b/dispatchers/stats.go
@@ -28,7 +28,7 @@ import (
 func (dS *DispatcherService) StatSv1Ping(args *utils.CGREventWithArgDispatcher, reply *string) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.StatSv1Ping,
 			args.CGREvent.Tenant,
@@ -48,7 +48,7 @@ func (dS *DispatcherService) StatSv1GetStatQueuesForEvent(args *engine.StatsArgs
 	reply *[]string) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.StatSv1GetStatQueuesForEvent,
 			args.CGREvent.Tenant,
@@ -68,7 +68,7 @@ func (dS *DispatcherService) StatSv1GetQueueStringMetrics(args *utils.TenantIDWi
 	reply *map[string]string) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.StatSv1GetQueueStringMetrics,
 			args.TenantID.Tenant,
@@ -91,7 +91,7 @@ func (dS *DispatcherService) StatSv1ProcessEvent(args *engine.StatsArgsProcessEv
 	reply *[]string) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.StatSv1ProcessEvent,
 			args.CGREvent.Tenant,
@@ -111,7 +111,7 @@ func (dS *DispatcherService) StatSv1GetQueueFloatMetrics(args *utils.TenantIDWit
 	reply *map[string]float64) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.StatSv1GetQueueFloatMetrics,
 			args.TenantID.Tenant,
@@ -134,7 +134,7 @@ func (dS *DispatcherService) StatSv1GetQueueIDs(args *utils.TenantWithArgDispatc
 	reply *[]string) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.StatSv1GetQueueIDs,
 			args.TenantArg.Tenant,
diff --git a/dispatchers/suppliers.go b/dispatchers/suppliers.go
index 12846a5b1..b7ab2259f 100755
--- a/dispatchers/suppliers.go
+++ b/dispatchers/suppliers.go
@@ -27,7 +27,7 @@ func (dS *DispatcherService) SupplierSv1Ping(args *utils.CGREventWithArgDispatch
 	args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SupplierSv1Ping,
 			args.CGREvent.Tenant,
@@ -47,7 +47,7 @@ func (dS *DispatcherService) SupplierSv1GetSuppliers(args *engine.ArgsGetSupplie
 	reply *engine.SortedSuppliers) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SupplierSv1GetSuppliers,
 			args.CGREvent.Tenant,
@@ -67,7 +67,7 @@ func (dS *DispatcherService) SupplierSv1GetSupplierProfilesForEvent(args *utils.
 	reply *[]*engine.SupplierProfile) (err error) {
 	if dS.attrS != nil {
 		if args.ArgDispatcher == nil {
-			return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+			return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 		}
 		if err = dS.authorize(utils.SupplierSv1GetSupplierProfilesForEvent,
 			args.CGREvent.Tenant,
diff --git a/dispatchers/thresholds.go b/dispatchers/thresholds.go
index 286b3acac..df17aecd2 100755
--- a/dispatchers/thresholds.go
+++ b/dispatchers/thresholds.go
@@ -28,7 +28,7 @@ import (
 func (dS *DispatcherService) ThresholdSv1Ping(args *utils.CGREventWithArgDispatcher, reply *string) (err error) {
 	args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if args.ArgDispatcher == nil {
-		return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+		return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 	}
 	if dS.attrS != nil {
 		if err = dS.authorize(utils.ThresholdSv1Ping,
@@ -48,7 +48,7 @@ func (dS *DispatcherService) ThresholdSv1Ping(args *utils.CGREventWithArgDispatc
 func (dS *DispatcherService) ThresholdSv1GetThresholdsForEvent(args *engine.ArgsProcessEvent,
 	t *engine.Thresholds) (err error) {
 	if args.ArgDispatcher == nil {
-		return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+		return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 	}
 	if dS.attrS != nil {
 		if err = dS.authorize(utils.ThresholdSv1GetThresholdsForEvent,
@@ -68,7 +68,7 @@ func (dS *DispatcherService) ThresholdSv1GetThresholdsForEvent(args *engine.Args
 func (dS *DispatcherService) ThresholdSv1ProcessEvent(args *engine.ArgsProcessEvent,
 	tIDs *[]string) (err error) {
 	if args.ArgDispatcher == nil {
-		return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+		return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 	}
 	if dS.attrS != nil {
 		if err = dS.authorize(utils.ThresholdSv1ProcessEvent,
@@ -87,7 +87,7 @@ func (dS *DispatcherService) ThresholdSv1ProcessEvent(args *engine.ArgsProcessEv
 
 func (dS *DispatcherService) ThresholdSv1GetThresholdIDs(args *utils.TenantWithArgDispatcher, tIDs *[]string) (err error) {
 	if args.ArgDispatcher == nil {
-		return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+		return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 	}
 	if dS.attrS != nil {
 		if err = dS.authorize(utils.ThresholdSv1GetThresholdIDs,
@@ -105,7 +105,7 @@ func (dS *DispatcherService) ThresholdSv1GetThresholdIDs(args *utils.TenantWithA
 
 func (dS *DispatcherService) ThresholdSv1GetThreshold(args *utils.TenantIDWithArgDispatcher, th *engine.Threshold) (err error) {
 	if args.ArgDispatcher == nil {
-		return utils.NewErrMandatoryIeMissing("ArgDispatcher")
+		return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField)
 	}
 	if dS.attrS != nil {
 		if err = dS.authorize(utils.ThresholdSv1GetThreshold,
diff --git a/utils/consts.go b/utils/consts.go
index aff4dc0c5..2a5bd35ca 100755
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -701,24 +701,25 @@ const (
 
 // Dispatcher Const
 const (
-	MetaFirst      = "*first"
-	MetaRandom     = "*random"
-	MetaBroadcast  = "*broadcast"
-	MetaNext       = "*next"
-	MetaRoundRobin = "*round_robin"
-	ThresholdSv1   = "ThresholdSv1"
-	StatSv1        = "StatSv1"
-	ResourceSv1    = "ResourceSv1"
-	SupplierSv1    = "SupplierSv1"
-	AttributeSv1   = "AttributeSv1"
-	SessionSv1     = "SessionSv1"
-	ChargerSv1     = "ChargerSv1"
-	MetaAuth       = "*auth"
-	APIKey         = "APIKey"
-	RouteID        = "RouteID"
-	APIMethods     = "APIMethods"
-	APIMethod      = "APIMethod"
-	NestingSep     = "."
+	MetaFirst          = "*first"
+	MetaRandom         = "*random"
+	MetaBroadcast      = "*broadcast"
+	MetaNext           = "*next"
+	MetaRoundRobin     = "*round_robin"
+	ThresholdSv1       = "ThresholdSv1"
+	StatSv1            = "StatSv1"
+	ResourceSv1        = "ResourceSv1"
+	SupplierSv1        = "SupplierSv1"
+	AttributeSv1       = "AttributeSv1"
+	SessionSv1         = "SessionSv1"
+	ChargerSv1         = "ChargerSv1"
+	MetaAuth           = "*auth"
+	APIKey             = "APIKey"
+	RouteID            = "RouteID"
+	APIMethods         = "APIMethods"
+	APIMethod          = "APIMethod"
+	NestingSep         = "."
+	ArgDispatcherField = "ArgDispatcher"
 )
 
 // ApierV1 APIs