From 722b433d597dd1bb21d495aa467fbff3b05fb370 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 7 Jul 2021 09:37:34 +0200 Subject: [PATCH] TT#116103 scenarios_pbx: use different customer per scenario > {"message":"Customer already has a pbx pilot subscriber.","code":"422"} To avoid this error on provisioning all at once Change-Id: Icc36123a64e4f657d154a08eadc50e8f90e1f459 --- scenarios_pbx/invite/0005_test.yml.tt2 | 2 +- scenarios_pbx/invite/scenario.yml | 14 ++++++------ scenarios_pbx/invite_alias/0005_test.yml.tt2 | 2 +- scenarios_pbx/invite_alias/scenario.yml | 14 ++++++------ .../invite_alias_devid/0009_test.yml.tt2 | 2 +- scenarios_pbx/invite_alias_devid/scenario.yml | 22 +++++++++---------- .../0009_test.yml.tt2 | 2 +- .../invite_alias_devid_fulllookup/prefs.json | 5 ----- .../scenario.yml | 22 +++++++++---------- .../invite_username_devid/0009_test.yml.tt2 | 2 +- .../invite_username_devid/scenario.yml | 22 +++++++++---------- 11 files changed, 52 insertions(+), 57 deletions(-) delete mode 100644 scenarios_pbx/invite_alias_devid_fulllookup/prefs.json diff --git a/scenarios_pbx/invite/0005_test.yml.tt2 b/scenarios_pbx/invite/0005_test.yml.tt2 index 2ebf4c49..26cb3e92 100644 --- a/scenarios_pbx/invite/0005_test.yml.tt2 +++ b/scenarios_pbx/invite/0005_test.yml.tt2 @@ -197,6 +197,6 @@ sip_out: 'Content-Type: application/sdp', 'P-Caller-UUID: [% invite_scenarios_pbx_test.testuser1002.uuid %]', 'P-Callee-UUID: [% invite_scenarios_pbx_test.testuser1003.uuid %]', - 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;fast_ack=no;a_park_domain=[% customerpbx_test.id %];b_park_domain=[% customerpbx_test.id %]', + 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;fast_ack=no;a_park_domain=[% invite_customerpbx_test.id %];b_park_domain=[% invite_customerpbx_test.id %]', 'P-App-Name: sbc' ] diff --git a/scenarios_pbx/invite/scenario.yml b/scenarios_pbx/invite/scenario.yml index ac60ec6d..41e29e37 100644 --- a/scenarios_pbx/invite/scenario.yml +++ b/scenarios_pbx/invite/scenario.yml @@ -4,19 +4,19 @@ domains: invite.scenarios-pbx.test: reseller_id: 1 customers: - 'customerpbx.test': + "invite.customerpbx.test": contacts: - - email: "customerpbx.test@spce.test" + - email: "invite.customerpbx.test@spce.test" reseller_id: 1 details: - status: 'active' - type: 'pbxaccount' + status: "active" + type: "pbxaccount" billing_profile_id: 1 reseller_id: 1 subscribers: invite.scenarios-pbx.test: testuser1002: - customer: 'customerpbx.test' + customer: "invite.customerpbx.test" password: testuser cc: 43 ac: 1 @@ -24,7 +24,7 @@ subscribers: is_pbx_pilot: 1 pbx_extension: 1002 testuser1003: - customer: 'customerpbx.test' + customer: "invite.customerpbx.test" password: testuser cc: 43 ac: 1 @@ -39,4 +39,4 @@ scenarios: - ip: 127.1.0.1 username: testuser1003 domain: invite.scenarios-pbx.test - register: 'yes' + register: "yes" diff --git a/scenarios_pbx/invite_alias/0005_test.yml.tt2 b/scenarios_pbx/invite_alias/0005_test.yml.tt2 index abd3df8a..f096f723 100644 --- a/scenarios_pbx/invite_alias/0005_test.yml.tt2 +++ b/scenarios_pbx/invite_alias/0005_test.yml.tt2 @@ -223,7 +223,7 @@ sip_out: 'P-Callee-UUID: [% invite_alias_scenarios_pbx_test.testuser1003.uuid %]', 'P-NGCP-Rtpengine-Bleg: 1', 'P-Called-Party-ID: ', - 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;fast_ack=no;a_park_domain=[% customerpbx_test.id %];b_park_domain=[% customerpbx_test.id %]', + 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;fast_ack=no;a_park_domain=[% invite_alias_customerpbx_test.id %];b_park_domain=[% invite_alias_customerpbx_test.id %]', 'P-App-Name: sbc', 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=\d+;primary=[% invite_alias_scenarios_pbx_test.testuser1002.phone_number %]', 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_alias_scenarios_pbx_test.testuser1002.phone_number %]1003;alias=[% invite_alias_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]', diff --git a/scenarios_pbx/invite_alias/scenario.yml b/scenarios_pbx/invite_alias/scenario.yml index 43e1a2c3..3eb53eac 100644 --- a/scenarios_pbx/invite_alias/scenario.yml +++ b/scenarios_pbx/invite_alias/scenario.yml @@ -4,19 +4,19 @@ domains: invite-alias.scenarios-pbx.test: reseller_id: 1 customers: - 'customerpbx.test': + "invite_alias.customerpbx.test": contacts: - - email: "customerpbx.test@spce.test" + - email: "invite_alias.customerpbx.test@spce.test" reseller_id: 1 details: - status: 'active' - type: 'pbxaccount' + status: "active" + type: "pbxaccount" billing_profile_id: 1 reseller_id: 1 subscribers: invite-alias.scenarios-pbx.test: testuser1002: - customer: 'customerpbx.test' + customer: "invite_alias.customerpbx.test" password: testuser cc: 43 ac: 1 @@ -28,7 +28,7 @@ subscribers: ac: 9 sn: 222111 testuser1003: - customer: 'customerpbx.test' + customer: "invite_alias.customerpbx.test" password: testuser cc: 43 ac: 1 @@ -53,4 +53,4 @@ scenarios: - ip: 127.2.0.1 username: testuser1003 domain: invite-alias.scenarios-pbx.test - register: 'yes' + register: "yes" diff --git a/scenarios_pbx/invite_alias_devid/0009_test.yml.tt2 b/scenarios_pbx/invite_alias_devid/0009_test.yml.tt2 index eebc820a..c8e6e792 100644 --- a/scenarios_pbx/invite_alias_devid/0009_test.yml.tt2 +++ b/scenarios_pbx/invite_alias_devid/0009_test.yml.tt2 @@ -223,7 +223,7 @@ sip_out: 'P-Callee-UUID: [% invite_alias_devid_scenarios_pbx_test.testuser1003.uuid %]', 'P-NGCP-Rtpengine-Bleg: 1', 'P-Called-Party-ID: ', - 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;fast_ack=no;a_park_domain=[% customerpbx_test.id %];b_park_domain=[% customerpbx_test.id %]', + 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;fast_ack=no;a_park_domain=[% invite_alias_devid_customerpbx_test.id %];b_park_domain=[% invite_alias_devid_customerpbx_test.id %]', 'P-App-Name: sbc', 'P-NGCP-Caller-Info: ;ip=[% scenarios.2.ip %];port=\d+;primary=[% invite_alias_devid_scenarios_pbx_test.testuser1002.phone_number %]', 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_alias_devid_scenarios_pbx_test.testuser1002.phone_number %]1003;alias=[% invite_alias_devid_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]', diff --git a/scenarios_pbx/invite_alias_devid/scenario.yml b/scenarios_pbx/invite_alias_devid/scenario.yml index a67a1c1f..2247d137 100644 --- a/scenarios_pbx/invite_alias_devid/scenario.yml +++ b/scenarios_pbx/invite_alias_devid/scenario.yml @@ -4,19 +4,19 @@ domains: invite-alias-devid.scenarios-pbx.test: reseller_id: 1 customers: - 'customerpbx.test': + "invite_alias_devid.customerpbx.test": contacts: - - email: "customerpbx.test@spce.test" + - email: "invite_alias_devid.customerpbx.test@spce.test" reseller_id: 1 details: - status: 'active' - type: 'pbxaccount' + status: "active" + type: "pbxaccount" billing_profile_id: 1 reseller_id: 1 subscribers: invite-alias-devid.scenarios-pbx.test: testuser1002: - customer: 'customerpbx.test' + customer: "invite_alias_devid.customerpbx.test" password: testuser cc: 43 ac: 1 @@ -28,7 +28,7 @@ subscribers: ac: 9 sn: 222111 testuser1003: - customer: 'customerpbx.test' + customer: "invite_alias_devid.customerpbx.test" password: testuser cc: 43 ac: 1 @@ -56,8 +56,8 @@ scenarios: - ip: 127.2.0.1 username: testuser1003 domain: invite-alias-devid.scenarios-pbx.test - register: 'no' - active: 'no' + register: "no" + active: "no" - ip: 127.2.0.2 domain: invite-alias-devid.scenarios-pbx.test username: testuser1003 @@ -66,8 +66,8 @@ scenarios: devid: 439333333 username: testuser1003 domain: invite-alias-devid.scenarios-pbx.test - register: 'no' - active: 'no' + register: "no" + active: "no" - ip: 127.126.0.1 username: testuser1002 domain: invite-alias-devid.scenarios-pbx.test @@ -76,4 +76,4 @@ scenarios: devid: 439333111 username: testuser1003 domain: invite-alias-devid.scenarios-pbx.test - register: 'yes' + register: "yes" diff --git a/scenarios_pbx/invite_alias_devid_fulllookup/0009_test.yml.tt2 b/scenarios_pbx/invite_alias_devid_fulllookup/0009_test.yml.tt2 index cb294b44..fde0587a 100644 --- a/scenarios_pbx/invite_alias_devid_fulllookup/0009_test.yml.tt2 +++ b/scenarios_pbx/invite_alias_devid_fulllookup/0009_test.yml.tt2 @@ -223,7 +223,7 @@ sip_out: 'P-Callee-UUID: [% invite_alias_devid_fulllookup_scenarios_pbx_test.testuser1003.uuid %]', 'P-NGCP-Rtpengine-Bleg: 1', 'P-Called-Party-ID: ', - 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;fast_ack=no;a_park_domain=[% customerpbx_test.id %];b_park_domain=[% customerpbx_test.id %]', + 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;fast_ack=no;a_park_domain=[% invite_alias_devid_fulllookup_customerpbx_test.id %];b_park_domain=[% invite_alias_devid_fulllookup_customerpbx_test.id %]', 'P-App-Name: sbc', 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=[% invite_alias_devid_fulllookup_scenarios_pbx_test.testuser1002.phone_number %]', 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_alias_devid_fulllookup_scenarios_pbx_test.testuser1002.phone_number %]1003;alias=[% invite_alias_devid_fulllookup_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]', diff --git a/scenarios_pbx/invite_alias_devid_fulllookup/prefs.json b/scenarios_pbx/invite_alias_devid_fulllookup/prefs.json deleted file mode 100644 index d7428086..00000000 --- a/scenarios_pbx/invite_alias_devid_fulllookup/prefs.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "testuser1003@spce.test": { - "lookup_all_registrations": true - } -} diff --git a/scenarios_pbx/invite_alias_devid_fulllookup/scenario.yml b/scenarios_pbx/invite_alias_devid_fulllookup/scenario.yml index f1ebeab7..53fb2c0e 100644 --- a/scenarios_pbx/invite_alias_devid_fulllookup/scenario.yml +++ b/scenarios_pbx/invite_alias_devid_fulllookup/scenario.yml @@ -4,19 +4,19 @@ domains: invite-alias-devid-fulllookup.scenarios-pbx.test: reseller_id: 1 customers: - 'customerpbx.test': + "invite_alias_devid_fulllookup.customerpbx.test": contacts: - - email: "customerpbx.test@spce.test" + - email: "invite_alias_devid_fulllookup.customerpbx.test@spce.test" reseller_id: 1 details: - status: 'active' - type: 'pbxaccount' + status: "active" + type: "pbxaccount" billing_profile_id: 1 reseller_id: 1 subscribers: invite-alias-devid-fulllookup.scenarios-pbx.test: testuser1002: - customer: 'customerpbx.test' + customer: "invite_alias_devid_fulllookup.customerpbx.test" password: testuser cc: 43 ac: 1 @@ -28,7 +28,7 @@ subscribers: ac: 9 sn: 222111 testuser1003: - customer: 'customerpbx.test' + customer: "invite_alias_devid_fulllookup.customerpbx.test" password: testuser cc: 43 ac: 1 @@ -56,8 +56,8 @@ scenarios: - ip: 127.2.0.1 username: testuser1003 domain: invite-alias-devid-fulllookup.scenarios-pbx.test - register: 'no' - active: 'no' + register: "no" + active: "no" - ip: 127.2.0.2 domain: invite-alias-devid-fulllookup.scenarios-pbx.test username: testuser1003 @@ -66,8 +66,8 @@ scenarios: devid: 439333333 username: testuser1003 domain: invite-alias-devid-fulllookup.scenarios-pbx.test - register: 'no' - active: 'no' + register: "no" + active: "no" - ip: 127.126.0.1 username: testuser1002 domain: invite-alias-devid-fulllookup.scenarios-pbx.test @@ -76,4 +76,4 @@ scenarios: devid: 439333111 username: testuser1003 domain: invite-alias-devid-fulllookup.scenarios-pbx.test - register: 'yes' + register: "yes" diff --git a/scenarios_pbx/invite_username_devid/0009_test.yml.tt2 b/scenarios_pbx/invite_username_devid/0009_test.yml.tt2 index e28a8000..42b7bd5a 100644 --- a/scenarios_pbx/invite_username_devid/0009_test.yml.tt2 +++ b/scenarios_pbx/invite_username_devid/0009_test.yml.tt2 @@ -221,7 +221,7 @@ sip_out: 'P-Callee-UUID: [% invite_username_devid_scenarios_pbx_test.testuser1003.uuid %]', 'P-NGCP-Rtpengine-Bleg: 1', 'P-Called-Party-ID: ', - 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;fast_ack=no;a_park_domain=[% customerpbx_test.id %];b_park_domain=[% customerpbx_test.id %]', + 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;fast_ack=no;a_park_domain=[% invite_username_devid_customerpbx_test.id %];b_park_domain=[% invite_username_devid_customerpbx_test.id %]', 'P-App-Name: sbc', 'P-NGCP-Caller-Info: ;ip=[% scenarios.2.ip %];port=[% scenarios.2.port %];primary=[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]', 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]1003', diff --git a/scenarios_pbx/invite_username_devid/scenario.yml b/scenarios_pbx/invite_username_devid/scenario.yml index c8ba0e84..9a086db0 100644 --- a/scenarios_pbx/invite_username_devid/scenario.yml +++ b/scenarios_pbx/invite_username_devid/scenario.yml @@ -4,19 +4,19 @@ domains: invite-username-devid.scenarios-pbx.test: reseller_id: 1 customers: - 'customerpbx.test': + "invite_username_devid.customerpbx.test": contacts: - - email: "customerpbx.test@spce.test" + - email: "invite_username_devid.customerpbx.test@spce.test" reseller_id: 1 details: - status: 'active' - type: 'pbxaccount' + status: "active" + type: "pbxaccount" billing_profile_id: 1 reseller_id: 1 subscribers: invite-username-devid.scenarios-pbx.test: testuser1002: - customer: 'customerpbx.test' + customer: "invite_username_devid.customerpbx.test" password: testuser cc: 43 ac: 1 @@ -28,7 +28,7 @@ subscribers: ac: 9 sn: 222111 testuser1003: - customer: 'customerpbx.test' + customer: "invite_username_devid.customerpbx.test" password: testuser cc: 43 ac: 1 @@ -57,8 +57,8 @@ scenarios: devid: 439333111 username: testuser1003 domain: invite-username-devid.scenarios-pbx.test - register: 'no' - active: 'no' + register: "no" + active: "no" - ip: 127.2.0.2 domain: invite-username-devid.scenarios-pbx.test username: testuser1003 @@ -67,8 +67,8 @@ scenarios: devid: 439333333 username: testuser1003 domain: invite-username-devid.scenarios-pbx.test - register: 'no' - active: 'no' + register: "no" + active: "no" - ip: 127.126.0.1 username: testuser1002 domain: invite-username-devid.scenarios-pbx.test @@ -76,4 +76,4 @@ scenarios: - ip: 127.2.0.3 username: testuser1003 domain: invite-username-devid.scenarios-pbx.test - register: 'yes' + register: "yes"