TT#116103 scenarios/invite_callee_bye

* use server_ip from scenario_ids.yml
* Contact with <> format
* tests:
  - add received Contact parameter as optional

Change-Id: Ia6b9c35fa84e53939cdb5bcffbd2e3d8a60079e2

scenarios/invite_callee_bye/0001_test.yml.tt2

@@ -24,16 +24,16 @@ sip_in:
   - 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
-  - 'P-Sock-Info: udp:127.0.0.1:5060'
+  - 'P-Sock-Info: udp:[% server_ip %]:5060'
   - 'P-LB-Uptime: \d+'
-  - 'Path: <sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060>'
+  - 'Path: <sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060>'
 sip_out:
   - [
       'SIP/2.0 100 Trying',
       'From: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>',
       'CSeq: \d+ REGISTER',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
       'P-NGCP-Auth-IP: [% scenarios.0.responders.0.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'Server: Sipwise NGCP Proxy',
@@ -44,7 +44,7 @@ sip_out:
       'From: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ REGISTER',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
       'P-NGCP-Auth-IP: [% scenarios.0.responders.0.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'WWW-Authenticate: Digest realm="invite-callee-bye.scenarios.test", nonce=".+"',

scenarios/invite_callee_bye/0002_test.yml.tt2

@@ -27,23 +27,23 @@ sip_in:
   - 'From: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>'
   - 'CSeq: \d+ REGISTER'
-  - 'Authorization: Digest username="[% scenarios.0.responders.0.username %]",realm="invite-callee-bye.scenarios.test",uri="sip:127.0.0.1:5060",nonce=".+",response=".+",algorithm=MD5'
+  - 'Authorization: Digest username="[% scenarios.0.responders.0.username %]",realm="invite-callee-bye.scenarios.test",uri="sip:[% server_ip %]:5060",nonce=".+",response=".+",algorithm=MD5'
   - 'Contact: sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=UDP'
   - 'Content-Length: 0'
   - 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]'
   - 'P-NGCP-Src-Port: \d+'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
-  - 'P-Sock-Info: udp:127.0.0.1:5060'
+  - 'P-Sock-Info: udp:[% server_ip %]:5060'
   - 'P-LB-Uptime: \d+'
-  - 'Path: <sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060>'
+  - 'Path: <sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060>'
 sip_out:
   - [
       'SIP/2.0 100 Trying',
       'From: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>',
       'CSeq: \d+ REGISTER',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
       'P-NGCP-Auth-IP: [% scenarios.0.responders.0.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'Server: Sipwise NGCP Proxy',
@@ -54,7 +54,7 @@ sip_out:
       'From: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ REGISTER',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
       'P-NGCP-Auth-IP: [% scenarios.0.responders.0.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'P-NGCP-Authorization: [% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test',

scenarios/invite_callee_bye/0003_test.yml.tt2

@@ -25,14 +25,14 @@ sip_in:
   - 'From: <sip:[% scenarios.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>'
   - 'CSeq: \d+ INVITE'
-  - 'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Type: application/sdp'
   - 'Content-Length:\s+\d+'
   - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]'
   - 'P-NGCP-Src-Port: [% scenarios.0.port %]'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
-  - 'P-Sock-Info: udp:127.0.0.1:5060'
+  - 'P-Sock-Info: udp:[% server_ip %]:5060'
   - 'P-LB-Uptime: \d+'
 sip_out:
   - [
@@ -40,7 +40,7 @@ sip_out:
       'From: <sip:[% scenarios.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>',
       'CSeq: \d+ INVITE',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
       'P-NGCP-Auth-IP: [% scenarios.0.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'Server: Sipwise NGCP Proxy',
@@ -51,7 +51,7 @@ sip_out:
       'From: <sip:[% scenarios.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ INVITE',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
       'P-NGCP-Auth-IP: [% scenarios.0.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'Proxy-Authenticate: Digest realm="invite-callee-bye.scenarios.test", nonce=".+"',

scenarios/invite_callee_bye/0005_test.yml.tt2

@@ -158,15 +158,15 @@ sip_in:
   - 'From: <sip:[% scenarios.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>'
   - 'CSeq: \d+ INVITE'
-  - 'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]'
-  - 'Proxy-Authorization: Digest username="[% scenarios.0.username %]",realm="invite-callee-bye.scenarios.test",uri="sip:127.0.0.1:5060",nonce=".+",response=".+",algorithm=MD5'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
+  - 'Proxy-Authorization: Digest username="[% scenarios.0.username %]",realm="invite-callee-bye.scenarios.test",uri="sip:[% server_ip %]:5060",nonce=".+",response=".+",algorithm=MD5'
   - 'Content-Type: application/sdp'
   - 'Content-Length:\s+\d+'
   - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]'
   - 'P-NGCP-Src-Port: [% scenarios.0.port %]'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
-  - 'P-Sock-Info: udp:127.0.0.1:5060'
+  - 'P-Sock-Info: udp:[% server_ip %]:5060'
   - 'P-LB-Uptime: \d+'
 sip_out:
   - [
@@ -174,7 +174,7 @@ sip_out:
       'From: <sip:[% scenarios.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>',
       'CSeq: \d+ INVITE',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
       'P-NGCP-Auth-IP: [% scenarios.0.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'Server: Sipwise NGCP Proxy',
@@ -185,7 +185,7 @@ sip_out:
       'From: <sip:[% scenarios.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>',
       'CSeq: \d+ INVITE',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
       'P-NGCP-Auth-IP: [% scenarios.0.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'P-NGCP-Authorization: [% scenarios.0.username %]@invite-callee-bye.scenarios.test',
@@ -200,7 +200,7 @@ sip_out:
       'From: <sip:[% invite_callee_bye_scenarios_test.testuser1002.phone_number %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>',
       'CSeq: \d+ INVITE',
-      'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Content-Type: application/sdp',
       'Content-Length:\s+\d+',
       'P-LB-Uptime: \d+',
@@ -211,7 +211,7 @@ sip_out:
       'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no',
       'P-App-Name: sbc',
       'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-callee-bye.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_scenarios_test.testuser1002.phone_number %]',
-      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_callee_bye_scenarios_test.testuser1003.alias_numbers.0.phone_number %]',
-      'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_callee_bye_scenarios_test.testuser1003.alias_numbers.0.phone_number %]',
+      'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060',
       'P-Proxy-Uri: sip:127.0.0.1:5062',
     ]

