Add Connection from Chargers to Attributes through ConnManager

2026-02-22 07:38:45 +05:00 · 2019-12-05 14:31:02 +02:00
parent e0fc97c99a
commit 46bd095b1e
71 changed files with 154 additions and 281 deletions
--- a/data/conf/samples/acc_balance_keep/cgrates.json
+++ b/data/conf/samples/acc_balance_keep/cgrates.json
@@ -76,9 +76,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/acc_balance_keep_gob/cgrates.json
+++ b/data/conf/samples/acc_balance_keep_gob/cgrates.json
@@ -76,9 +76,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/cdrewithattributes/cgrates.json
+++ b/data/conf/samples/cdrewithattributes/cgrates.json
@@ -71,9 +71,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },

 "apier": {	
--- a/data/conf/samples/cdrewithfilter/cgrates.json
+++ b/data/conf/samples/cdrewithfilter/cgrates.json
@@ -78,9 +78,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/cdrsv2internal/cgrates.json
+++ b/data/conf/samples/cdrsv2internal/cgrates.json
@@ -62,9 +62,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"},
-	],
+	"attributes_conns": ["*internal"],
 },

 "apier": {
--- a/data/conf/samples/cdrsv2mongo/cgrates.json
+++ b/data/conf/samples/cdrsv2mongo/cgrates.json
@@ -63,9 +63,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"},
-	],
+	"attributes_conns": ["*internal"],
 },

 "apier": {
--- a/data/conf/samples/cdrsv2mongo_gob/cgrates.json
+++ b/data/conf/samples/cdrsv2mongo_gob/cgrates.json
@@ -63,9 +63,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"},
-	],
+	"attributes_conns": ["*internal"],
 },

 "apier": {
--- a/data/conf/samples/cdrsv2mysql/cdrsv2mysql.json
+++ b/data/conf/samples/cdrsv2mysql/cdrsv2mysql.json
@@ -63,9 +63,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"},
-	],
+	"attributes_conns": ["*internal"],
 },

 "apier": {
--- a/data/conf/samples/cdrsv2mysql_gob/cdrsv2mysql.json
+++ b/data/conf/samples/cdrsv2mysql_gob/cdrsv2mysql.json
@@ -63,9 +63,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"},
-	],
+	"attributes_conns": ["*internal"],
 },

 "apier": {
--- a/data/conf/samples/cdrsv2psql/cdrsv2psql.json
+++ b/data/conf/samples/cdrsv2psql/cdrsv2psql.json
@@ -63,9 +63,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },

 "apier": {
--- a/data/conf/samples/dispatchers/all/cgrates.json
+++ b/data/conf/samples/dispatchers/all/cgrates.json
@@ -39,9 +39,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"},
-	],
+	"attributes_conns": ["*internal"],
 },

 "thresholds": {
--- a/data/conf/samples/dispatchers/all2/cgrates.json
+++ b/data/conf/samples/dispatchers/all2/cgrates.json
@@ -39,9 +39,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"},
-	],
+	"attributes_conns": ["*internal"],
 },

 "thresholds": {
--- a/data/conf/samples/ers/cgrates.json
+++ b/data/conf/samples/ers/cgrates.json
@@ -34,9 +34,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/ers_example/cgrates.json
+++ b/data/conf/samples/ers_example/cgrates.json
@@ -33,9 +33,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/ers_reload/disabled/cgrates.json
+++ b/data/conf/samples/ers_reload/disabled/cgrates.json
@@ -33,9 +33,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/ers_reload/first_reload/cgrates.json
+++ b/data/conf/samples/ers_reload/first_reload/cgrates.json
@@ -33,9 +33,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/ers_reload/internal/cgrates.json
+++ b/data/conf/samples/ers_reload/internal/cgrates.json
@@ -33,9 +33,7 @@
    
    "chargers": {
        "enabled": true,
-        "attributes_conns": [
-            {"address": "*internal"}
-        ],
+        "attributes_conns": ["*internal"],
    },
    
    
--- a/data/conf/samples/ers_reload/second_reload/cgrates.json
+++ b/data/conf/samples/ers_reload/second_reload/cgrates.json
@@ -33,9 +33,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/httpagent/cgrates.json
+++ b/data/conf/samples/httpagent/cgrates.json
@@ -48,9 +48,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/httpagent_gob/cgrates.json
+++ b/data/conf/samples/httpagent_gob/cgrates.json
@@ -48,9 +48,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/httpagenttls/cgrates.json
+++ b/data/conf/samples/httpagenttls/cgrates.json
@@ -59,9 +59,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },

 "sessions": {
--- a/data/conf/samples/httpagenttls_gob/cgrates.json
+++ b/data/conf/samples/httpagenttls_gob/cgrates.json
@@ -59,9 +59,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },

 "sessions": {
--- a/data/conf/samples/loaders/tutmongo/cgrates.json
+++ b/data/conf/samples/loaders/tutmongo/cgrates.json
@@ -72,9 +72,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/loaders/tutmysql/cgrates.json
+++ b/data/conf/samples/loaders/tutmysql/cgrates.json
@@ -115,9 +115,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"},
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/rpccaching/cgrates.json
+++ b/data/conf/samples/rpccaching/cgrates.json
@@ -45,9 +45,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/sessions/cgrates.json
+++ b/data/conf/samples/sessions/cgrates.json
@@ -44,9 +44,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/sessions_replication/smgreplcmaster/cgrates.json
+++ b/data/conf/samples/sessions_replication/smgreplcmaster/cgrates.json
@@ -35,9 +35,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },

 "sessions": {
--- a/data/conf/samples/sessions_replication/smgreplcslave/cgrates.json
+++ b/data/conf/samples/sessions_replication/smgreplcslave/cgrates.json
@@ -35,9 +35,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },

 "sessions": {
--- a/data/conf/samples/smg/cgrates.json
+++ b/data/conf/samples/smg/cgrates.json
@@ -50,9 +50,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },

 "sessions": {
--- a/data/conf/samples/smg_automatic_debits/cgrates.json
+++ b/data/conf/samples/smg_automatic_debits/cgrates.json
@@ -29,9 +29,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },

 "sessions": {
--- a/data/conf/samples/smg_gob/cgrates.json
+++ b/data/conf/samples/smg_gob/cgrates.json
@@ -50,9 +50,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },

 "sessions": {
--- a/data/conf/samples/smgeneric/cgrates.json
+++ b/data/conf/samples/smgeneric/cgrates.json
@@ -40,9 +40,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/smgreplcmaster/cgrates.json
+++ b/data/conf/samples/smgreplcmaster/cgrates.json
@@ -35,9 +35,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },

 "sessions": {
--- a/data/conf/samples/smgreplcmaster_gob/cgrates.json
+++ b/data/conf/samples/smgreplcmaster_gob/cgrates.json
@@ -35,9 +35,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },

 "sessions": {
--- a/data/conf/samples/smgreplcslave/cgrates.json
+++ b/data/conf/samples/smgreplcslave/cgrates.json
@@ -35,9 +35,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },

 "sessions": {
--- a/data/conf/samples/smgreplcslave_gob/cgrates.json
+++ b/data/conf/samples/smgreplcslave_gob/cgrates.json
@@ -35,9 +35,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },

 "sessions": {
--- a/data/conf/samples/tls/cgrates.json
+++ b/data/conf/samples/tls/cgrates.json
@@ -101,9 +101,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },

 }
