[Asterisk-code-review] pjsip/transfer: Remove obsolete sipp options (testsuite[15])
Jenkins2
asteriskteam at digium.com
Tue Jul 24 09:36:56 CDT 2018
Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/9645 )
Change subject: pjsip/transfer: Remove obsolete sipp options
......................................................................
pjsip/transfer: Remove obsolete sipp options
Some of the blind transfer hold tests were using -min_rtp_port and
-max_rtp_port sipp options. These are now obsolete and cause sipp
to comaplin and the tests to fail.
Removed those options. Tests still work fine.
Change-Id: I3c3f82c7d6aec5fe3acaba1e5dd1d54edba3ba72
---
M tests/channels/pjsip/transfers/blind_transfer/callee_with_hold/test-config.yaml
M tests/channels/pjsip/transfers/blind_transfer/caller_with_hold/test-config.yaml
M tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/test-config.yaml
3 files changed, 18 insertions(+), 18 deletions(-)
Approvals:
Jenkins2: Looks good to me, approved; Approved for Submit
diff --git a/tests/channels/pjsip/transfers/blind_transfer/callee_with_hold/test-config.yaml b/tests/channels/pjsip/transfers/blind_transfer/callee_with_hold/test-config.yaml
index 92935ca..c007b3d 100644
--- a/tests/channels/pjsip/transfers/blind_transfer/callee_with_hold/test-config.yaml
+++ b/tests/channels/pjsip/transfers/blind_transfer/callee_with_hold/test-config.yaml
@@ -40,25 +40,25 @@
-
scenarios:
# Charlie receives transfered call and sends audio to Alice.
- - { 'key-args': {'scenario': 'charlie.xml', '-p': '5060', '-i': '127.0.0.4', '-timeout': '20s', '-min_rtp_port': '6004', '-max_rtp_port': '6008', '-mi': '127.0.0.4'},
+ - { 'key-args': {'scenario': 'charlie.xml', '-p': '5060', '-i': '127.0.0.4', '-timeout': '20s', '-mi': '127.0.0.4'},
'ordered-args': ['-timeout_error', '-key', 'custom_media_port', '6004'] }
# Bob receives call from Alice and sends audio. Bob then attempts to blind transfer Alice to Charlie.
- - { 'key-args': {'scenario': 'bob.xml', '-p': '5060', '-i': '127.0.0.3', '-s': 'alice', '-timeout': '20s', '-min_rtp_port': '6004', '-max_rtp_port': '6008', '-mi': '127.0.0.3'},
+ - { 'key-args': {'scenario': 'bob.xml', '-p': '5060', '-i': '127.0.0.3', '-s': 'alice', '-timeout': '20s', '-mi': '127.0.0.3'},
'ordered-args': ['-timeout_error', '-key', 'custom_media_port', '6004'] }
# Alice calls Bob and sends audio.
- - { 'key-args': {'scenario': 'alice.xml', '-p': '5060', '-i': '127.0.0.2', '-s': 'bob', '-timeout': '20s', '-min_rtp_port': '6004', '-max_rtp_port': '6008', '-mi': '127.0.0.2'},
+ - { 'key-args': {'scenario': 'alice.xml', '-p': '5060', '-i': '127.0.0.2', '-s': 'bob', '-timeout': '20s', '-mi': '127.0.0.2'},
'ordered-args': ['-timeout_error', '-key', 'custom_media_port', '6004'] }
# Second iteration
-
scenarios:
# Charlie receives transfered call and sends audio to Alice.
- - { 'key-args': {'scenario': 'charlie.xml', '-p': '5060', '-i': '127.0.0.4', '-timeout': '20s', '-min_rtp_port': '6004', '-max_rtp_port': '6008', '-mi': '127.0.0.4'},
+ - { 'key-args': {'scenario': 'charlie.xml', '-p': '5060', '-i': '127.0.0.4', '-timeout': '20s', '-mi': '127.0.0.4'},
'ordered-args': ['-timeout_error', '-key', 'custom_media_port', '6004'] }
# Bob receives call from Alice and sends audio. Bob then attempts to blind transfer Alice to Charlie.
- - { 'key-args': {'scenario': 'bob.xml', '-p': '5060', '-i': '127.0.0.3', '-s': 'alice', '-timeout': '20s', '-min_rtp_port': '6004', '-max_rtp_port': '6008', '-mi': '127.0.0.3'},
+ - { 'key-args': {'scenario': 'bob.xml', '-p': '5060', '-i': '127.0.0.3', '-s': 'alice', '-timeout': '20s', '-mi': '127.0.0.3'},
'ordered-args': ['-timeout_error', '-key', 'custom_media_port', '6004'] }
# Alice calls Bob and sends audio.
- - { 'key-args': {'scenario': 'alice.xml', '-p': '5060', '-i': '127.0.0.2', '-s': 'bob_two', '-timeout': '20s', '-min_rtp_port': '6004', '-max_rtp_port': '6008', '-mi': '127.0.0.2'},
+ - { 'key-args': {'scenario': 'alice.xml', '-p': '5060', '-i': '127.0.0.2', '-s': 'bob_two', '-timeout': '20s', '-mi': '127.0.0.2'},
'ordered-args': ['-timeout_error', '-key', 'custom_media_port', '6004'] }
ami-config:
diff --git a/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold/test-config.yaml b/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold/test-config.yaml
index 4b77f4b..26765f5 100644
--- a/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold/test-config.yaml
+++ b/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold/test-config.yaml
@@ -41,25 +41,25 @@
-
scenarios:
# Charlie receives transfered call and sends audio to Bob.
- - { 'key-args': {'scenario': 'charlie.xml', '-p': '5060', '-i': '127.0.0.4', '-timeout': '20s', '-min_rtp_port': '6004', '-max_rtp_port': '6008', '-mi': '127.0.0.4'},
+ - { 'key-args': {'scenario': 'charlie.xml', '-p': '5060', '-i': '127.0.0.4', '-timeout': '20s', '-mi': '127.0.0.4'},
'ordered-args': ['-timeout_error', '-key', 'custom_media_port', '6004'] }
# Bob receives call from Alice and sends audio.
- - { 'key-args': {'scenario': 'bob.xml', '-p': '5060', '-i': '127.0.0.3', '-s': 'alice', '-timeout': '20s', '-min_rtp_port': '6004', '-max_rtp_port': '6008', '-mi': '127.0.0.3'},
+ - { 'key-args': {'scenario': 'bob.xml', '-p': '5060', '-i': '127.0.0.3', '-s': 'alice', '-timeout': '20s', '-mi': '127.0.0.3'},
'ordered-args': ['-timeout_error', '-key', 'custom_media_port', '6004'] }
# Alice calls Bob and sends audio. Alice then attempts to blind transfer Bob to Charlie.
- - { 'key-args': {'scenario': 'alice.xml', '-p': '5060', '-i': '127.0.0.2', '-s': 'bob', '-timeout': '20s', '-min_rtp_port': '6004', '-max_rtp_port': '6008', '-mi': '127.0.0.2'},
+ - { 'key-args': {'scenario': 'alice.xml', '-p': '5060', '-i': '127.0.0.2', '-s': 'bob', '-timeout': '20s', '-mi': '127.0.0.2'},
'ordered-args': ['-timeout_error', '-key', 'custom_media_port', '6004'] }
# Second iteration
-
scenarios:
# Charlie receives transfered call and sends audio to Bob.
- - { 'key-args': {'scenario': 'charlie.xml', '-p': '5060', '-i': '127.0.0.4', '-timeout': '20s', '-min_rtp_port': '6004', '-max_rtp_port': '6008', '-mi': '127.0.0.4'},
+ - { 'key-args': {'scenario': 'charlie.xml', '-p': '5060', '-i': '127.0.0.4', '-timeout': '20s', '-mi': '127.0.0.4'},
'ordered-args': ['-timeout_error', '-key', 'custom_media_port', '6004'] }
# Bob receives call from Alice and sends audio.
- - { 'key-args': {'scenario': 'bob.xml', '-p': '5060', '-i': '127.0.0.3', '-s': 'alice', '-timeout': '20s', '-min_rtp_port': '6004', '-max_rtp_port': '6008', '-mi': '127.0.0.3'},
+ - { 'key-args': {'scenario': 'bob.xml', '-p': '5060', '-i': '127.0.0.3', '-s': 'alice', '-timeout': '20s', '-mi': '127.0.0.3'},
'ordered-args': ['-timeout_error', '-key', 'custom_media_port', '6004'] }
# Alice calls Bob and sends audio. Alice then attempts to blind transfer Bob to Charlie.
- - { 'key-args': {'scenario': 'alice.xml', '-p': '5060', '-i': '127.0.0.2', '-s': 'bob_two', '-timeout': '20s', '-min_rtp_port': '6004', '-max_rtp_port': '6008', '-mi': '127.0.0.2'},
+ - { 'key-args': {'scenario': 'alice.xml', '-p': '5060', '-i': '127.0.0.2', '-s': 'bob_two', '-timeout': '20s', '-mi': '127.0.0.2'},
'ordered-args': ['-timeout_error', '-key', 'custom_media_port', '6004'] }
ami-config:
diff --git a/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/test-config.yaml b/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/test-config.yaml
index 23f44a7..4ac14c6 100644
--- a/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/test-config.yaml
+++ b/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/test-config.yaml
@@ -41,25 +41,25 @@
-
scenarios:
# Charlie receives transfered call and sends audio to Bob.
- - { 'key-args': {'scenario': 'charlie.xml', '-p': '5060', '-i': '127.0.0.4', '-timeout': '20s', '-min_rtp_port': '6004', '-max_rtp_port': '6008', '-mi': '127.0.0.4'},
+ - { 'key-args': {'scenario': 'charlie.xml', '-p': '5060', '-i': '127.0.0.4', '-timeout': '20s', '-mi': '127.0.0.4'},
'ordered-args': ['-timeout_error', '-key', 'custom_media_port', '6004'] }
# Bob receives call from Alice and sends audio.
- - { 'key-args': {'scenario': 'bob.xml', '-p': '5060', '-i': '127.0.0.3', '-s': 'alice', '-timeout': '20s', '-min_rtp_port': '6004', '-max_rtp_port': '6008', '-mi': '127.0.0.3'},
+ - { 'key-args': {'scenario': 'bob.xml', '-p': '5060', '-i': '127.0.0.3', '-s': 'alice', '-timeout': '20s', '-mi': '127.0.0.3'},
'ordered-args': ['-timeout_error', '-key', 'custom_media_port', '6004'] }
# Alice calls Bob and sends audio. Alice then attempts to blind transfer Bob to Charlie.
- - { 'key-args': {'scenario': 'alice.xml', '-p': '5060', '-i': '127.0.0.2', '-s': 'bob', '-timeout': '20s', '-min_rtp_port': '6004', '-max_rtp_port': '6008', '-mi': '127.0.0.2'},
+ - { 'key-args': {'scenario': 'alice.xml', '-p': '5060', '-i': '127.0.0.2', '-s': 'bob', '-timeout': '20s', '-mi': '127.0.0.2'},
'ordered-args': ['-timeout_error', '-key', 'custom_media_port', '6004'] }
# Second iteration
-
scenarios:
# Charlie receives transfered call and sends audio to Bob.
- - { 'key-args': {'scenario': 'charlie.xml', '-p': '5060', '-i': '127.0.0.4', '-timeout': '20s', '-min_rtp_port': '6004', '-max_rtp_port': '6008', '-mi': '127.0.0.4'},
+ - { 'key-args': {'scenario': 'charlie.xml', '-p': '5060', '-i': '127.0.0.4', '-timeout': '20s', '-mi': '127.0.0.4'},
'ordered-args': ['-timeout_error', '-key', 'custom_media_port', '6004'] }
# Bob receives call from Alice and sends audio.
- - { 'key-args': {'scenario': 'bob.xml', '-p': '5060', '-i': '127.0.0.3', '-s': 'alice', '-timeout': '20s', '-min_rtp_port': '6004', '-max_rtp_port': '6008', '-mi': '127.0.0.3'},
+ - { 'key-args': {'scenario': 'bob.xml', '-p': '5060', '-i': '127.0.0.3', '-s': 'alice', '-timeout': '20s', '-mi': '127.0.0.3'},
'ordered-args': ['-timeout_error', '-key', 'custom_media_port', '6004'] }
# Alice calls Bob and sends audio. Alice then attempts to blind transfer Bob to Charlie.
- - { 'key-args': {'scenario': 'alice.xml', '-p': '5060', '-i': '127.0.0.2', '-s': 'bob_two', '-timeout': '20s', '-min_rtp_port': '6004', '-max_rtp_port': '6008', '-mi': '127.0.0.2'},
+ - { 'key-args': {'scenario': 'alice.xml', '-p': '5060', '-i': '127.0.0.2', '-s': 'bob_two', '-timeout': '20s', '-mi': '127.0.0.2'},
'ordered-args': ['-timeout_error', '-key', 'custom_media_port', '6004'] }
ami-config:
--
To view, visit https://gerrit.asterisk.org/9645
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings
Gerrit-Project: testsuite
Gerrit-Branch: 15
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c3f82c7d6aec5fe3acaba1e5dd1d54edba3ba72
Gerrit-Change-Number: 9645
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180724/28fccdd9/attachment-0001.html>
More information about the asterisk-code-review
mailing list