From fb347c10f2d180f6f66a9f89385e0e9d6ff8ce0c Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 20 Jul 2021 12:19:18 +0200 Subject: [PATCH] TT#116101 scenarios: manual fixes Change-Id: I6117f6058a72c6780b887152e73824b4fc7e700a --- .../sipp_scenario00_test.yml.tt2 | 12 ++++++------ .../sipp_scenario_responder00_test.yml.tt2 | 6 +++--- .../sipp_scenario00_test.yml.tt2 | 12 ++++++------ .../sipp_scenario00_test.yml.tt2 | 8 ++++---- .../sipp_scenario00_test.yml.tt2 | 12 ++++++------ .../sipp_scenario_responder00_test.yml.tt2 | 12 ++++++------ .../sipp_scenario_responder00_test.yml.tt2 | 2 +- scenarios/invite_prack/sipp_scenario00_test.yml.tt2 | 2 +- .../sipp_scenario_responder00_test.yml.tt2 | 2 +- .../sipp_scenario_responder00_test.yml.tt2 | 2 +- .../sipp_scenario_responder00_test.yml.tt2 | 2 +- 11 files changed, 36 insertions(+), 36 deletions(-) diff --git a/scenarios/invite_allowedcli_match/sipp_scenario00_test.yml.tt2 b/scenarios/invite_allowedcli_match/sipp_scenario00_test.yml.tt2 index 107377bf..0f5a3ff1 100644 --- a/scenarios/invite_allowedcli_match/sipp_scenario00_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match/sipp_scenario00_test.yml.tt2 @@ -1,19 +1,19 @@ messages: - - 'SIP/2.0 100 Trying' - - 'From: "431100999" ;tag=[\w-]+' + - 'From: "[% invite_allowedcli_match_scenarios_test.testuser1002.phone_number %]99" ;tag=[\w-]+' - 'To: ' - 'CSeq: \d+ INVITE' - 'Server: Sipwise NGCP LB' - 'Content-Length: 0' - - 'SIP/2.0 407 Proxy Authentication Required' - - 'From: "431100999" ;tag=[\w-]+' + - 'From: "[% invite_allowedcli_match_scenarios_test.testuser1002.phone_number %]99" ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Proxy-Authenticate: Digest realm="invite-allowedcli-match.scenarios.test", nonce="[^"]+"' - 'Server: Sipwise NGCP Proxy' - 'Content-Length: 0' - - 'SIP/2.0 100 Trying' - - 'From: "431100999" ;tag=[\w-]+' + - 'From: "[% invite_allowedcli_match_scenarios_test.testuser1002.phone_number %]99" ;tag=[\w-]+' - 'To: ' - 'CSeq: \d+ INVITE' - 'Server: Sipwise NGCP LB' @@ -22,7 +22,7 @@ messages: - 'Record-Route: ' - 'Record-Route: ' - 'Record-Route: ' - - 'From: "431100999" ;tag=[\w-]+' + - 'From: "[% invite_allowedcli_match_scenarios_test.testuser1002.phone_number %]99" ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Content-Length: 0' @@ -31,7 +31,7 @@ messages: - 'Record-Route: ' - 'Record-Route: ' - 'Record-Route: ' - - 'From: "431100999" ;tag=[\w-]+' + - 'From: "[% invite_allowedcli_match_scenarios_test.testuser1002.phone_number %]99" ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Content-Type: application/sdp' @@ -51,7 +51,7 @@ messages: - 'Record-Route: ' - 'Record-Route: ' - 'Record-Route: ' - - 'From: "431100999" ;tag=[\w-]+' + - 'From: "[% invite_allowedcli_match_scenarios_test.testuser1002.phone_number %]99" ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ BYE' - 'Content-Length: 0' diff --git a/scenarios/invite_allowedcli_match/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_allowedcli_match/sipp_scenario_responder00_test.yml.tt2 index dec2d4d3..c3824333 100644 --- a/scenarios/invite_allowedcli_match/sipp_scenario_responder00_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match/sipp_scenario_responder00_test.yml.tt2 @@ -3,7 +3,7 @@ messages: - 'Record-Route: ' - 'Record-Route: ' - 'Record-Route: ' - - 'From: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' - 'To: ' - 'CSeq: \d+ INVITE' - 'P-Asserted-Identity: ' @@ -24,7 +24,7 @@ messages: - 'Record-Route: ' - 'Record-Route: ' - 'Record-Route: ' - - 'From: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ ACK' - 'Content-Length: 0' @@ -33,7 +33,7 @@ messages: - 'Record-Route: ' - 'Record-Route: ' - 'Record-Route: ' - - 'From: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ BYE' - 'P-Asserted-Identity: ' diff --git a/scenarios/invite_allowedcli_nonmatch/sipp_scenario00_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/sipp_scenario00_test.yml.tt2 index 4464a2e8..72208705 100644 --- a/scenarios/invite_allowedcli_nonmatch/sipp_scenario00_test.yml.tt2 +++ b/scenarios/invite_allowedcli_nonmatch/sipp_scenario00_test.yml.tt2 @@ -1,19 +1,19 @@ messages: - - 'SIP/2.0 100 Trying' - - 'From: "431101422" ;tag=[\w-]+' + - 'From: "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]22" ;tag=[\w-]+' - 'To: ' - 'CSeq: \d+ INVITE' - 'Server: Sipwise NGCP LB' - 'Content-Length: 0' - - 'SIP/2.0 407 Proxy Authentication Required' - - 'From: "431101422" ;tag=[\w-]+' + - 'From: "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]22" ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Proxy-Authenticate: Digest realm="invite-allowedcli-nonmatch.scenarios.test", nonce="[^"]+"' - 'Server: Sipwise NGCP Proxy' - 'Content-Length: 0' - - 'SIP/2.0 100 Trying' - - 'From: "431101422" ;tag=[\w-]+' + - 'From: "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]22" ;tag=[\w-]+' - 'To: ' - 'CSeq: \d+ INVITE' - 'Server: Sipwise NGCP LB' @@ -22,7 +22,7 @@ messages: - 'Record-Route: ' - 'Record-Route: ' - 'Record-Route: ' - - 'From: "431101422" ;tag=[\w-]+' + - 'From: "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]22" ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Content-Length: 0' @@ -31,7 +31,7 @@ messages: - 'Record-Route: ' - 'Record-Route: ' - 'Record-Route: ' - - 'From: "431101422" ;tag=[\w-]+' + - 'From: "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]22" ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Content-Type: application/sdp' @@ -51,7 +51,7 @@ messages: - 'Record-Route: ' - 'Record-Route: ' - 'Record-Route: ' - - 'From: "431101422" ;tag=[\w-]+' + - 'From: "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]22" ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ BYE' - 'Content-Length: 0' diff --git a/scenarios/invite_allowedcli_nonmatch_reject/sipp_scenario00_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch_reject/sipp_scenario00_test.yml.tt2 index 4b5c2a8c..7e880049 100644 --- a/scenarios/invite_allowedcli_nonmatch_reject/sipp_scenario00_test.yml.tt2 +++ b/scenarios/invite_allowedcli_nonmatch_reject/sipp_scenario00_test.yml.tt2 @@ -1,25 +1,25 @@ messages: - - 'SIP/2.0 100 Trying' - - 'From: "431101622" ;tag=[\w-]+' + - 'From: "[% invite_allowedcli_nonmatch_reject_scenarios_test.testuser1002.phone_number %]22" ;tag=[\w-]+' - 'To: ' - 'CSeq: \d+ INVITE' - 'Server: Sipwise NGCP LB' - 'Content-Length: 0' - - 'SIP/2.0 407 Proxy Authentication Required' - - 'From: "431101622" ;tag=[\w-]+' + - 'From: "[% invite_allowedcli_nonmatch_reject_scenarios_test.testuser1002.phone_number %]22" ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Proxy-Authenticate: Digest realm="invite-allowedcli-nonmatch-reject.scenarios.test", nonce="[^"]+"' - 'Server: Sipwise NGCP Proxy' - 'Content-Length: 0' - - 'SIP/2.0 100 Trying' - - 'From: "431101622" ;tag=[\w-]+' + - 'From: "[% invite_allowedcli_nonmatch_reject_scenarios_test.testuser1002.phone_number %]22" ;tag=[\w-]+' - 'To: ' - 'CSeq: \d+ INVITE' - 'Server: Sipwise NGCP LB' - 'Content-Length: 0' - - 'SIP/2.0 403 Forbidden' - - 'From: "431101622" ;tag=[\w-]+' + - 'From: "[% invite_allowedcli_nonmatch_reject_scenarios_test.testuser1002.phone_number %]22" ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Server: Sipwise NGCP Proxy' diff --git a/scenarios/invite_blockout_pinoverride/sipp_scenario00_test.yml.tt2 b/scenarios/invite_blockout_pinoverride/sipp_scenario00_test.yml.tt2 index b76a210b..2f367618 100644 --- a/scenarios/invite_blockout_pinoverride/sipp_scenario00_test.yml.tt2 +++ b/scenarios/invite_blockout_pinoverride/sipp_scenario00_test.yml.tt2 @@ -1,20 +1,20 @@ messages: - - 'SIP/2.0 100 Trying' - 'From: ;tag=[\w-]+' - - 'To: ' + - 'To: ' - 'CSeq: \d+ INVITE' - 'Server: Sipwise NGCP LB' - 'Content-Length: 0' - - 'SIP/2.0 407 Proxy Authentication Required' - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Proxy-Authenticate: Digest realm="invite-blockout-pinoverride.scenarios.test", nonce="[^"]+"' - 'Server: Sipwise NGCP Proxy' - 'Content-Length: 0' - - 'SIP/2.0 100 Trying' - 'From: ;tag=[\w-]+' - - 'To: ' + - 'To: ' - 'CSeq: \d+ INVITE' - 'Server: Sipwise NGCP LB' - 'Content-Length: 0' @@ -23,7 +23,7 @@ messages: - 'Record-Route: ' - 'Record-Route: ' - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Content-Length: 0' - 'Contact: ' @@ -32,7 +32,7 @@ messages: - 'Record-Route: ' - 'Record-Route: ' - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Content-Type: application/sdp' - 'Content-Length: \d+' @@ -52,6 +52,6 @@ messages: - 'Record-Route: ' - 'Record-Route: ' - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ BYE' - 'Content-Length: 0' diff --git a/scenarios/invite_emergency_pidflo/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_emergency_pidflo/sipp_scenario_responder00_test.yml.tt2 index 50d63ee1..056f9c01 100644 --- a/scenarios/invite_emergency_pidflo/sipp_scenario_responder00_test.yml.tt2 +++ b/scenarios/invite_emergency_pidflo/sipp_scenario_responder00_test.yml.tt2 @@ -6,8 +6,8 @@ messages: - 'From: ;tag=[\w-]+' - 'To: ' - 'CSeq: \d+ INVITE' - - 'Geolocation: ' - - 'Call-Info: ;purpose=emergencyCallData' + - 'Geolocation: ' + - 'Call-Info: ;purpose=emergencyCallData' - 'P-Asserted-Identity: ' - 'Content-Type: multipart/mixed;boundary="unique-boundary-1"' - 'Content-Length: \d+' @@ -26,7 +26,7 @@ messages: - 'a=ptime:50' - '--unique-boundary-1' - 'Content-Type: application/pidf\+xml' - - 'Content-ID: cid:547896495@invite-emergency-pidflo.scenarios.test' + - 'Content-ID: cid:\d+@invite-emergency-pidflo.scenarios.test' - 'Content-Disposition: by-reference;handling=optional' - '<\?xml version="1.0" encoding="UTF-8"\?>' - '' - ' ' - ' yes' - - ' 2021-08-31T00:00:00Z' + - ' [^<]+' - ' ' - ' ' - ' ' - - ' 2021-07-20T11:00:58Z' + - ' \d{4}-\d{2}-[^<]+' - ' ' - '' - '--unique-boundary-1' - 'Content-Type: application/emergencyCall.ProviderInfo\+xml' - - 'Content-ID: cid:2045016391@invite-emergency-pidflo.scenarios.test' + - 'Content-ID: cid:\d+@invite-emergency-pidflo.scenarios.test' - 'Content-Disposition: by-reference;handling=optional' - '<\?xml version="1.0" encoding="UTF-8"\?>' - '' diff --git a/scenarios/invite_peerout_stir/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_peerout_stir/sipp_scenario_responder00_test.yml.tt2 index 53b1e258..eb1277ee 100644 --- a/scenarios/invite_peerout_stir/sipp_scenario_responder00_test.yml.tt2 +++ b/scenarios/invite_peerout_stir/sipp_scenario_responder00_test.yml.tt2 @@ -6,7 +6,7 @@ messages: - 'From: ;tag=[\w-]+' - 'To: ' - 'CSeq: \d+ INVITE' - - 'Identity: eyJhbGciOiJFUzI1NiIsInBwdCI6InNoYWtlbiIsInR5cCI6InBhc3Nwb3J0IiwieDV1IjoiaHR0cDovL2Zha2UudXJsL3B1Yi5rZXkifQ.eyJhdHRlc3QiOiJBIiwiZGVzdCI6eyJ0biI6WyIwMDQzMjEwMDEiXX0sImlhdCI6MTYyNjc3MTkzMywib3JpZyI6eyJ0biI6IjQzMTEwMDAifSwib3JpZ2lkIjoiNzA2MDllNDQtYTQzOC00ZmE1LTg5ZTItYjYxMTI2NjIzOGI5In0.Fa-DOKs8oISMYkJMtsiMRQyDDCB97hglsCeLKoLIFra9bpbKnO77Jq6b1k_jWIceVFZ-KZuPKwCdsNU9CA0urQ;info=;alg=ES256;ppt=shaken' + - 'Identity: [^;]+;info=;alg=ES256;ppt=shaken' - 'P-Asserted-Identity: ' - 'Content-Type: application/sdp' - 'Content-Length: \d+' diff --git a/scenarios/invite_prack/sipp_scenario00_test.yml.tt2 b/scenarios/invite_prack/sipp_scenario00_test.yml.tt2 index 3d856417..973fbff6 100644 --- a/scenarios/invite_prack/sipp_scenario00_test.yml.tt2 +++ b/scenarios/invite_prack/sipp_scenario00_test.yml.tt2 @@ -26,7 +26,7 @@ messages: - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Require: 100rel' - - 'RSeq: 1452' + - 'RSeq: \d+' - 'Content-Length: 0' - 'Contact: ' - - 'SIP/2.0 200 OK' diff --git a/scenarios/invite_prack/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_prack/sipp_scenario_responder00_test.yml.tt2 index 72dda3d3..c8140e97 100644 --- a/scenarios/invite_prack/sipp_scenario_responder00_test.yml.tt2 +++ b/scenarios/invite_prack/sipp_scenario_responder00_test.yml.tt2 @@ -29,7 +29,7 @@ messages: - 'To: ;tag=[\w-]+' - 'CSeq: \d+ PRACK' - 'P-Asserted-Identity: ' - - 'RAck: 1452 1451 INVITE' + - 'RAck: \d+ \d+ INVITE' - 'Content-Length: 0' - 'Contact: ' - - 'ACK sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=UDP SIP/2.0' diff --git a/scenarios/invite_trusted_peerout_stir/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_trusted_peerout_stir/sipp_scenario_responder00_test.yml.tt2 index d06f08d1..c0e3bf16 100644 --- a/scenarios/invite_trusted_peerout_stir/sipp_scenario_responder00_test.yml.tt2 +++ b/scenarios/invite_trusted_peerout_stir/sipp_scenario_responder00_test.yml.tt2 @@ -6,7 +6,7 @@ messages: - 'From: ;tag=[\w-]+' - 'To: ' - 'CSeq: \d+ INVITE' - - 'Identity: eyJhbGciOiJFUzI1NiIsInBwdCI6InNoYWtlbiIsInR5cCI6InBhc3Nwb3J0IiwieDV1IjoiaHR0cDovL2Zha2UudXJsL3B1Yi5rZXkifQ.eyJhdHRlc3QiOiJCIiwiZGVzdCI6eyJ0biI6WyIwMDQzMjEwMDEiXX0sImlhdCI6MTYyNjc3MjEzNiwib3JpZyI6eyJ0biI6IjQzMTEwMDAifSwib3JpZ2lkIjoiZmUzOGMyZjItNzMxNy00YmI4LWE4NmItNWZiZjNkNjdmN2UzIn0.LV55WPY2PHky_qZKnpq3xAZ-AgBFop3q5aqLChNtxP7n8t82WVmpAAc7HZBT2tkr0rGKhgmufJrZcuaOIPXn8g;info=;alg=ES256;ppt=shaken' + - 'Identity: [^;]+;info=;alg=ES256;ppt=shaken' - 'P-Asserted-Identity: ' - 'Content-Type: application/sdp' - 'Content-Length: \d+' diff --git a/scenarios/invite_wrong_reg/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_wrong_reg/sipp_scenario_responder00_test.yml.tt2 index 0b99f0ca..fe2ceac6 100644 --- a/scenarios/invite_wrong_reg/sipp_scenario_responder00_test.yml.tt2 +++ b/scenarios/invite_wrong_reg/sipp_scenario_responder00_test.yml.tt2 @@ -10,6 +10,6 @@ messages: - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ REGISTER' - - 'Contact: ;expires=\d+' + - 'Contact: ;expires=\d+' - 'Server: Sipwise NGCP Proxy' - 'Content-Length: 0'