TT#116103 scenarios/register_allowip

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

Change-Id: If803617720a36c19c82084d0d1b58d5ec23c7005

scenarios/register_allowip/0001_test.yml.tt2

@@ -16,7 +16,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^REGISTER'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Length: 0'
   - 'Expires: 600'
 sip_out:

scenarios/register_allowip/0002_test.yml.tt2

@@ -46,7 +46,7 @@ flow:
         - caller
 sip_in:
   - '^REGISTER'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Length: 0'
   - 'Expires: 600'
   - 'Authorization: Digest username="[% scenarios.0.username %]"'

scenarios/register_allowip/sipp_scenario00.xml

@@ -11,7 +11,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 REGISTER
-      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]>
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
@@ -35,7 +35,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 REGISTER
       [field2 file="callee.csv" line=0]
-      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]>
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0