--- a/data/conf/samples/tls_gob/cgrates.json
+++ b/data/conf/samples/tls_gob/cgrates.json
@@ -101,9 +101,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },

 }
--- a/data/conf/samples/tutinternal/cgrates.json
+++ b/data/conf/samples/tutinternal/cgrates.json
@@ -58,9 +58,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"},
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/tutmongo/cgrates.json
+++ b/data/conf/samples/tutmongo/cgrates.json
@@ -73,9 +73,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/tutmongo2/cgrates.json
+++ b/data/conf/samples/tutmongo2/cgrates.json
@@ -134,9 +134,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "127.0.0.1:2012", "transport":"*json"}
-	],
+	"attributes_conns": ["*localhost"],
 	"string_indexed_fields": ["Account"]
 },

--- a/data/conf/samples/tutmongo2_gob/cgrates.json
+++ b/data/conf/samples/tutmongo2_gob/cgrates.json
@@ -8,6 +8,13 @@
 	"log_level": 7
 },

+"rpc_conns": {
+	"conn1": {
+		"strategy": "first",
+		"conns": [{{"address": "127.0.0.1:2013", "transport":"*gob"},}],
+	},
+},
+

 "listen": {
 	"rpc_json": ":2012",
@@ -134,9 +141,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "127.0.0.1:2013", "transport":"*gob"}
-	],
+	"attributes_conns": ["conn1"],
 	"string_indexed_fields": ["Account"]
 },

