TT#116103 scenarios_pbx/invite_username_devid

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

Change-Id: I038473a950350d8a3a2953fefbab02d310554558

scenarios_pbx/invite_username_devid/0002_test.yml.tt2

@@ -27,23 +27,23 @@ sip_in:
   - 'From: <sip:testuser1003@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
   - 'To: <sip:testuser1003@invite-username-devid.scenarios-pbx.test>'
   - 'CSeq: \d+ REGISTER'
-  - 'Authorization: Digest username="testuser1003",realm="invite-username-devid.scenarios-pbx.test",uri="sip:127.0.0.1:5060",nonce=".+",response=".+",algorithm=MD5'
+  - 'Authorization: Digest username="testuser1003",realm="invite-username-devid.scenarios-pbx.test",uri="sip:[% server_ip %]:5060",nonce=".+",response=".+",algorithm=MD5'
   - 'Contact: sip:testuser1003@[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %];transport=UDP'
   - 'Content-Length: 0'
   - 'P-NGCP-Src-Ip: [% scenarios.2.responders.0.ip %]'
   - 'P-NGCP-Src-Port: [% scenarios.2.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.2.responders.0.ip %]:[% scenarios.2.responders.0.port %];)?socket=sip:[% server_ip %]:5060>'
 sip_out:
   - [
       'SIP/2.0 100 Trying',
       'From: <sip:testuser1003@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'To: <sip:testuser1003@invite-username-devid.scenarios-pbx.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.2.responders.0.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'Server: Sipwise NGCP Proxy',
@@ -54,7 +54,7 @@ sip_out:
       'From: <sip:testuser1003@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'To: <sip:testuser1003@invite-username-devid.scenarios-pbx.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.2.responders.0.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'P-NGCP-Authorization: testuser1003@invite-username-devid.scenarios-pbx.test',

scenarios_pbx/invite_username_devid/0003_test.yml.tt2

@@ -24,16 +24,16 @@ sip_in:
   - '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+'
-  - '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.ip %]:[% scenarios.0.port %];)?socket=sip:[% server_ip %]:5060>'
 sip_out:
   - [
       'SIP/2.0 100 Trying',
       'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'To: "TestBria" <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-username-devid.scenarios-pbx.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.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'Server: Sipwise NGCP Proxy',
@@ -44,7 +44,7 @@ sip_out:
       'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'To: "TestBria" <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-username-devid.scenarios-pbx.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.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'WWW-Authenticate: Digest realm="invite-username-devid.scenarios-pbx.test", nonce=".+"',

scenarios_pbx/invite_username_devid/0004_test.yml.tt2

@@ -27,23 +27,23 @@ sip_in:
   - 'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
   - 'To: "TestBria" <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-username-devid.scenarios-pbx.test>'
   - 'CSeq: \d+ REGISTER'
-  - 'Authorization: Digest username="[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]",realm="invite-username-devid.scenarios-pbx.test",uri="sip:127.0.0.1:5060",nonce=".+",response=".+",algorithm=MD5'
+  - 'Authorization: Digest username="[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]",realm="invite-username-devid.scenarios-pbx.test",uri="sip:[% server_ip %]:5060",nonce=".+",response=".+",algorithm=MD5'
   - 'Contact: "TestBria" <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@[% scenarios.0.ip %]:6666;ob>;reg-id=1;\+sip.instance="<urn:uuid:C3DD6013-20E8-40E3-8EA2-5849B02ED0C4>"'
   - '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+'
-  - '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.ip %]:[% scenarios.0.port %];)?socket=sip:[% server_ip %]:5060>'
 sip_out:
   - [
       'SIP/2.0 100 Trying',
       'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'To: "TestBria" <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-username-devid.scenarios-pbx.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.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'Server: Sipwise NGCP Proxy',
@@ -54,13 +54,13 @@ sip_out:
       'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'To: "TestBria" <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-username-devid.scenarios-pbx.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.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'P-NGCP-Authorization: [% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-username-devid.scenarios-pbx.test',
       'P-NGCP-Authorized: 1',
       'P-Caller-UUID: [% invite_username_devid_scenarios_pbx_test.testuser1003.uuid %]',
-      'Contact: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@[% scenarios.0.ip %]:6666;ob>;expires=\d+;\+sip.instance="<urn:uuid:C3DD6013-20E8-40E3-8EA2-5849B02ED0C4>";reg-id=1',
+      'Contact: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@[% scenarios.0.ip %]:6666;ob>;expires=\d+;(received="sip:[% scenarios.0.ip %]:[% scenarios.0.port %]";)?\+sip.instance="<urn:uuid:C3DD6013-20E8-40E3-8EA2-5849B02ED0C4>";reg-id=1',
       'Server: Sipwise NGCP Proxy',
       'Content-Length: 0',
     ]

scenarios_pbx/invite_username_devid/0005_test.yml.tt2

@@ -24,16 +24,16 @@ sip_in:
   - 'P-NGCP-Src-Port: [% scenarios.1.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.1.ip %]:[% scenarios.1.port %];)?socket=sip:[% server_ip %]:5060>'
 sip_out:
   - [
       'SIP/2.0 100 Trying',
       'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.2.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'To: "TestBria" <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.2.phone_number %]@invite-username-devid.scenarios-pbx.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.1.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'Server: Sipwise NGCP Proxy',
@@ -44,7 +44,7 @@ sip_out:
       'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.2.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'To: "TestBria" <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.2.phone_number %]@invite-username-devid.scenarios-pbx.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.1.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'WWW-Authenticate: Digest realm="invite-username-devid.scenarios-pbx.test", nonce=".+"',

scenarios_pbx/invite_username_devid/0006_test.yml.tt2

@@ -27,23 +27,23 @@ sip_in:
   - 'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.2.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
   - 'To: "TestBria" <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.2.phone_number %]@invite-username-devid.scenarios-pbx.test>'
   - 'CSeq: \d+ REGISTER'
-  - 'Authorization: Digest username="[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.2.phone_number %]",realm="invite-username-devid.scenarios-pbx.test",uri="sip:127.0.0.1:5060",nonce=".+",response=".+",algorithm=MD5'
+  - 'Authorization: Digest username="[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.2.phone_number %]",realm="invite-username-devid.scenarios-pbx.test",uri="sip:[% server_ip %]:5060",nonce=".+",response=".+",algorithm=MD5'
   - 'Contact: "TestBria" <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.2.phone_number %]@[% scenarios.1.ip %]:6666;ob>;reg-id=1;\+sip.instance="<urn:uuid:C3DD6013-20E8-40E3-8EA2-5849B02ED0C4>"'
   - 'Content-Length: 0'
   - 'P-NGCP-Src-Ip: [% scenarios.1.ip %]'
   - 'P-NGCP-Src-Port: [% scenarios.1.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.1.ip %]:[% scenarios.1.port %];)?socket=sip:[% server_ip %]:5060>'
 sip_out:
   - [
       'SIP/2.0 100 Trying',
       'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.2.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'To: "TestBria" <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.2.phone_number %]@invite-username-devid.scenarios-pbx.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.1.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'Server: Sipwise NGCP Proxy',
@@ -54,13 +54,13 @@ sip_out:
       'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.2.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'To: "TestBria" <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.2.phone_number %]@invite-username-devid.scenarios-pbx.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.1.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'P-NGCP-Authorization: [% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.2.phone_number %]@invite-username-devid.scenarios-pbx.test',
       'P-NGCP-Authorized: 1',
       'P-Caller-UUID: [% invite_username_devid_scenarios_pbx_test.testuser1003.uuid %]',
