From 711e628d4b3f2743f2a889d727c80f8eff43682c Mon Sep 17 00:00:00 2001
From: TeoV <teofil.voivozeanu@itsyscom.com>
Date: Sun, 30 Aug 2020 10:15:16 +0300
Subject: [PATCH] Add "ees_conns" in "apiers" section

---
 config/apiercfg.go         | 12 ++++++++++++
 config/config_defaults.go  |  1 +
 config/config_json_test.go |  1 +
 config/config_test.go      |  1 +
 config/libconfig_json.go   |  1 +
 5 files changed, 16 insertions(+)

diff --git a/config/apiercfg.go b/config/apiercfg.go
index 1d36aee9e..4a895f076 100644
--- a/config/apiercfg.go
+++ b/config/apiercfg.go
@@ -30,6 +30,7 @@ type ApierCfg struct {
 	CachesConns     []string // connections towards Cache
 	SchedulerConns  []string // connections towards Scheduler
 	AttributeSConns []string // connections towards AttributeS
+	EEsConns        []string // connections towards EEs
 }
 
 func (aCfg *ApierCfg) loadFromJsonCfg(jsnCfg *ApierJsonCfg) (err error) {
@@ -72,6 +73,17 @@ func (aCfg *ApierCfg) loadFromJsonCfg(jsnCfg *ApierJsonCfg) (err error) {
 			}
 		}
 	}
+	if jsnCfg.Ees_conns != nil {
+		aCfg.EEsConns = make([]string, len(*jsnCfg.Ees_conns))
+		for idx, connID := range *jsnCfg.Ees_conns {
+			// if we have the connection internal we change the name so we can have internal rpc for each subsystem
+			if connID == utils.MetaInternal {
+				aCfg.EEsConns[idx] = utils.ConcatenatedKey(utils.MetaInternal, utils.MetaEEs)
+			} else {
+				aCfg.EEsConns[idx] = connID
+			}
+		}
+	}
 
 	return nil
 }
diff --git a/config/config_defaults.go b/config/config_defaults.go
index c33ae7d27..3ca23082c 100755
--- a/config/config_defaults.go
+++ b/config/config_defaults.go
@@ -902,6 +902,7 @@ const CGRATES_CFG_JSON = `
 	"caches_conns":["*internal"],
 	"scheduler_conns": [],					// connections to SchedulerS for reloads
 	"attributes_conns": [],					// connections to AttributeS for CDRExporter
+	"ees_conns": [],						// connections to EEs
 },
 
 
diff --git a/config/config_json_test.go b/config/config_json_test.go
index 327a8e7b9..878382c2e 100755
--- a/config/config_json_test.go
+++ b/config/config_json_test.go
@@ -1669,6 +1669,7 @@ func TestDfApierCfg(t *testing.T) {
 		Caches_conns:     &[]string{utils.MetaInternal},
 		Scheduler_conns:  &[]string{},
 		Attributes_conns: &[]string{},
+		Ees_conns:        &[]string{},
 	}
 	if cfg, err := dfCgrJSONCfg.ApierCfgJson(); err != nil {
 		t.Error(err)
diff --git a/config/config_test.go b/config/config_test.go
index 13a59321c..715b6fcde 100755
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -1839,6 +1839,7 @@ func TestCgrCfgJSONDefaultApierCfg(t *testing.T) {
 		CachesConns:     []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches)},
 		SchedulerConns:  []string{},
 		AttributeSConns: []string{},
+		EEsConns:        []string{},
 	}
 	if !reflect.DeepEqual(cgrCfg.apier, aCfg) {
 		t.Errorf("received: %+v, expecting: %+v", cgrCfg.apier, aCfg)
diff --git a/config/libconfig_json.go b/config/libconfig_json.go
index fde261534..8c5e12de6 100755
--- a/config/libconfig_json.go
+++ b/config/libconfig_json.go
@@ -608,6 +608,7 @@ type ApierJsonCfg struct {
 	Caches_conns     *[]string
 	Scheduler_conns  *[]string
 	Attributes_conns *[]string
+	Ees_conns        *[]string
 }
 
 type STIRJsonCfg struct {