--- a/data/conf/samples/tutmongo_gob/cgrates.json
+++ b/data/conf/samples/tutmongo_gob/cgrates.json
@@ -73,9 +73,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/tutmongonew/cgrates.json
+++ b/data/conf/samples/tutmongonew/cgrates.json
@@ -72,9 +72,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/tutmysql/cgrates.json
+++ b/data/conf/samples/tutmysql/cgrates.json
@@ -78,9 +78,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"},
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/tutmysql2/cgrates.json
+++ b/data/conf/samples/tutmysql2/cgrates.json
@@ -99,9 +99,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "127.0.0.1:2012", "transport":"*json"}
-	],
+	"attributes_conns": ["*localhost"],
 	"string_indexed_fields": ["Account"]
 },

--- a/data/conf/samples/tutmysql2_gob/cgrates.json
+++ b/data/conf/samples/tutmysql2_gob/cgrates.json
@@ -9,6 +9,14 @@
 },


+"rpc_conns": {
+	"conn1": {
+		"strategy": "first",
+		"conns": [{{"address": "127.0.0.1:2013", "transport":"*gob"},}],
+	},
+},
+
+
 "listen": {
 	"rpc_json": ":2012",
 	"rpc_gob": ":2013",
@@ -99,9 +107,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "127.0.0.1:2013", "transport":"*gob"}
-	],
+	"attributes_conns": ["conn1"],
 	"string_indexed_fields": ["Account"]
 },

--- a/data/conf/samples/tutmysql_internal/cgrates.json
+++ b/data/conf/samples/tutmysql_internal/cgrates.json
@@ -197,9 +197,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"},
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/conf/samples/tutpostgres/cgrates.json
+++ b/data/conf/samples/tutpostgres/cgrates.json
@@ -86,9 +86,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/tutorial_tests/asterisk_ari/cgrates/etc/cgrates/cgrates.json
+++ b/data/tutorial_tests/asterisk_ari/cgrates/etc/cgrates/cgrates.json
@@ -52,9 +52,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/tutorial_tests/fs_evsock/cgrates/etc/cgrates/cgrates.json
+++ b/data/tutorial_tests/fs_evsock/cgrates/etc/cgrates/cgrates.json
@@ -51,9 +51,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/tutorial_tests/kamevapi/cgrates/etc/cgrates/cgrates.json
+++ b/data/tutorial_tests/kamevapi/cgrates/etc/cgrates/cgrates.json
@@ -49,9 +49,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/tutorial_tests/osips/cgrates/etc/cgrates/cgrates.json
+++ b/data/tutorial_tests/osips/cgrates/etc/cgrates/cgrates.json
@@ -50,9 +50,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/tutorials/asterisk_ari/cgrates/etc/cgrates/cgrates.json
+++ b/data/tutorials/asterisk_ari/cgrates/etc/cgrates/cgrates.json
@@ -52,9 +52,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/tutorials/fs_evsock/cgrates/etc/cgrates/cgrates.json
+++ b/data/tutorials/fs_evsock/cgrates/etc/cgrates/cgrates.json
@@ -51,9 +51,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json
+++ b/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json
@@ -49,9 +49,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },


--- a/data/tutorials/osips/cgrates/etc/cgrates/cgrates.json
+++ b/data/tutorials/osips/cgrates/etc/cgrates/cgrates.json
@@ -50,9 +50,7 @@

 "chargers": {
 	"enabled": true,
-	"attributes_conns": [
-		{"address": "*internal"}
-	],
+	"attributes_conns": ["*internal"],
 },