[Asterisk-code-review] confbridge: Re-organize SFU tests and add Local channel variants. (testsuite[17])
Friendly Automation
asteriskteam at digium.com
Tue Jun 16 07:48:03 CDT 2020
Friendly Automation has submitted this change. ( https://gerrit.asterisk.org/c/testsuite/+/14528 )
Change subject: confbridge: Re-organize SFU tests and add Local channel variants.
......................................................................
confbridge: Re-organize SFU tests and add Local channel variants.
SFU specific ConfBridge tests have now been moved into an 'sfu'
directory to better organize them.
Test variants have also been added which place a Local channel
between the PJSIP channel and the ConfBridge conference bridge
testing stream and re-negotiation support in the Local channel.
ASTERISK-28938
Change-Id: I717107de2caa5a7faa4fbefdd044f778f136f8fc
---
R tests/apps/confbridge/sfu/add_remove_sources/configs/ast1/extensions.conf
R tests/apps/confbridge/sfu/add_remove_sources/configs/ast1/pjsip.conf
R tests/apps/confbridge/sfu/add_remove_sources/sipp/video_caller_first.xml
R tests/apps/confbridge/sfu/add_remove_sources/sipp/video_caller_second.xml
R tests/apps/confbridge/sfu/add_remove_sources/test-config.yaml
A tests/apps/confbridge/sfu/local_add_remove_sources/configs/ast1/extensions.conf
C tests/apps/confbridge/sfu/local_add_remove_sources/configs/ast1/pjsip.conf
C tests/apps/confbridge/sfu/local_add_remove_sources/sipp/video_caller_first.xml
C tests/apps/confbridge/sfu/local_add_remove_sources/sipp/video_caller_second.xml
A tests/apps/confbridge/sfu/local_add_remove_sources/test-config.yaml
A tests/apps/confbridge/sfu/local_no_video_source/configs/ast1/extensions.conf
C tests/apps/confbridge/sfu/local_no_video_source/configs/ast1/pjsip.conf
R tests/apps/confbridge/sfu/local_no_video_source/sipp/video_caller_first.xml
R tests/apps/confbridge/sfu/local_no_video_source/sipp/video_caller_second.xml
A tests/apps/confbridge/sfu/local_no_video_source/test-config.yaml
A tests/apps/confbridge/sfu/local_nominal/configs/ast1/extensions.conf
C tests/apps/confbridge/sfu/local_nominal/configs/ast1/pjsip.conf
R tests/apps/confbridge/sfu/local_nominal/sipp/video_caller_first.xml
R tests/apps/confbridge/sfu/local_nominal/sipp/video_caller_second.xml
A tests/apps/confbridge/sfu/local_nominal/test-config.yaml
R tests/apps/confbridge/sfu/no_video_source/configs/ast1/extensions.conf
R tests/apps/confbridge/sfu/no_video_source/configs/ast1/pjsip.conf
C tests/apps/confbridge/sfu/no_video_source/sipp/video_caller_first.xml
C tests/apps/confbridge/sfu/no_video_source/sipp/video_caller_second.xml
R tests/apps/confbridge/sfu/no_video_source/test-config.yaml
R tests/apps/confbridge/sfu/nominal/configs/ast1/extensions.conf
R tests/apps/confbridge/sfu/nominal/configs/ast1/pjsip.conf
C tests/apps/confbridge/sfu/nominal/sipp/video_caller_first.xml
C tests/apps/confbridge/sfu/nominal/sipp/video_caller_second.xml
R tests/apps/confbridge/sfu/nominal/test-config.yaml
A tests/apps/confbridge/sfu/tests.yaml
M tests/apps/confbridge/tests.yaml
32 files changed, 136 insertions(+), 75 deletions(-)
Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Friendly Automation: Approved for Submit
diff --git a/tests/apps/confbridge/sfu_add_remove_sources/configs/ast1/extensions.conf b/tests/apps/confbridge/sfu/add_remove_sources/configs/ast1/extensions.conf
similarity index 100%
rename from tests/apps/confbridge/sfu_add_remove_sources/configs/ast1/extensions.conf
rename to tests/apps/confbridge/sfu/add_remove_sources/configs/ast1/extensions.conf
diff --git a/tests/apps/confbridge/sfu_add_remove_sources/configs/ast1/pjsip.conf b/tests/apps/confbridge/sfu/add_remove_sources/configs/ast1/pjsip.conf
similarity index 100%
rename from tests/apps/confbridge/sfu_add_remove_sources/configs/ast1/pjsip.conf
rename to tests/apps/confbridge/sfu/add_remove_sources/configs/ast1/pjsip.conf
diff --git a/tests/apps/confbridge/sfu_add_remove_sources/sipp/video_caller_first.xml b/tests/apps/confbridge/sfu/add_remove_sources/sipp/video_caller_first.xml
similarity index 95%
rename from tests/apps/confbridge/sfu_add_remove_sources/sipp/video_caller_first.xml
rename to tests/apps/confbridge/sfu/add_remove_sources/sipp/video_caller_first.xml
index 857d79f..99d8802 100644
--- a/tests/apps/confbridge/sfu_add_remove_sources/sipp/video_caller_first.xml
+++ b/tests/apps/confbridge/sfu/add_remove_sources/sipp/video_caller_first.xml
@@ -263,11 +263,5 @@
<recv response="200">
</recv>
- <!-- definition of the response time repartition table (unit is ms) -->
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <!-- definition of the call length repartition table (unit is ms) -->
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
</scenario>
diff --git a/tests/apps/confbridge/sfu_add_remove_sources/sipp/video_caller_second.xml b/tests/apps/confbridge/sfu/add_remove_sources/sipp/video_caller_second.xml
similarity index 95%
rename from tests/apps/confbridge/sfu_add_remove_sources/sipp/video_caller_second.xml
rename to tests/apps/confbridge/sfu/add_remove_sources/sipp/video_caller_second.xml
index 0e71557..802c5de 100644
--- a/tests/apps/confbridge/sfu_add_remove_sources/sipp/video_caller_second.xml
+++ b/tests/apps/confbridge/sfu/add_remove_sources/sipp/video_caller_second.xml
@@ -236,11 +236,5 @@
<recv response="200">
</recv>
- <!-- definition of the response time repartition table (unit is ms) -->
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <!-- definition of the call length repartition table (unit is ms) -->
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
</scenario>
diff --git a/tests/apps/confbridge/sfu_add_remove_sources/test-config.yaml b/tests/apps/confbridge/sfu/add_remove_sources/test-config.yaml
similarity index 100%
rename from tests/apps/confbridge/sfu_add_remove_sources/test-config.yaml
rename to tests/apps/confbridge/sfu/add_remove_sources/test-config.yaml
diff --git a/tests/apps/confbridge/sfu/local_add_remove_sources/configs/ast1/extensions.conf b/tests/apps/confbridge/sfu/local_add_remove_sources/configs/ast1/extensions.conf
new file mode 100644
index 0000000..a6c98b0
--- /dev/null
+++ b/tests/apps/confbridge/sfu/local_add_remove_sources/configs/ast1/extensions.conf
@@ -0,0 +1,8 @@
+[default]
+exten => conference,1,Dial(Local/conference at conference)
+
+[conference]
+exten => conference,1,Answer()
+same => n,Set(CONFBRIDGE(bridge,video_mode)=sfu)
+same => n,ConfBridge(conference)
+same => n,Hangup()
diff --git a/tests/apps/confbridge/sfu_add_remove_sources/configs/ast1/pjsip.conf b/tests/apps/confbridge/sfu/local_add_remove_sources/configs/ast1/pjsip.conf
similarity index 100%
copy from tests/apps/confbridge/sfu_add_remove_sources/configs/ast1/pjsip.conf
copy to tests/apps/confbridge/sfu/local_add_remove_sources/configs/ast1/pjsip.conf
diff --git a/tests/apps/confbridge/sfu_add_remove_sources/sipp/video_caller_first.xml b/tests/apps/confbridge/sfu/local_add_remove_sources/sipp/video_caller_first.xml
similarity index 95%
copy from tests/apps/confbridge/sfu_add_remove_sources/sipp/video_caller_first.xml
copy to tests/apps/confbridge/sfu/local_add_remove_sources/sipp/video_caller_first.xml
index 857d79f..99d8802 100644
--- a/tests/apps/confbridge/sfu_add_remove_sources/sipp/video_caller_first.xml
+++ b/tests/apps/confbridge/sfu/local_add_remove_sources/sipp/video_caller_first.xml
@@ -263,11 +263,5 @@
<recv response="200">
</recv>
- <!-- definition of the response time repartition table (unit is ms) -->
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <!-- definition of the call length repartition table (unit is ms) -->
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
</scenario>
diff --git a/tests/apps/confbridge/sfu_add_remove_sources/sipp/video_caller_second.xml b/tests/apps/confbridge/sfu/local_add_remove_sources/sipp/video_caller_second.xml
similarity index 95%
copy from tests/apps/confbridge/sfu_add_remove_sources/sipp/video_caller_second.xml
copy to tests/apps/confbridge/sfu/local_add_remove_sources/sipp/video_caller_second.xml
index 0e71557..802c5de 100644
--- a/tests/apps/confbridge/sfu_add_remove_sources/sipp/video_caller_second.xml
+++ b/tests/apps/confbridge/sfu/local_add_remove_sources/sipp/video_caller_second.xml
@@ -236,11 +236,5 @@
<recv response="200">
</recv>
- <!-- definition of the response time repartition table (unit is ms) -->
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <!-- definition of the call length repartition table (unit is ms) -->
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
</scenario>
diff --git a/tests/apps/confbridge/sfu/local_add_remove_sources/test-config.yaml b/tests/apps/confbridge/sfu/local_add_remove_sources/test-config.yaml
new file mode 100644
index 0000000..2a54024
--- /dev/null
+++ b/tests/apps/confbridge/sfu/local_add_remove_sources/test-config.yaml
@@ -0,0 +1,36 @@
+testinfo:
+ summary: 'Ensure that ConfBridge and PJSIP in SFU reinvite appropriately when channels add/remove sources'
+ description: |
+ 'Two SIPp scenarios call into Asterisk which drops them both into a ConfBridge conference bridge. A Local
+ channel is used in between each channel and the conference bridge. The bridge is configured with SFU video
+ support and the calls include video streams. Upon entering each side is reinvited with an additional
+ video stream of the other participant. Once this is done the second participant adds an additional
+ video source. A reinvite is then sent to the first participant adding an additional video stream for
+ this new source. The second participant then removes the new video source and a reinvite is sent to the
+ first participant removing the just added video stream. The second participant leaves and another
+ reinvite is sent to the first participant removing the video stream for the other participant that
+ just left. The first participant then hangs up and the test ends.'
+
+test-modules:
+ test-object:
+ config-section: test-object-config
+ typename: 'sipp.SIPpTestCase'
+
+test-object-config:
+ memcheck-delay-stop: 7
+ fail-on-any: False
+ test-iterations:
+ -
+ scenarios:
+ # IPv4 & UDP
+ - { 'key-args': {'scenario': 'video_caller_first.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'video-caller-first'} }
+ - { 'key-args': {'scenario': 'video_caller_second.xml', '-i': '127.0.0.1', '-p': '5062', '-d': '5000', '-s': 'video-caller-second'} }
+
+properties:
+ dependencies:
+ - sipp :
+ version : 'v3.0'
+ - asterisk : 'app_confbridge'
+ - asterisk : 'res_pjsip'
+ tags:
+ - pjsip
diff --git a/tests/apps/confbridge/sfu/local_no_video_source/configs/ast1/extensions.conf b/tests/apps/confbridge/sfu/local_no_video_source/configs/ast1/extensions.conf
new file mode 100644
index 0000000..a6c98b0
--- /dev/null
+++ b/tests/apps/confbridge/sfu/local_no_video_source/configs/ast1/extensions.conf
@@ -0,0 +1,8 @@
+[default]
+exten => conference,1,Dial(Local/conference at conference)
+
+[conference]
+exten => conference,1,Answer()
+same => n,Set(CONFBRIDGE(bridge,video_mode)=sfu)
+same => n,ConfBridge(conference)
+same => n,Hangup()
diff --git a/tests/apps/confbridge/sfu_no_video_source/configs/ast1/pjsip.conf b/tests/apps/confbridge/sfu/local_no_video_source/configs/ast1/pjsip.conf
similarity index 100%
copy from tests/apps/confbridge/sfu_no_video_source/configs/ast1/pjsip.conf
copy to tests/apps/confbridge/sfu/local_no_video_source/configs/ast1/pjsip.conf
diff --git a/tests/apps/confbridge/sfu_no_video_source/sipp/video_caller_first.xml b/tests/apps/confbridge/sfu/local_no_video_source/sipp/video_caller_first.xml
similarity index 92%
rename from tests/apps/confbridge/sfu_no_video_source/sipp/video_caller_first.xml
rename to tests/apps/confbridge/sfu/local_no_video_source/sipp/video_caller_first.xml
index 752133f..67f3163 100644
--- a/tests/apps/confbridge/sfu_no_video_source/sipp/video_caller_first.xml
+++ b/tests/apps/confbridge/sfu/local_no_video_source/sipp/video_caller_first.xml
@@ -150,11 +150,5 @@
<recv response="200">
</recv>
- <!-- definition of the response time repartition table (unit is ms) -->
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <!-- definition of the call length repartition table (unit is ms) -->
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
</scenario>
diff --git a/tests/apps/confbridge/sfu_no_video_source/sipp/video_caller_second.xml b/tests/apps/confbridge/sfu/local_no_video_source/sipp/video_caller_second.xml
similarity index 87%
rename from tests/apps/confbridge/sfu_no_video_source/sipp/video_caller_second.xml
rename to tests/apps/confbridge/sfu/local_no_video_source/sipp/video_caller_second.xml
index a15d56b..de47027 100644
--- a/tests/apps/confbridge/sfu_no_video_source/sipp/video_caller_second.xml
+++ b/tests/apps/confbridge/sfu/local_no_video_source/sipp/video_caller_second.xml
@@ -77,11 +77,5 @@
<recv response="200">
</recv>
- <!-- definition of the response time repartition table (unit is ms) -->
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <!-- definition of the call length repartition table (unit is ms) -->
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
</scenario>
diff --git a/tests/apps/confbridge/sfu/local_no_video_source/test-config.yaml b/tests/apps/confbridge/sfu/local_no_video_source/test-config.yaml
new file mode 100644
index 0000000..5262b8b
--- /dev/null
+++ b/tests/apps/confbridge/sfu/local_no_video_source/test-config.yaml
@@ -0,0 +1,34 @@
+testinfo:
+ summary: 'Ensure that ConfBridge and PJSIP in SFU reinvite with video even if participant only provides audio'
+ description: |
+ 'Two SIPp scenarios call into Asterisk which drops them both into a ConfBridge conference bridge. A Local
+ channel is placed in between the channel and the conference btidge. The bridge is configured with SFU
+ video support. The first participant has only audio while the second participant has both audio and
+ video. On join the first participant is reinvited to add video of the second participant while the
+ second participant is not reinvited at all. The second participant then hangs up causing the first
+ participant to be reinvited and the video stream removed. The first participant then hangs up and
+ the test ends.'
+
+test-modules:
+ test-object:
+ config-section: test-object-config
+ typename: 'sipp.SIPpTestCase'
+
+test-object-config:
+ memcheck-delay-stop: 7
+ fail-on-any: False
+ test-iterations:
+ -
+ scenarios:
+ # IPv4 & UDP
+ - { 'key-args': {'scenario': 'video_caller_first.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'video-caller'} }
+ - { 'key-args': {'scenario': 'video_caller_second.xml', '-i': '127.0.0.1', '-p': '5062', '-d': '5000', '-s': 'video-caller'} }
+
+properties:
+ dependencies:
+ - sipp :
+ version : 'v3.0'
+ - asterisk : 'app_confbridge'
+ - asterisk : 'res_pjsip'
+ tags:
+ - pjsip
diff --git a/tests/apps/confbridge/sfu/local_nominal/configs/ast1/extensions.conf b/tests/apps/confbridge/sfu/local_nominal/configs/ast1/extensions.conf
new file mode 100644
index 0000000..a6c98b0
--- /dev/null
+++ b/tests/apps/confbridge/sfu/local_nominal/configs/ast1/extensions.conf
@@ -0,0 +1,8 @@
+[default]
+exten => conference,1,Dial(Local/conference at conference)
+
+[conference]
+exten => conference,1,Answer()
+same => n,Set(CONFBRIDGE(bridge,video_mode)=sfu)
+same => n,ConfBridge(conference)
+same => n,Hangup()
diff --git a/tests/apps/confbridge/sfu_nominal/configs/ast1/pjsip.conf b/tests/apps/confbridge/sfu/local_nominal/configs/ast1/pjsip.conf
similarity index 100%
copy from tests/apps/confbridge/sfu_nominal/configs/ast1/pjsip.conf
copy to tests/apps/confbridge/sfu/local_nominal/configs/ast1/pjsip.conf
diff --git a/tests/apps/confbridge/sfu_nominal/sipp/video_caller_first.xml b/tests/apps/confbridge/sfu/local_nominal/sipp/video_caller_first.xml
similarity index 93%
rename from tests/apps/confbridge/sfu_nominal/sipp/video_caller_first.xml
rename to tests/apps/confbridge/sfu/local_nominal/sipp/video_caller_first.xml
index 47a9141..f7aaadd 100644
--- a/tests/apps/confbridge/sfu_nominal/sipp/video_caller_first.xml
+++ b/tests/apps/confbridge/sfu/local_nominal/sipp/video_caller_first.xml
@@ -162,11 +162,5 @@
<recv response="200">
</recv>
- <!-- definition of the response time repartition table (unit is ms) -->
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <!-- definition of the call length repartition table (unit is ms) -->
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
</scenario>
diff --git a/tests/apps/confbridge/sfu_nominal/sipp/video_caller_second.xml b/tests/apps/confbridge/sfu/local_nominal/sipp/video_caller_second.xml
similarity index 91%
rename from tests/apps/confbridge/sfu_nominal/sipp/video_caller_second.xml
rename to tests/apps/confbridge/sfu/local_nominal/sipp/video_caller_second.xml
index a29e418..24954c8 100644
--- a/tests/apps/confbridge/sfu_nominal/sipp/video_caller_second.xml
+++ b/tests/apps/confbridge/sfu/local_nominal/sipp/video_caller_second.xml
@@ -119,11 +119,5 @@
<recv response="200">
</recv>
- <!-- definition of the response time repartition table (unit is ms) -->
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <!-- definition of the call length repartition table (unit is ms) -->
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
</scenario>
diff --git a/tests/apps/confbridge/sfu/local_nominal/test-config.yaml b/tests/apps/confbridge/sfu/local_nominal/test-config.yaml
new file mode 100644
index 0000000..2e8dc76
--- /dev/null
+++ b/tests/apps/confbridge/sfu/local_nominal/test-config.yaml
@@ -0,0 +1,33 @@
+testinfo:
+ summary: 'Ensure that ConfBridge and PJSIP in SFU reinvite appropriately when channels join/leave'
+ description: |
+ 'Two SIPp scenarios call into Asterisk which drops them both into a ConfBridge conference bridge. A
+ Local channel is placed in between each channel and the conference bridge. The bridge is configured
+ with SFU video support and the calls include video streams. Upon entering each side is reinvited with
+ an additional video stream of the other participant. Once this is done the second participant leaves
+ and another reinvite is sent to the first participant removing the video stream for the other participant
+ that just left. The first participant then hangs up and the test ends.'
+
+test-modules:
+ test-object:
+ config-section: test-object-config
+ typename: 'sipp.SIPpTestCase'
+
+test-object-config:
+ memcheck-delay-stop: 7
+ fail-on-any: False
+ test-iterations:
+ -
+ scenarios:
+ # IPv4 & UDP
+ - { 'key-args': {'scenario': 'video_caller_first.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'video-caller'} }
+ - { 'key-args': {'scenario': 'video_caller_second.xml', '-i': '127.0.0.1', '-p': '5062', '-d': '5000', '-s': 'video-caller'} }
+
+properties:
+ dependencies:
+ - sipp :
+ version : 'v3.0'
+ - asterisk : 'app_confbridge'
+ - asterisk : 'res_pjsip'
+ tags:
+ - pjsip
diff --git a/tests/apps/confbridge/sfu_no_video_source/configs/ast1/extensions.conf b/tests/apps/confbridge/sfu/no_video_source/configs/ast1/extensions.conf
similarity index 100%
rename from tests/apps/confbridge/sfu_no_video_source/configs/ast1/extensions.conf
rename to tests/apps/confbridge/sfu/no_video_source/configs/ast1/extensions.conf
diff --git a/tests/apps/confbridge/sfu_no_video_source/configs/ast1/pjsip.conf b/tests/apps/confbridge/sfu/no_video_source/configs/ast1/pjsip.conf
similarity index 100%
rename from tests/apps/confbridge/sfu_no_video_source/configs/ast1/pjsip.conf
rename to tests/apps/confbridge/sfu/no_video_source/configs/ast1/pjsip.conf
diff --git a/tests/apps/confbridge/sfu_no_video_source/sipp/video_caller_first.xml b/tests/apps/confbridge/sfu/no_video_source/sipp/video_caller_first.xml
similarity index 92%
copy from tests/apps/confbridge/sfu_no_video_source/sipp/video_caller_first.xml
copy to tests/apps/confbridge/sfu/no_video_source/sipp/video_caller_first.xml
index 752133f..67f3163 100644
--- a/tests/apps/confbridge/sfu_no_video_source/sipp/video_caller_first.xml
+++ b/tests/apps/confbridge/sfu/no_video_source/sipp/video_caller_first.xml
@@ -150,11 +150,5 @@
<recv response="200">
</recv>
- <!-- definition of the response time repartition table (unit is ms) -->
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <!-- definition of the call length repartition table (unit is ms) -->
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
</scenario>
diff --git a/tests/apps/confbridge/sfu_no_video_source/sipp/video_caller_second.xml b/tests/apps/confbridge/sfu/no_video_source/sipp/video_caller_second.xml
similarity index 87%
copy from tests/apps/confbridge/sfu_no_video_source/sipp/video_caller_second.xml
copy to tests/apps/confbridge/sfu/no_video_source/sipp/video_caller_second.xml
index a15d56b..de47027 100644
--- a/tests/apps/confbridge/sfu_no_video_source/sipp/video_caller_second.xml
+++ b/tests/apps/confbridge/sfu/no_video_source/sipp/video_caller_second.xml
@@ -77,11 +77,5 @@
<recv response="200">
</recv>
- <!-- definition of the response time repartition table (unit is ms) -->
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <!-- definition of the call length repartition table (unit is ms) -->
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
</scenario>
diff --git a/tests/apps/confbridge/sfu_no_video_source/test-config.yaml b/tests/apps/confbridge/sfu/no_video_source/test-config.yaml
similarity index 100%
rename from tests/apps/confbridge/sfu_no_video_source/test-config.yaml
rename to tests/apps/confbridge/sfu/no_video_source/test-config.yaml
diff --git a/tests/apps/confbridge/sfu_nominal/configs/ast1/extensions.conf b/tests/apps/confbridge/sfu/nominal/configs/ast1/extensions.conf
similarity index 100%
rename from tests/apps/confbridge/sfu_nominal/configs/ast1/extensions.conf
rename to tests/apps/confbridge/sfu/nominal/configs/ast1/extensions.conf
diff --git a/tests/apps/confbridge/sfu_nominal/configs/ast1/pjsip.conf b/tests/apps/confbridge/sfu/nominal/configs/ast1/pjsip.conf
similarity index 100%
rename from tests/apps/confbridge/sfu_nominal/configs/ast1/pjsip.conf
rename to tests/apps/confbridge/sfu/nominal/configs/ast1/pjsip.conf
diff --git a/tests/apps/confbridge/sfu_nominal/sipp/video_caller_first.xml b/tests/apps/confbridge/sfu/nominal/sipp/video_caller_first.xml
similarity index 93%
copy from tests/apps/confbridge/sfu_nominal/sipp/video_caller_first.xml
copy to tests/apps/confbridge/sfu/nominal/sipp/video_caller_first.xml
index 47a9141..f7aaadd 100644
--- a/tests/apps/confbridge/sfu_nominal/sipp/video_caller_first.xml
+++ b/tests/apps/confbridge/sfu/nominal/sipp/video_caller_first.xml
@@ -162,11 +162,5 @@
<recv response="200">
</recv>
- <!-- definition of the response time repartition table (unit is ms) -->
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <!-- definition of the call length repartition table (unit is ms) -->
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
</scenario>
diff --git a/tests/apps/confbridge/sfu_nominal/sipp/video_caller_second.xml b/tests/apps/confbridge/sfu/nominal/sipp/video_caller_second.xml
similarity index 91%
copy from tests/apps/confbridge/sfu_nominal/sipp/video_caller_second.xml
copy to tests/apps/confbridge/sfu/nominal/sipp/video_caller_second.xml
index a29e418..24954c8 100644
--- a/tests/apps/confbridge/sfu_nominal/sipp/video_caller_second.xml
+++ b/tests/apps/confbridge/sfu/nominal/sipp/video_caller_second.xml
@@ -119,11 +119,5 @@
<recv response="200">
</recv>
- <!-- definition of the response time repartition table (unit is ms) -->
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <!-- definition of the call length repartition table (unit is ms) -->
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
</scenario>
diff --git a/tests/apps/confbridge/sfu_nominal/test-config.yaml b/tests/apps/confbridge/sfu/nominal/test-config.yaml
similarity index 100%
rename from tests/apps/confbridge/sfu_nominal/test-config.yaml
rename to tests/apps/confbridge/sfu/nominal/test-config.yaml
diff --git a/tests/apps/confbridge/sfu/tests.yaml b/tests/apps/confbridge/sfu/tests.yaml
new file mode 100644
index 0000000..2e63c8f
--- /dev/null
+++ b/tests/apps/confbridge/sfu/tests.yaml
@@ -0,0 +1,8 @@
+# Enter tests here in the order they should be considered for execution:
+tests:
+ - test: 'nominal'
+ - test: 'local_nominal'
+ - test: 'add_remove_sources'
+ - test: 'local_add_remove_sources'
+ - test: 'no_video_source'
+ - test: 'local_no_video_source'
diff --git a/tests/apps/confbridge/tests.yaml b/tests/apps/confbridge/tests.yaml
index bf8ef1f..ccf2505 100644
--- a/tests/apps/confbridge/tests.yaml
+++ b/tests/apps/confbridge/tests.yaml
@@ -18,6 +18,4 @@
- test: 'confbridge_waitmarked_single'
- test: 'muted_conference_start_muted'
- test: 'regcontext'
- - test: 'sfu_nominal'
- - test: 'sfu_add_remove_sources'
- - test: 'sfu_no_video_source'
+ - dir: 'sfu'
--
To view, visit https://gerrit.asterisk.org/c/testsuite/+/14528
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings
Gerrit-Project: testsuite
Gerrit-Branch: 17
Gerrit-Change-Id: I717107de2caa5a7faa4fbefdd044f778f136f8fc
Gerrit-Change-Number: 14528
Gerrit-PatchSet: 1
Gerrit-Owner: Joshua Colp <jcolp at sangoma.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20200616/4d74d851/attachment-0001.html>
More information about the asterisk-code-review
mailing list