-      'Contact: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.2.phone_number %]@[% scenarios.1.ip %]:6666;ob>;expires=\d+;\+sip.instance="<urn:uuid:C3DD6013-20E8-40E3-8EA2-5849B02ED0C4>";reg-id=1',
+      'Contact: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.alias_numbers.2.phone_number %]@[% scenarios.1.ip %]:6666;ob>;expires=\d+;(received="sip:[% scenarios.1.ip %]:[% scenarios.1.port %]";)?\+sip.instance="<urn:uuid:C3DD6013-20E8-40E3-8EA2-5849B02ED0C4>";reg-id=1',
       'Server: Sipwise NGCP Proxy',
       'Content-Length: 0',
     ]

scenarios_pbx/invite_username_devid/0007_test.yml.tt2

@@ -21,26 +21,26 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - 'INVITE sip:1003@invite-username-devid.scenarios-pbx.test SIP/2.0'
+  - 'INVITE sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.test SIP/2.0'
   - 'From: <sip:testuser1002@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
-  - 'To: <sip:1003@invite-username-devid.scenarios-pbx.test>'
+  - 'To: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.test>'
   - 'CSeq: \d+ INVITE'
-  - 'Contact: sip:testuser1002@[% scenarios.2.ip %]:[% scenarios.2.port %]'
+  - 'Contact: <sip:[% scenarios.2.username %]@[% scenarios.2.ip %]:[% scenarios.2.port %](;[^>]+)?>'
   - 'Content-Type: application/sdp'
   - 'Content-Length:\s+\d+'
   - 'P-NGCP-Src-Ip: [% scenarios.2.ip %]'
   - 'P-NGCP-Src-Port: [% scenarios.2.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:
   - [
       'SIP/2.0 100 Trying',
       'From: <sip:testuser1002@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
-      'To: <sip:1003@invite-username-devid.scenarios-pbx.test>',
+      'To: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.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.2.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'Server: Sipwise NGCP Proxy',
@@ -49,9 +49,9 @@ sip_out:
   - [
       'SIP/2.0 407 Proxy Authentication Required',
       'From: <sip:testuser1002@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
-      'To: <sip:1003@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
+      'To: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.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.2.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'Proxy-Authenticate: Digest realm="invite-username-devid.scenarios-pbx.test", nonce=".+"',

scenarios_pbx/invite_username_devid/0009_test.yml.tt2

@@ -156,27 +156,27 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - 'INVITE sip:1003@invite-username-devid.scenarios-pbx.test SIP/2.0'
+  - 'INVITE sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.test SIP/2.0'
   - 'From: <sip:testuser1002@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
-  - 'To: <sip:1003@invite-username-devid.scenarios-pbx.test>'
+  - 'To: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.test>'
   - 'CSeq: \d+ INVITE'
-  - 'Contact: sip:testuser1002@127.126.0.1:\d+'
-  - 'Proxy-Authorization: Digest username="testuser1002",realm="invite-username-devid.scenarios-pbx.test",uri="sip:127.0.0.1:5060",nonce=".+",response=".+",algorithm=MD5'
+  - 'Contact: <sip:[% scenarios.2.username %]@[% scenarios.2.ip %]:[% scenarios.2.port %](;[^>]+)?>'
+  - 'Proxy-Authorization: Digest username="testuser1002",realm="invite-username-devid.scenarios-pbx.test",uri="sip:[% server_ip %]:5060",nonce=".+",response=".+",algorithm=MD5'
   - 'Content-Type: application/sdp'
   - 'Content-Length:\s+\d+'
   - 'P-NGCP-Src-Ip: [% scenarios.2.ip %]'
   - 'P-NGCP-Src-Port: [% scenarios.2.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:
   - [
       'SIP/2.0 100 Trying',
       'From: <sip:testuser1002@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
-      'To: <sip:1003@invite-username-devid.scenarios-pbx.test>',
+      'To: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.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.2.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'Server: Sipwise NGCP Proxy',
@@ -185,10 +185,10 @@ sip_out:
   - [
       'SIP/2.0 101 Connecting',
       'From: <sip:testuser1002@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
-      'To: <sip:1003@invite-username-devid.scenarios-pbx.test>',
+      'To: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.test>',
       'CSeq: \d+ INVITE',
-      'P-Out-Socket: udp:127.0.0.1:5060',
-      'P-NGCP-Auth-IP: 127.126.0.1',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
+      'P-NGCP-Auth-IP: [% scenarios.2.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'P-NGCP-Authorization: testuser1002@invite-username-devid.scenarios-pbx.test',
       'P-NGCP-Authorized: 1',
@@ -208,11 +208,11 @@ sip_out:
       'Content-Type: application/dialog\-info\+xml',
     ]
   - [
-      'INVITE sip:testuser1003@127.126.0.1:\d+ SIP/2.0',
+      'INVITE sip:testuser1003@[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %] SIP/2.0',
       'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
-      'To: <sip:1003@invite-username-devid.scenarios-pbx.test>',
+      'To: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.test>',
       'CSeq: \d+ INVITE',
-      'Contact: sip:testuser1002@127.126.0.1:\d+',
+      'Contact: <sip:[% scenarios.2.username %]@[% scenarios.2.ip %]:[% scenarios.2.port %](;[^>]+)?>',
       'Content-Type: application/sdp',
       'Content-Length:\s+\d+',
       'P-LB-Uptime: \d+',
@@ -224,9 +224,9 @@ sip_out:
       'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;fast_ack=no;a_park_domain=[% invite_username_devid_customerpbx_test.id %];b_park_domain=[% invite_username_devid_customerpbx_test.id %]',
       'P-App-Name: sbc',
       'P-NGCP-Caller-Info: <sip:testuser1002@invite-username-devid.scenarios-pbx.test>;ip=[% scenarios.2.ip %];port=[% scenarios.2.port %];primary=[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]',
-      'P-NGCP-Callee-Info: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]1003@invite-username-devid.scenarios-pbx.test>;ip=127.0.0.1;port=5060;primary=[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]1003',
+      'P-NGCP-Callee-Info: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_phone_number %]@invite-username-devid.scenarios-pbx.test>;ip=[% scenarios.2.responders.0.ip %];port=[% scenarios.2.responders.0.port %];primary=[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_phone_number %]',
       'P-NGCP-Presence-Caller: sip:testuser1002@invite-username-devid.scenarios-pbx.test',
       'P-NGCP-Presence-Callee: sip:testuser1003@invite-username-devid.scenarios-pbx.test',
-      'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060',
+      'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %];)?socket=sip:[% server_ip %]:5060',
       'P-Proxy-Uri: sip:127.0.0.1:5062',
     ]

scenarios_pbx/invite_username_devid/0011_test.yml.tt2

@@ -15,7 +15,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - 'INVITE sip:testuser1003@127.126.0.1:\d+ SIP/2.0'
+  - 'INVITE sip:testuser1003@[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %] SIP/2.0'
   - 'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
   - 'To: <sip:testuser1003@invite-username-devid.scenarios-pbx.test>'
   - 'CSeq: \d+ INVITE'
@@ -25,10 +25,10 @@ sip_in:
   - 'P-Callee-UUID: [% invite_username_devid_scenarios_pbx_test.testuser1003.uuid %]'
   - 'P-NGCP-Rtpengine-Bleg: 1'
   - 'P-NGCP-Caller-Info: <sip:testuser1002@invite-username-devid.scenarios-pbx.test>;ip=[% scenarios.2.ip %];port=[% scenarios.2.port %];primary=[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]'
-  - 'P-NGCP-Callee-Info: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]1003@invite-username-devid.scenarios-pbx.test>;ip=127.0.0.1;port=5060;primary=[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]1003'
+  - 'P-NGCP-Callee-Info: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_phone_number %]@invite-username-devid.scenarios-pbx.test>;ip=[% scenarios.2.responders.0.ip %];port=[% scenarios.2.responders.0.port %];primary=[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_phone_number %]'
   - 'P-NGCP-Presence-Caller: sip:testuser1002@invite-username-devid.scenarios-pbx.test'
   - 'P-NGCP-Presence-Callee: sip:testuser1003@invite-username-devid.scenarios-pbx.test'
-  - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060'
+  - 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %];)?socket=sip:[% server_ip %]:5060'
   - 'Content-Type: application/sdp'
   - 'Content-Length:\s+\d+'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
@@ -42,7 +42,7 @@ sip_out:
       'Content-Length: 0',
     ]
   - [
-      'INVITE sip:testuser1003@127.126.0.1:\d+ SIP/2.0',
+      'INVITE sip:testuser1003@[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %] SIP/2.0',
       'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'To: <sip:testuser1003@invite-username-devid.scenarios-pbx.test>',
       'CSeq: \d+ INVITE',
@@ -52,8 +52,8 @@ sip_out:
       'P-Callee-UUID: [% invite_username_devid_scenarios_pbx_test.testuser1003.uuid %]',
       'P-NGCP-Rtpengine-Bleg: 1',
       'P-NGCP-Caller-Info: <sip:testuser1002@invite-username-devid.scenarios-pbx.test>;ip=[% scenarios.2.ip %];port=[% scenarios.2.port %];primary=[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]',
-      'P-NGCP-Callee-Info: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]1003@invite-username-devid.scenarios-pbx.test>;ip=127.0.0.1;port=5060;primary=[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]1003',
-      'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060',
+      'P-NGCP-Callee-Info: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_phone_number %]@invite-username-devid.scenarios-pbx.test>;ip=[% scenarios.2.responders.0.ip %];port=[% scenarios.2.responders.0.port %];primary=[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_phone_number %]',
+      'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %];)?socket=sip:[% server_ip %]:5060',
       'Content-Type: application/sdp',
       'Content-Length:\s+\d+',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',

scenarios_pbx/invite_username_devid/0014_test.yml.tt2

@@ -17,7 +17,7 @@ flow:
 sip_in:
   - 'SIP/2.0 180 Ringing'
   - 'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
-  - 'To: <sip:1003@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
+  - 'To: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
   - 'CSeq: \d+ INVITE'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
   - 'Content-Length: 0'
@@ -40,6 +40,6 @@ sip_out:
       'CSeq: \d+ INVITE',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
       'Content-Length: 0',
-      'P-COLP-Identity: "1003" <sip:1003@invite-username-devid.scenarios-pbx.test>',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-COLP-Identity: "[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]" <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.test>',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
     ]

