From 01387cf9db65066991309e13c0eca4cc68fab68f Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 13 Apr 2021 09:59:13 +0200 Subject: [PATCH] TT#116100 scenarios/incoming_peer * domain per scenario * dynamic IP/port and numbers * dynamic prefs/configs Change-Id: I0f8a675d7776ec52dd38266f19a627355095c2e9 --- scenarios/incoming_peer/0003_test.yml.tt2 | 30 +++++++++---------- scenarios/incoming_peer/0005_test.yml.tt2 | 28 ++++++++--------- scenarios/incoming_peer/0010_test.yml.tt2 | 12 ++++---- scenarios/incoming_peer/0011_test.yml.tt2 | 8 ++--- scenarios/incoming_peer/0013_test.yml.tt2 | 16 +++++----- scenarios/incoming_peer/0016_test.yml.tt2 | 8 ++--- scenarios/incoming_peer/cdr_test.yml.tt2 | 12 ++++---- scenarios/incoming_peer/peer.yml | 18 +++++------ .../{prefs.json => prefs.json.tt2} | 2 +- scenarios/incoming_peer/scenario.yml | 12 ++++---- 10 files changed, 74 insertions(+), 72 deletions(-) rename scenarios/incoming_peer/{prefs.json => prefs.json.tt2} (52%) diff --git a/scenarios/incoming_peer/0003_test.yml.tt2 b/scenarios/incoming_peer/0003_test.yml.tt2 index c240a52d..3e097417 100644 --- a/scenarios/incoming_peer/0003_test.yml.tt2 +++ b/scenarios/incoming_peer/0003_test.yml.tt2 @@ -49,9 +49,9 @@ flow: - return|ROUTE_SET_CALLEE_DIALOG: $avp(lua_dlg_profile): [ "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", + "totaluser:[% incoming_peer.scenarios.test.testuser1003.uuid %]", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1003.uuid %]", + "user:[% incoming_peer.scenarios.test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] @@ -88,9 +88,9 @@ flow: $avp(lua_dlg_profile): [ "incoming", "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", + "totaluser:[% incoming_peer.scenarios.test.testuser1003.uuid %]", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1003.uuid %]", + "user:[% incoming_peer.scenarios.test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] @@ -164,15 +164,15 @@ flow: $avp(lua_dlg_profile): [ "incoming", "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", + "totaluser:[% incoming_peer.scenarios.test.testuser1003.uuid %]", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1003.uuid %]", + "user:[% incoming_peer.scenarios.test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] sip_in: - - '^INVITE sip:4311003@' - - 'Contact: sip:004321001@' + - '^INVITE sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@' + - 'Contact: sip:[% scenarios.0.username %]@' - 'CSeq: 1 INVITE' - 'Max-Forwards: 69' - 'Content-Type: application/sdp' @@ -180,19 +180,19 @@ sip_out: - [ '^SIP/2.0 100 Trying', 'CSeq: 1 INVITE', - 'From: ;tag=[\w-]+' - - 'To: ' + - 'INVITE sip:testuser1003@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0' + - 'From: ;tag=[\w-]+' + - 'To: ' - 'CSeq: \d+ INVITE' - 'P-LB-Uptime: \d+' - - 'P-Asserted-Identity: ' + - 'P-Asserted-Identity: ' - 'P-Caller-UUID: 0' - - 'P-NGCP-Caller-Info: ;ip=127.0.2.1;port=\d+' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311003' + - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]' + - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% incoming_peer_scenarios_test.testuser1003.phone_number %]' - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060' - 'Content-Type: application/sdp' - 'Contact: ' @@ -29,22 +29,22 @@ sip_in: sip_out: - [ 'SIP/2.0 100 Trying', - 'From: ;tag=[\w-]+', - 'To: ', + 'From: ;tag=[\w-]+', + 'To: ', 'CSeq: \d+ INVITE', 'Server: Sipwise NGCP Proxy', 'Content-Length: 0', ] - [ - 'INVITE sip:testuser1003@127.1.0.1:\d+ SIP/2.0', - 'From: ;tag=[\w-]+', - 'To: ', + 'INVITE sip:testuser1003@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0', + 'From: ;tag=[\w-]+', + 'To: ', 'CSeq: \d+ INVITE', 'P-LB-Uptime: \d+', - 'P-Asserted-Identity: ', + 'P-Asserted-Identity: ', 'P-Caller-UUID: 0', - 'P-NGCP-Caller-Info: ;ip=127.0.2.1;port=\d+', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311003', + 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]', + 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% incoming_peer_scenarios_test.testuser1003.phone_number %]', 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', 'Content-Type: application/sdp', 'Contact: ', diff --git a/scenarios/incoming_peer/0010_test.yml.tt2 b/scenarios/incoming_peer/0010_test.yml.tt2 index 5d9922bd..577e2be6 100644 --- a/scenarios/incoming_peer/0010_test.yml.tt2 +++ b/scenarios/incoming_peer/0010_test.yml.tt2 @@ -18,9 +18,9 @@ flow: $avp(lua_dlg_profile): [ "incoming", "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", + "totaluser:[% incoming_peer.scenarios.test.testuser1003.uuid %]", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1003.uuid %]", + "user:[% incoming_peer.scenarios.test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] @@ -28,12 +28,12 @@ flow: sip_in: - '^SIP/2.0 200 OK' - 'CSeq: 1 INVITE' - - 'From: