Skip to content

Commit c21efb5

Browse files
dariusstefandariusstefan
committed
sipssert tests: use task_templates
1 parent 3a716d2 commit c21efb5

27 files changed

Lines changed: 352 additions & 898 deletions

File tree

‎tests/01.register_disabled/scenario.yml‎

Lines changed: 8 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,58 +2,30 @@
22
timeout: 30
33

44
init_tasks:
5-
- name: Disable ACL caller
6-
type: mysql-client
7-
script: scripts/disable_user.sh
8-
args: {{ caller }} {{ default_domain }}
9-
10-
- name: Disable ACL callee
11-
type: mysql-client
12-
script: scripts/disable_user.sh
13-
args: {{ callee }} {{ default_domain }}
5+
- use: disable_caller
6+
- use: disable_callee
147

158
tasks:
169
- name: Register caller
17-
type: uac-sipp
18-
username: {{ caller }}
19-
password: "{{ caller_password }}"
20-
config_file: scripts/sipp-register.xml
21-
ip: {{ caller_ip }}
22-
port: {{ caller_port }}
10+
use: register_caller
2311

2412
- name: Register callee
25-
type: uac-sipp
26-
username: {{ callee }}
27-
password: "{{ callee_password }}"
28-
config_file: scripts/sipp-register.xml
29-
ip: {{ callee_ip }}
30-
port: {{ callee_port }}
13+
use: register_callee
3114

3215
- name: MI check Not Registered caller
33-
type: opensips-mi
34-
script: scripts/check-register.py
35-
args: {{ caller }}
16+
use: check_caller_register
3617
require:
3718
after:
3819
task: Register caller
3920
wait: 1
4021

4122
- name: MI check Not Registered callee
42-
type: opensips-mi
43-
script: scripts/check-register.py
44-
args: {{ callee }}
23+
use: check_callee_register
4524
require:
4625
after:
4726
task: Register callee
4827
wait: 1
4928

5029
cleanup_tasks:
51-
- name: Enable ACL caller
52-
type: mysql-client
53-
script: scripts/enable_user.sh
54-
args: {{ caller }} {{ default_domain }}
55-
56-
- name: Enable ACL callee
57-
type: mysql-client
58-
script: scripts/enable_user.sh
59-
args: {{ callee }} {{ default_domain }}
30+
- use: enable_caller
31+
- use: enable_callee

‎tests/01.register_enabled/scenario.yml‎

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,25 @@ timeout: 30
33

44
tasks:
55
- name: Register caller
6-
type: uac-sipp
7-
username: {{ caller }}
8-
password: "{{ caller_password }}"
9-
config_file: scripts/sipp-register.xml
10-
ip: {{ caller_ip }}
11-
port: {{ caller_port }}
6+
use: register_caller
127

138
- name: Register callee
14-
type: uac-sipp
15-
username: {{ callee }}
16-
password: "{{ callee_password }}"
17-
config_file: scripts/sipp-register.xml
18-
ip: {{ callee_ip }}
19-
port: {{ callee_port }}
9+
use: register_callee
2010

2111
- name: MI check Register caller
22-
type: opensips-mi
23-
script: scripts/check-register.py
24-
args: {{ caller }}
12+
use: check_caller_register
2513
require:
2614
after:
2715
task: Register caller
2816
wait: 1
2917

3018
- name: MI check Register callee
31-
type: opensips-mi
32-
script: scripts/check-register.py
33-
args: {{ callee }}
19+
use: check_callee_register
3420
require:
3521
after:
3622
task: Register callee
3723
wait: 1
3824

3925
cleanup_tasks:
40-
- name: Delete caller AOR
41-
type: opensips-mi
42-
args: ul_rm location {{ caller }}@{{ default_domain }}
43-
44-
- name: Delete callee AOR
45-
type: opensips-mi
46-
args: ul_rm location {{ callee }}@{{ default_domain }}
26+
- use: delete_caller_aor
27+
- use: delete_callee_aor

‎tests/02.call/scenario.yml‎

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,25 @@ timeout: 40
33

44
tasks:
55
- name: Register caller
6-
type: uac-sipp
7-
username: {{ caller }}
8-
password: "{{ caller_password }}"
9-
config_file: scripts/sipp-register.xml
10-
ip: {{ caller_ip }}
11-
port: {{ caller_port }}
6+
use: register_caller
127

138
- name: Register callee
14-
type: uac-sipp
15-
username: {{ callee }}
16-
password: "{{ callee_password }}"
17-
config_file: scripts/sipp-register.xml
18-
ip: {{ callee_ip }}
19-
port: {{ callee_port }}
9+
use: register_callee
2010

2111
- name: Caller UAC
22-
type: uac-sipp
23-
username: {{ caller }}
24-
password: "{{ caller_password }}"
25-
config_file: scripts/caller.xml
26-
ip: {{ caller_ip }}
27-
port: {{ caller_port }}
12+
use: caller_uac
2813
require:
2914
- after:
3015
task: Register caller
3116

32-
- name: Callee UAC
33-
type: uas-sipp
34-
username: {{ callee }}
35-
password: "{{ callee_password }}"
36-
config_file: scripts/callee.xml
37-
ip: {{ callee_ip }}
38-
port: {{ callee_port }}
17+
- name: Callee UAS
18+
use: callee_uas
3919
require:
4020
- after:
4121
task: Register callee
4222
- started:
4323
task: Caller UAC
4424

4525
cleanup_tasks:
46-
- name: Delete caller AOR
47-
type: opensips-mi
48-
args: ul_rm location {{ caller }}@{{ default_domain }}
49-
50-
- name: Delete callee AOR
51-
type: opensips-mi
52-
args: ul_rm location {{ callee }}@{{ default_domain }}
26+
- use: delete_caller_aor
27+
- use: delete_callee_aor