scenarios/invite_callee_bye/0007_test.yml.tt2

@@ -21,8 +21,8 @@ sip_in:
   - 'P-Asserted-Identity: <sip:[% invite_callee_bye_scenarios_test.testuser1002.phone_number %]@invite-callee-bye.scenarios.test>'
   - 'P-Caller-UUID: [% invite_callee_bye_scenarios_test.testuser1002.uuid %]'
   - 'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-callee-bye.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_callee_bye_scenarios_test.testuser1002.phone_number %]'
-  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_callee_bye_scenarios_test.testuser1003.alias_numbers.0.phone_number %]'
-  - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060'
+  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_callee_bye_scenarios_test.testuser1003.alias_numbers.0.phone_number %]'
+  - 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060'
   - 'Content-Type: application/sdp'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
   - 'Content-Length:\s+\d+'
@@ -44,8 +44,8 @@ sip_out:
       'P-Asserted-Identity: <sip:[% invite_callee_bye_scenarios_test.testuser1002.phone_number %]@invite-callee-bye.scenarios.test>',
       'P-Caller-UUID: [% invite_callee_bye_scenarios_test.testuser1002.uuid %]',
       'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-callee-bye.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_callee_bye_scenarios_test.testuser1002.phone_number %]',
-      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_callee_bye_scenarios_test.testuser1003.alias_numbers.0.phone_number %]',
-      'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_callee_bye_scenarios_test.testuser1003.alias_numbers.0.phone_number %]',
+      'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060',
       'Content-Type: application/sdp',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
       'Content-Length:\s+\d+',

scenarios/invite_callee_bye/0010_test.yml.tt2

@@ -27,5 +27,5 @@ sip_out:
       'CSeq: \d+ INVITE',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
       'Content-Length: 0',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
     ]

scenarios/invite_callee_bye/0012_test.yml.tt2

@@ -33,5 +33,5 @@ sip_out:
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
       'Content-Type: application/sdp',
       'Content-Length:\s+\d+',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
     ]

scenarios/invite_callee_bye/0013_test.yml.tt2

@@ -28,13 +28,13 @@ sip_in:
   - 'From: <sip:[% scenarios.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+'
   - 'CSeq: \d+ ACK'
-  - 'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Length: 0'
   - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]'
   - 'P-NGCP-Src-Port: [% scenarios.0.port %]'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
-  - 'P-Sock-Info: udp:127.0.0.1:5060'
+  - 'P-Sock-Info: udp:[% server_ip %]:5060'
   - 'P-LB-Uptime: \d+'
 sip_out:
   - [
@@ -42,12 +42,12 @@ sip_out:
       'From: <sip:[% invite_callee_bye_scenarios_test.testuser1002.phone_number %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ ACK',
-      'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Content-Length: 0',
       'P-NGCP-Src-Ip: [% scenarios.0.ip %]',
       'P-NGCP-Src-Port: [% scenarios.0.port %]',
       'P-NGCP-Src-Proto: udp',
       'P-NGCP-Src-Af: 4',
-      'P-Sock-Info: udp:127.0.0.1:5060',
+      'P-Sock-Info: udp:[% server_ip %]:5060',
       'P-LB-Uptime: \d+',
     ]

scenarios/invite_callee_bye/0015_test.yml.tt2

@@ -35,7 +35,7 @@ sip_in:
   - 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
-  - 'P-Sock-Info: udp:127.0.0.1:5060'
+  - 'P-Sock-Info: udp:[% server_ip %]:5060'
   - 'P-LB-Uptime: \d+'
 sip_out:
   - [
@@ -43,7 +43,7 @@ sip_out:
       'From: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% invite_callee_bye_scenarios_test.testuser1002.alias_numbers.0.phone_number %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ BYE',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
       'P-NGCP-Auth-IP: [% scenarios.0.responders.0.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'Server: Sipwise NGCP Proxy',

scenarios/invite_callee_bye/0016_test.yml.tt2

@@ -27,7 +27,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - 'BYE sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %] SIP/2.0'
+  - 'BYE sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;alias=[% scenarios.0.ip %]~[% scenarios.0.port %]~1)? SIP/2.0'
   - 'From: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% invite_callee_bye_scenarios_test.testuser1002.phone_number %]@invite-callee-bye.scenarios.test>;tag=[\w-]+'
   - 'CSeq: \d+ BYE'
@@ -42,7 +42,7 @@ sip_out:
       'Content-Length: 0',
     ]
   - [
-      'BYE sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %] SIP/2.0',
+      'BYE sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;alias=[% scenarios.0.ip %]~[% scenarios.0.port %]~1)? SIP/2.0',
       'From: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ BYE',

scenarios/invite_callee_bye/0017_test.yml.tt2

@@ -17,7 +17,7 @@ sip_in:
   - 'From: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+'
   - 'CSeq: \d+ BYE'
-  - 'Contact: <sip:[% scenarios.0.ip %]:[% scenarios.0.port %];transport=UDP>'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Length: \s+0'
   - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]'
   - 'P-NGCP-Src-Port: \d+'
@@ -29,7 +29,7 @@ sip_out:
       'From: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% invite_callee_bye_scenarios_test.testuser1002.phone_number %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ BYE',
-      'Contact: <sip:[% scenarios.0.ip %]:[% scenarios.0.port %];transport=UDP>',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Content-Length: \s+0',
       'P-NGCP-Src-Ip: [% scenarios.0.ip %]',
       'P-NGCP-Src-Port: \d+',

scenarios/invite_callee_bye/0018_test.yml.tt2

@@ -25,5 +25,5 @@ sip_out:
       'To: <sip:[% invite_callee_bye_scenarios_test.testuser1002.alias_numbers.0.phone_number %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ BYE',
       'Content-Length: 0',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
     ]

scenarios/invite_callee_bye/sipp_scenario00.xml

@@ -10,7 +10,7 @@
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 INVITE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -41,7 +41,7 @@
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 ACK
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
@@ -59,7 +59,7 @@
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 INVITE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       Max-Forwards: 70
       [field1 file="caller.csv"]
       Content-Type: application/sdp
@@ -99,7 +99,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       [routes]
       CSeq: 2 ACK
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
@@ -119,15 +119,13 @@
       [last_To:]
       [last_Call-ID:]
       [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       Content-Length: [len]
 
     ]]>
   </send>
     <!-- end mod -->
 
-  
-
   <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200, 500, 1000"/>
 
  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>

scenarios/invite_callee_bye/sipp_scenario_responder00.xml

@@ -72,7 +72,7 @@
       BYE sip:ngcp-lb;tgrp=SIP_TripleC01@127.0.0.1:5060;ngcpct=[$2] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag01[call_number]
-      To: <sip:4311002@[field2 file="caller.csv" line=0]>;tag=[$3]
+      To: <sip:[field5 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[$3]
       [last_Call-ID:]
       CSeq: [cseq] BYE
       Contact: <sip:[field0 file="callee.csv"]@[local_ip]:[local_port];transport=[transport]>