scenarios_pbx/invite_username_devid/0016_test.yml.tt2

@@ -21,7 +21,7 @@ flow:
 sip_in:
   - 'SIP/2.0 200 OK'
   - 'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
-  - 'To: <sip:1003@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
+  - 'To: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
   - 'CSeq: \d+ INVITE'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
   - 'Content-Type: application/sdp'
@@ -41,11 +41,11 @@ sip_out:
   - [
       'SIP/2.0 200 OK',
       'From: <sip:testuser1002@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
-      'To: <sip:1003@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
+      'To: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'CSeq: \d+ INVITE',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
       'Content-Type: application/sdp',
       'Content-Length:\s+\d+',
-      'P-COLP-Identity: "1003" <sip:1003@invite-username-devid.scenarios-pbx.test>',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-COLP-Identity: "[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]" <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.test>',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
     ]

scenarios_pbx/invite_username_devid/0017_test.yml.tt2

@@ -28,22 +28,22 @@ flow:
 sip_in:
   - 'ACK sip:127.0.0.1:508[08];prxroute=1 SIP/2.0'
   - 'From: <sip:testuser1002@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
-  - 'To: <sip:1003@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
+  - 'To: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
   - 'CSeq: \d+ ACK'
-  - 'Contact: sip:testuser1002@127.126.0.1:\d+'
+  - 'Contact: <sip:[% scenarios.2.username %]@[% scenarios.2.ip %]:[% scenarios.2.port %](;[^>]+)?>'
   - 'Content-Length: 0'
   - '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:
   - [
       'ACK sip:127.0.0.1:508[08];prxroute=1 SIP/2.0',
       'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
-      'To: <sip:1003@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
+      'To: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'CSeq: \d+ ACK',
-      'Contact: sip:testuser1002@127.126.0.1:\d+',
+      'Contact: <sip:[% scenarios.2.username %]@[% scenarios.2.ip %]:[% scenarios.2.port %](;[^>]+)?>',
       'Content-Length: 0',
       '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_pbx/invite_username_devid/0019_test.yml.tt2

@@ -37,7 +37,7 @@ sip_in:
   - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - '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:
   - [
@@ -45,8 +45,8 @@ sip_out:
       'From: <sip:testuser1002@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'To: <sip:1003@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'CSeq: \d+ BYE',
-      'P-Out-Socket: udp:127.0.0.1:5060',
-      'P-NGCP-Auth-IP: 127.126.0.1',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
+      'P-NGCP-Auth-IP: [% scenarios.2.ip %]',
       'P-NGCP-Auth-UA: <null>',
       'Server: Sipwise NGCP Proxy',
       'Content-Length: 0',
@@ -67,7 +67,7 @@ sip_out:
       'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'To: <sip:1003@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'CSeq: \d+ BYE',
-      'Contact: sip:testuser1002@127.126.0.1:\d+',
+      'Contact: <sip:[% scenarios.2.username %]@[% scenarios.2.ip %]:[% scenarios.2.port %](;[^>]+)?>',
       'Content-Length: 0',
       'P-LB-Uptime: \d+',
       'P-Asserted-Identity: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]@invite-username-devid.scenarios-pbx.test>',

scenarios_pbx/invite_username_devid/0020_test.yml.tt2

@@ -57,7 +57,7 @@ sip_out:
       'Content-Type: application/dialog\-info\+xml',
     ]
   - [
-      'BYE sip:127.126.0.1:\d+;transport=UDP SIP/2.0',
+      'BYE sip:[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %];transport=UDP SIP/2.0',
       'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'To: <sip:testuser1003@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'CSeq: \d+ BYE',

scenarios_pbx/invite_username_devid/0022_test.yml.tt2

@@ -17,16 +17,16 @@ flow:
 sip_in:
   - 'SIP/2.0 200 OK'
   - 'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
-  - 'To: <sip:1003@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
+  - 'To: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
   - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
 sip_out:
   - [
       'SIP/2.0 200 OK',
       'From: <sip:testuser1002@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
-      'To: <sip:1003@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
+      'To: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+',
       'CSeq: \d+ BYE',
       'Content-Length: 0',
-      'P-COLP-Identity: "1003" <sip:1003@invite-username-devid.scenarios-pbx.test>',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-COLP-Identity: "[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]" <sip:[% invite_username_devid_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-username-devid.scenarios-pbx.test>',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
     ]

scenarios_pbx/invite_username_devid/sipp_scenario02.xml

@@ -10,7 +10,7 @@
       To: <sip:[field5 file="callee.csv" line=2]@[field3 file="callee.csv" line=2]>
       Call-ID: NGCP%[field4 file="callee.csv" line=2]%///[call_id]
       CSeq: 1 INVITE
-      Contact: sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -41,7 +41,7 @@
       To: <sip:[field5 file="callee.csv" line=2]@[field3 file="callee.csv" line=2]>[peer_tag_param]
       Call-ID: NGCP%[field4 file="callee.csv" line=2]%///[call_id]
       CSeq: 1 ACK
-      Contact: sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
@@ -59,7 +59,7 @@
       To: <sip:[field5 file="callee.csv" line=2]@[field3 file="callee.csv" line=2]>
       Call-ID: NGCP%[field4 file="callee.csv" line=2]%///[call_id]
       CSeq: 2 INVITE
-      Contact: sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]>
       Max-Forwards: 70
       [field1 file="caller.csv" line=2]
       Content-Type: application/sdp
@@ -99,7 +99,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=2]%///[call_id]
       [routes]
       CSeq: 2 ACK
-      Contact: sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
@@ -124,7 +124,7 @@
       To: <sip:[field5 file="callee.csv" line=2]@[field3 file="callee.csv" line=2]>[peer_tag_param]
       Call-ID: NGCP%[field4 file="callee.csv" line=2]%///[call_id]
       CSeq: 3 BYE
-      Contact: sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]>
       [routes]
       Max-Forwards: 70
       Content-Length: 0