TT#116103 scenarios/invite_peerout_rewrite

* use server_ip from scenario_ids.yml * Contact with <> format * tests: - add received Contact parameter as optional * define extra_info phone_number Change-Id: Ia6b36c9ff3ba11aee6ee5f06277725142638453e
5 years ago · fc95652532
parent f5c4ee3430
commit fc95652532
8 changed files with 33 additions and 30 deletions
--- a/scenarios/invite_peerout_rewrite/0001_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite/0001_test.yml.tt2
@ -22,7 +22,7 @@ flow:
  - exit|ROUTE_EXIT:
 sip_in:
  - '^INVITE sip:[% scenarios.0.responders.0.username %]@'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
  - 'CSeq: 1 INVITE'
  - 'Max-Forwards: 69'
--- a/scenarios/invite_peerout_rewrite/0003_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite/0003_test.yml.tt2
@ -200,8 +200,8 @@ flow:
        "outgoing"
      ]
 sip_in:
-  - '^INVITE sip:[% scenarios.0.responders.0.username %]@'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - '^INVITE sip:[% scenarios.0.responders.0.username %]@invite-peerout-rewrite.scenarios.test'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
  - 'CSeq: 2 INVITE'
  - 'Max-Forwards: 69'
  - 'Content-Type: application/sdp'
@ -210,25 +210,25 @@ sip_out:
  - [
      '^SIP/2.0 100 Trying',
      'CSeq: 2 INVITE',
-      'From: <sip:[% scenarios.0.username %]@',
-      'To: <sip:[% scenarios.0.responders.0.username %]@'
+      'From: <sip:[% scenarios.0.username %]@invite-peerout-rewrite.scenarios.test',
+      'To: <sip:[% scenarios.0.responders.0.username %]@invite-peerout-rewrite.scenarios.test'
    ]
  - [
      '^SIP/2.0 101 Connecting',
      'CSeq: 2 INVITE',
-      'From: <sip:[% scenarios.0.username %]@',
-      'To: <sip:[% scenarios.0.responders.0.username %]@'
+      'From: <sip:[% scenarios.0.username %]@invite-peerout-rewrite.scenarios.test',
+      'To: <sip:[% scenarios.0.responders.0.username %]@invite-peerout-rewrite.scenarios.test'
    ]
  - [
-      '^INVITE sip:4321001@',
+      '^INVITE sip:[% extra_info.phone_numbers.0 %]@',
      'CSeq: 2 INVITE',
-      'From: <sip:[% invite_peerout_rewrite_scenarios_test.testuser1002.phone_number %]@',
-      'To: <sip:[% scenarios.0.responders.0.username %]@',
+      'From: <sip:[% invite_peerout_rewrite_scenarios_test.testuser1002.phone_number %]@invite-peerout-rewrite.scenarios.test>;tag=',
+      'To: <sip:[% scenarios.0.responders.0.username %]@invite-peerout-rewrite.scenarios.test>',
      'Content-Type: application/sdp',
      'P-Caller-UUID: [% invite_peerout_rewrite_scenarios_test.testuser1002.uuid %]',
      'P-Callee-UUID: 0',
-      'P-Asserted-Identity: <sip:[% invite_peerout_rewrite_scenarios_test.testuser1002.phone_number %]@',
-      'P-Called-Party-ID: <sip:4321001@',
+      'P-Asserted-Identity: <sip:[% invite_peerout_rewrite_scenarios_test.testuser1002.phone_number %]@invite-peerout-rewrite.scenarios.test>',
+      'P-Called-Party-ID: <sip:[% extra_info.phone_numbers.0 %]@',
      'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no',
      'P-App-Name: sbc'
    ]
--- a/scenarios/invite_peerout_rewrite/0005_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite/0005_test.yml.tt2
@ -13,15 +13,15 @@ flow:
  - return|ROUTE_RUNTIME:
  - exit|ROUTE_EXIT:
 sip_in:
-  - 'INVITE sip:4321001@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
+  - 'INVITE sip:[% extra_info.phone_numbers.0 %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
  - 'From: <sip:[% invite_peerout_rewrite_scenarios_test.testuser1002.phone_number %]@invite-peerout-rewrite.scenarios.test>;tag=[\w-]+'
-  - 'To: <sip:4321001@[% scenarios.0.responders.0.ip %]>'
+  - 'To: <sip:[% extra_info.phone_numbers.0 %]@[% scenarios.0.responders.0.ip %]>'
  - 'CSeq: \d+ INVITE'
  - 'P-LB-Uptime: \d+'
  - 'P-Asserted-Identity: <sip:[% invite_peerout_rewrite_scenarios_test.testuser1002.phone_number %]@invite-peerout-rewrite.scenarios.test>'
  - 'P-Caller-UUID: [% invite_peerout_rewrite_scenarios_test.testuser1002.uuid %]'
  - 'P-NGCP-Caller-Info: <sip:testuser1002@invite-peerout-rewrite.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_peerout_rewrite_scenarios_test.testuser1002.phone_number %]'