‎tests/02.call_disabled_callee/scenario.yml‎

Lines changed: 10 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,80 +3,47 @@ timeout: 120
33

44
tasks:
55
- name: Register caller
6-
type: uac-sipp
7-
username: {{ caller }}
8-
password: "{{ caller_password }}"
9-
config_file: scripts/sipp-register.xml
10-
ip: {{ caller_ip }}
11-
port: {{ caller_port }}
6+
use: register_caller
127

138
- name: Register callee
14-
type: uac-sipp
15-
username: {{ callee }}
16-
password: "{{ callee_password }}"
17-
config_file: scripts/sipp-register.xml
18-
ip: {{ callee_ip }}
19-
port: {{ callee_port }}
9+
use: register_callee
2010

2111
- name: Disable ACL callee
22-
type: mysql-client
23-
script: scripts/disable_user.sh
24-
args: {{ callee }} {{ default_domain }}
12+
use: disable_callee
2513
require:
2614
after:
2715
task: Register callee
2816
wait: 1
2917

3018
- name: Caller UAC
31-
type: uac-sipp
32-
username: {{ caller }}
33-
password: "{{ caller_password }}"
34-
config_file: scripts/caller.xml
35-
ip: {{ caller_ip }}
36-
port: {{ caller_port }}
19+
use: caller_uac
3720
require:
3821
- after:
3922
task: Disable ACL callee
4023

41-
- name: Callee UAC
42-
type: uas-sipp
43-
username: {{ callee }}
44-
password: "{{ callee_password }}"
45-
config_file: scripts/callee.xml
46-
ip: {{ callee_ip }}
47-
port: {{ callee_port }}
24+
- name: Callee UAS
25+
use: callee_uas
4826
require:
4927
- after:
5028
task: Disable ACL callee
5129
- started:
5230
task: Caller UAC
5331

5432
- name: Fail caller UAC
55-
type: uac-sipp
56-
username: {{ caller }}
57-
password: "{{ caller_password }}"
33+
use: caller_uac
5834
config_file: scripts/caller-fail.xml
59-
ip: {{ caller_ip }}
60-
port: {{ caller_port }}
6135
require:
6236
- after:
6337
task: Register callee
6438
wait: 70
6539

6640
- name: Enable ACL callee
67-
type: mysql-client
68-
script: scripts/enable_user.sh
69-
args: {{ callee }} {{ default_domain }}
41+
use: enable_callee
7042
require:
7143
after:
7244
task: Fail caller UAC
7345
wait: 1
7446

7547
cleanup_tasks:
76-
- name: Delete caller AOR
77-
type: opensips-mi
78-
args: ul_rm location {{ caller }}@{{ default_domain }}
79-
80-
- name: Delete callee AOR
81-
type: opensips-mi
82-
args: ul_rm location {{ callee }}@{{ default_domain }}
48+
- use: delete_caller_aor
49+
- use: delete_callee_aor

‎tests/02.call_disabled_caller/scenario.yml‎

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,28 @@ timeout: 40
33

44
tasks:
55
- name: Register caller
6-
type: uac-sipp
7-
username: {{ caller }}
8-
password: "{{ caller_password }}"
9-
config_file: scripts/sipp-register.xml
10-
ip: {{ caller_ip }}
11-
port: {{ caller_port }}
6+
use: register_caller
127

138
- name: Disable ACL caller
14-
type: mysql-client
15-
script: scripts/disable_user.sh
16-
args: {{ caller }} {{ default_domain }}
9+
use: disable_caller
1710
require:
1811
after:
1912
task: Register caller
2013
wait: 1
2114

2215
- name: Caller UAC
23-
type: uac-sipp
24-
username: {{ caller }}
25-
password: "{{ caller_password }}"
26-
config_file: scripts/caller.xml
27-
ip: {{ caller_ip }}
28-
port: {{ caller_port }}
16+
use: caller_uac
2917
require:
3018
- after:
3119
task: Disable ACL caller
3220
wait: 1
3321

3422
- name: Enable ACL caller
35-
type: mysql-client
36-
script: scripts/enable_user.sh
37-
args: {{ caller }} {{ default_domain }}
23+
use: enable_caller
3824
require:
3925
after:
4026
task: Caller UAC
4127
wait: 1
4228

4329
cleanup_tasks:
44-
- name: Delete caller AOR
45-
type: opensips-mi
46-
args: ul_rm location {{ caller }}@{{ default_domain }}
30+
- use: delete_caller_aor

‎tests/03.call_unregistered_callee/scenario.yml‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,18 @@ timeout: 40
33

44
tasks:
55
- name: Register caller
6-
type: uac-sipp
7-
username: {{ caller }}
8-
password: "{{ caller_password }}"
9-
config_file: scripts/sipp-register.xml
10-
ip: {{ caller_ip }}
11-
port: {{ caller_port }}
6+
use: register_caller
127

138
- name: Check callee not registered
149
type: opensips-mi
1510
script: scripts/check-register.py
1611
args: {{ callee }}
1712

1813
- name: Caller UAC
19-
type: uac-sipp
20-
username: {{ caller }}
21-
password: "{{ caller_password }}"
22-
config_file: scripts/caller.xml
23-
ip: {{ caller_ip }}
24-
port: {{ caller_port }}
14+
use: caller_uac
2515
require:
2616
- after:
2717
task: Check callee not registered
2818

2919
cleanup_tasks:
30-
- name: Delete caller AOR
31-
type: opensips-mi
32-
args: ul_rm location {{ caller }}@{{ default_domain }}
20+
- use: delete_caller_aor

0 commit comments

Comments
 (0)