From 1d2a0e5f05c9d01d23f21c9a7743f890d310596b Mon Sep 17 00:00:00 2001 From: Trial97 Date: Thu, 21 Feb 2019 17:10:51 +0200 Subject: [PATCH] Added tests for dynamic tenant --- data/conf/samples/diamagent/cgrates.json | 1 + data/conf/samples/diamagent/message.json | 2 +- data/conf/samples/diamagent/tests.json | 2 +- data/conf/samples/diamsctpagent/cgrates.json | 1 + data/conf/samples/diamsctpagent/message.json | 2 +- data/tariffplans/tutorial/Attributes.csv | 9 +++++---- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/data/conf/samples/diamagent/cgrates.json b/data/conf/samples/diamagent/cgrates.json index af7dbd106..b4b4716dc 100644 --- a/data/conf/samples/diamagent/cgrates.json +++ b/data/conf/samples/diamagent/cgrates.json @@ -6,6 +6,7 @@ "general": { "log_level": 7, + "default_tenant": "cgrates.com", }, "listen": { diff --git a/data/conf/samples/diamagent/message.json b/data/conf/samples/diamagent/message.json index 5c8eb0f5a..d299bc4a8 100644 --- a/data/conf/samples/diamagent/message.json +++ b/data/conf/samples/diamagent/message.json @@ -7,7 +7,7 @@ "id": "message", "filters": ["*string:*vars.*cmd:CCR", "*prefix:*req.Service-Context-Id:message", "*string:*req.CC-Request-Type:4"], - "flags": ["*event", "*accounts", "*cdrs"], + "flags": ["*event", "*accounts", "*cdrs","*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*sms"}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", diff --git a/data/conf/samples/diamagent/tests.json b/data/conf/samples/diamagent/tests.json index b1972afe6..3ca8948c9 100644 --- a/data/conf/samples/diamagent/tests.json +++ b/data/conf/samples/diamagent/tests.json @@ -7,7 +7,7 @@ "id": "TestSessionDisconnect", "filters": ["*string:*vars.*cmd:CCR", "*string:*req.CC-Request-Type:1", "*prefix:*req.Service-Context-Id:testSessionDisconnect"], - "flags": ["*initiate", "*accounts"], + "flags": ["*initiate", "*accounts","*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", diff --git a/data/conf/samples/diamsctpagent/cgrates.json b/data/conf/samples/diamsctpagent/cgrates.json index dbe03b475..4a3ac47fb 100755 --- a/data/conf/samples/diamsctpagent/cgrates.json +++ b/data/conf/samples/diamsctpagent/cgrates.json @@ -6,6 +6,7 @@ "general": { "log_level": 7, + "default_tenant": "cgrates.com", }, "listen": { diff --git a/data/conf/samples/diamsctpagent/message.json b/data/conf/samples/diamsctpagent/message.json index 5c8eb0f5a..d299bc4a8 100755 --- a/data/conf/samples/diamsctpagent/message.json +++ b/data/conf/samples/diamsctpagent/message.json @@ -7,7 +7,7 @@ "id": "message", "filters": ["*string:*vars.*cmd:CCR", "*prefix:*req.Service-Context-Id:message", "*string:*req.CC-Request-Type:4"], - "flags": ["*event", "*accounts", "*cdrs"], + "flags": ["*event", "*accounts", "*cdrs","*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*sms"}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", diff --git a/data/tariffplans/tutorial/Attributes.csv b/data/tariffplans/tutorial/Attributes.csv index 2e8f6f686..02c0dc313 100644 --- a/data/tariffplans/tutorial/Attributes.csv +++ b/data/tariffplans/tutorial/Attributes.csv @@ -15,7 +15,8 @@ cgrates.org,ATTR_1003_SESSIONAUTH,*sessions,*string:Account:1003,,Password,*any, cgrates.org,ATTR_1003_SESSIONAUTH,,,,RequestType,*any,*prepaid,true,, cgrates.org,ATTR_1003_SESSIONAUTH,,,,PaypalAccount,*any,cgrates@paypal.com,true,, cgrates.org,ATTR_1003_SESSIONAUTH,,,,LCRProfile,*any,premium_cli,true,, -cgrates.org,ATTR_1006_ALIAS,*any,*string:SubscriberId:1006,,Account,*any,1001,true,false,10 -cgrates.org,ATTR_1006_ALIAS,*any,,,RequestType,*any,*prepaid,true,, - - +cgrates.com,ATTR_TNT_ALIAS,*any,*string:SubscriberId:1006,,Account,*any,1001,true,false,10 +cgrates.com,ATTR_TNT_ALIAS,*any,,,RequestType,*any,*prepaid,true,, +cgrates.com,ATTR_TNT_ALIAS,*any,,,*tenant,*any,cgrates.org,true,, +cgrates.com,ATTR_TNT_1001,*any,*string:Account:1001,,*tenant,*any,cgrates.org,true,, +cgrates.com,ATTR_TNT_DISC,*any,*string:Account:testDiamInitWithSessionDisconnect,,*tenant,*any,cgrates.org,true,,