-  - 'P-NGCP-Callee-Info: <sip:4321001@invite-peerout-rewrite.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %]'
+  - 'P-NGCP-Callee-Info: <sip:[% extra_info.phone_numbers.0 %]@invite-peerout-rewrite.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %]'
  - 'P-D-Uri: sip:127.0.0.1:5060;received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %]%3blr%3btransport%3dudp'
  - 'Content-Type: application/sdp'
  - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
@ -30,21 +30,21 @@ sip_out:
  - [
      'SIP/2.0 100 Trying',
      'From: <sip:[% invite_peerout_rewrite_scenarios_test.testuser1002.phone_number %]@invite-peerout-rewrite.scenarios.test>;tag=[\w-]+',
-      'To: <sip:4321001@[% scenarios.0.responders.0.ip %]>',
+      'To: <sip:[% extra_info.phone_numbers.0 %]@[% scenarios.0.responders.0.ip %]>',
      'CSeq: \d+ INVITE',
      'Server: Sipwise NGCP Proxy',
      'Content-Length: 0',
    ]
  - [
-      'INVITE sip:4321001@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0',
+      'INVITE sip:[% extra_info.phone_numbers.0 %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0',
      'From: <sip:[% invite_peerout_rewrite_scenarios_test.testuser1002.phone_number %]@invite-peerout-rewrite.scenarios.test>;tag=[\w-]+',
-      'To: <sip:4321001@[% scenarios.0.responders.0.ip %]>',
+      'To: <sip:[% extra_info.phone_numbers.0 %]@[% scenarios.0.responders.0.ip %]>',
      'CSeq: \d+ INVITE',
      'P-LB-Uptime: \d+',
      'P-Asserted-Identity: <sip:[% invite_peerout_rewrite_scenarios_test.testuser1002.phone_number %]@invite-peerout-rewrite.scenarios.test>',
      'P-Caller-UUID: [% invite_peerout_rewrite_scenarios_test.testuser1002.uuid %]',
      'P-NGCP-Caller-Info: <sip:testuser1002@invite-peerout-rewrite.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_peerout_rewrite_scenarios_test.testuser1002.phone_number %]',
-      'P-NGCP-Callee-Info: <sip:4321001@invite-peerout-rewrite.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=\d+',
+      'P-NGCP-Callee-Info: <sip:[% extra_info.phone_numbers.0 %]@invite-peerout-rewrite.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=\d+',
      'P-D-Uri: sip:127.0.0.1:5060;received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %]%3blr%3btransport%3dudp',
      'Content-Type: application/sdp',
      'Contact: <sip:127.0.0.1:508[08];transport=udp>',
--- a/scenarios/invite_peerout_rewrite/0011_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite/0011_test.yml.tt2
@ -25,7 +25,7 @@ flow:
  - exit|ROUTE_EXIT:
 sip_in:
  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
  - 'CSeq: 2 ACK'
  - 'Max-Forwards: 69'
  - 'Content-Length: 0'
@ -35,7 +35,7 @@ sip_in:
 sip_out:
  - [
      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:[% scenarios.0.username %]@',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
      'CSeq: 2 ACK',
      'Max-Forwards: 68',
      'Content-Length: 0',
--- a/scenarios/invite_peerout_rewrite/0013_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite/0013_test.yml.tt2
@ -29,7 +29,7 @@ flow:
  - exit|ROUTE_EXIT:
 sip_in:
  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
  - 'CSeq: 3 BYE'
  - 'Max-Forwards: 69'
  - 'Content-Length: 0'
@ -46,7 +46,7 @@ sip_out:
    ]
  - [
      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:[% scenarios.0.username %]@',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
      'CSeq: 3 BYE',
      'Max-Forwards: 68',
      'Content-Length: 0',
--- a/scenarios/invite_peerout_rewrite/cdr_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite/cdr_test.yml.tt2
@ -2,9 +2,9 @@ cdr:
  - source_user: '[% scenarios.0.username %]'
    source_domain: 'invite-peerout-rewrite.scenarios.test'
    source_cli: '[% invite_peerout_rewrite_scenarios_test.testuser1002.phone_number %]'
-    destination_user: '4321001'
+    destination_user: '[% extra_info.phone_numbers.0 %]'
    destination_domain: '[% scenarios.0.responders.0.ip %]'
-    destination_user_dialed: '004321001'
+    destination_user_dialed: '[% scenarios.0.responders.0.username %]'
    call_type: 'call'
    call_status: 'ok'
    call_code: '200'
--- a/scenarios/invite_peerout_rewrite/scenario.yml
+++ b/scenarios/invite_peerout_rewrite/scenario.yml
@ -43,3 +43,6 @@ scenarios:
        domain: invite-peerout-rewrite.scenarios.test
        peer_host: peer_invite_peerout_rewrite_host0
        register: 'no'
+extra_info:
+  phone_numbers:
+    - 4321001
--- a/scenarios/invite_peerout_rewrite/sipp_scenario00.xml
+++ b/scenarios/invite_peerout_rewrite/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" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[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" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[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" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
      Max-Forwards: 70
      [field1 file="caller.csv" line=0]
      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" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
      Max-Forwards: 70
      Content-Length: 0

@ -124,7 +124,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: 3 BYE
-      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
      [routes]
      Max-Forwards: 70
      Content-Length: 0