From f253643a7b8f5e5f3d140017ba814324f26671ad Mon Sep 17 00:00:00 2001 From: Donat Zenichev Date: Tue, 5 Oct 2021 16:13:05 +0300 Subject: [PATCH] TT#144200 LNP scenarios (invite_ncos_black, invite_ncos_white) It's been noticed that during nightly Jenkins runs, scenarios LNP keep on failing because of: 'invite_ncos_black' and 'invite_ncos_white' scenarios. Jenkins runs a mass configuration of the whole bunch of scenarios, and then starts running them one by one. The issue happens because of the same NCOS level names used by both 'invite_ncos_black' and 'invite_ncos_white' scenarios. First Jenkins configures 'invite_ncos_black' and all needed NCOS levels are added. Then Jenkins deletes and creates again the same NCOS levels (which share the same names) for the 'invite_ncos_white'. This leads to the fact, that NCOS levels exist, but are not set for 'invite_ncos_black' in domain preferences. Another problem is, that mass configuration of LNP scenarios leads to the problem with lnp carrier id and lnp numbers during the run, and Proxy component thinks that there are no entries for certain scenarios or uses the wrong lnp entry. Same problem, scenarios share the same name space for part of the objects. This commit concerns change of the name space for NCOS levels. Change-Id: I851e5a81384e46972996d93b7d03657fd1c6c63d --- scenarios_lnp/invite_ncos_black/lnp.yml.tt2 | 6 +++--- scenarios_lnp/invite_ncos_black/ncos.yml | 4 ++-- scenarios_lnp/invite_ncos_black/prefs.json.tt2 | 2 +- scenarios_lnp/invite_ncos_white/lnp.yml.tt2 | 6 +++--- scenarios_lnp/invite_ncos_white/ncos.yml | 8 ++++---- scenarios_lnp/invite_ncos_white/peer.yml | 2 +- scenarios_lnp/invite_ncos_white/prefs.json.tt2 | 2 +- scenarios_lnp/invite_ncos_white/scenario.yml | 14 +++++++------- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/scenarios_lnp/invite_ncos_black/lnp.yml.tt2 b/scenarios_lnp/invite_ncos_black/lnp.yml.tt2 index d541ce51..9070b84f 100644 --- a/scenarios_lnp/invite_ncos_black/lnp.yml.tt2 +++ b/scenarios_lnp/invite_ncos_black/lnp.yml.tt2 @@ -2,16 +2,16 @@ lnp_invite_ncos_black_lnp_00: data: name: lnp_invite_ncos_black_lnp_00 - prefix: AA + prefix: BK numbers: - number: '[% extra_info.phone_numbers.0 %]' routing_number: '[% extra_info.phone_numbers.1 %]' ncos: - - level: ncos_black + - level: ncos_blacklist_scenario_lnp_black reseller_id: 1 patterns: - '.*' - - level: ncos_white + - level: ncos_whitelist_scenario_lnp_black reseller_id: 1 patterns: - '.*' diff --git a/scenarios_lnp/invite_ncos_black/ncos.yml b/scenarios_lnp/invite_ncos_black/ncos.yml index 6e8c3eb5..2b2e7b85 100644 --- a/scenarios_lnp/invite_ncos_black/ncos.yml +++ b/scenarios_lnp/invite_ncos_black/ncos.yml @@ -1,5 +1,5 @@ --- -ncos_black: +ncos_blacklist_scenario_lnp_black: data: mode: blacklist local_ac: 0 @@ -8,7 +8,7 @@ ncos_black: patterns: - pattern: '^439991' description: block LNP call -ncos_white: +ncos_whitelist_scenario_lnp_black: data: mode: whitelist local_ac: 0 diff --git a/scenarios_lnp/invite_ncos_black/prefs.json.tt2 b/scenarios_lnp/invite_ncos_black/prefs.json.tt2 index edb7978c..99b90b43 100644 --- a/scenarios_lnp/invite_ncos_black/prefs.json.tt2 +++ b/scenarios_lnp/invite_ncos_black/prefs.json.tt2 @@ -2,7 +2,7 @@ "@invite-ncos-black.scenarios-lnp.test": { "nat_sipping": "no", "lnp_for_local_sub": true, - "ncos": "ncos_black" + "ncos": "ncos_blacklist_scenario_lnp_black" }, "peer_invite_ncos_black_lnp_host0": { "concurrent_max": 1, diff --git a/scenarios_lnp/invite_ncos_white/lnp.yml.tt2 b/scenarios_lnp/invite_ncos_white/lnp.yml.tt2 index f26c0db3..7794a084 100644 --- a/scenarios_lnp/invite_ncos_white/lnp.yml.tt2 +++ b/scenarios_lnp/invite_ncos_white/lnp.yml.tt2 @@ -2,16 +2,16 @@ lnp_invite_ncos_white_lnp_00: data: name: lnp_invite_ncos_white_lnp_00 - prefix: AA + prefix: WT numbers: - number: '[% extra_info.phone_numbers.0 %]' routing_number: '[% extra_info.phone_numbers.1 %]' ncos: - - level: ncos_black + - level: ncos_blacklist_scenario_lnp_white reseller_id: 1 patterns: - '.*' - - level: ncos_white + - level: ncos_whitelist_scenario_lnp_white reseller_id: 1 patterns: - '.*' diff --git a/scenarios_lnp/invite_ncos_white/ncos.yml b/scenarios_lnp/invite_ncos_white/ncos.yml index c7c48f43..a6a4f2fd 100644 --- a/scenarios_lnp/invite_ncos_white/ncos.yml +++ b/scenarios_lnp/invite_ncos_white/ncos.yml @@ -1,19 +1,19 @@ --- -ncos_black: +ncos_blacklist_scenario_lnp_white: data: mode: blacklist local_ac: 0 description: test ncos level reseller_id: 1 patterns: - - pattern: '^439991' + - pattern: '^438881' description: block LNP call -ncos_white: +ncos_whitelist_scenario_lnp_white: data: mode: whitelist local_ac: 0 description: test ncos level reseller_id: 1 patterns: - - pattern: '^(439991|43999200)' + - pattern: '^(438881|43888200)' description: allow LNP call diff --git a/scenarios_lnp/invite_ncos_white/peer.yml b/scenarios_lnp/invite_ncos_white/peer.yml index 9e9d6609..ee1a2748 100644 --- a/scenarios_lnp/invite_ncos_white/peer.yml +++ b/scenarios_lnp/invite_ncos_white/peer.yml @@ -16,7 +16,7 @@ peer_invite_ncos_white_lnp: description: rules: - group_id: peer_invite_ncos_white_lnp_group0 - callee_prefix: "439991" + callee_prefix: "438881" callee_pattern: '' caller_pattern: '^sip:.+@invite-ncos-white.scenarios-lnp.test' description: "" diff --git a/scenarios_lnp/invite_ncos_white/prefs.json.tt2 b/scenarios_lnp/invite_ncos_white/prefs.json.tt2 index 407c2a50..ea5fe8dd 100644 --- a/scenarios_lnp/invite_ncos_white/prefs.json.tt2 +++ b/scenarios_lnp/invite_ncos_white/prefs.json.tt2 @@ -2,7 +2,7 @@ "@invite-ncos-white.scenarios-lnp.test": { "nat_sipping": "no", "lnp_for_local_sub": true, - "ncos": "ncos_white" + "ncos": "ncos_whitelist_scenario_lnp_white" }, "peer_invite_ncos_white_lnp_host0": { "concurrent_max": 1 diff --git a/scenarios_lnp/invite_ncos_white/scenario.yml b/scenarios_lnp/invite_ncos_white/scenario.yml index 7870bb9f..11b0cc7e 100644 --- a/scenarios_lnp/invite_ncos_white/scenario.yml +++ b/scenarios_lnp/invite_ncos_white/scenario.yml @@ -33,7 +33,7 @@ scenarios: domain: invite-ncos-white.scenarios-lnp.test responders: - ip: 127.0.2.1 - number: 43999100 + number: 43888100 username: testuser1001 domain: invite-ncos-white.scenarios-lnp.test peer_host: peer_invite_ncos_white_lnp_host0 @@ -43,7 +43,7 @@ scenarios: domain: invite-ncos-white.scenarios-lnp.test responders: - ip: 127.0.2.2 - number: 43999200 + number: 43888200 username: testuser1001 domain: invite-ncos-white.scenarios-lnp.test peer_host: peer_invite_ncos_white_lnp_host1 @@ -53,7 +53,7 @@ scenarios: domain: invite-ncos-white.scenarios-lnp.test responders: - ip: 127.0.2.1 - number: 43999300 + number: 43888300 username: testuser1001 domain: invite-ncos-white.scenarios-lnp.test peer_host: peer_invite_ncos_white_lnp_host0 @@ -61,8 +61,8 @@ scenarios: active: 'no' extra_info: phone_numbers: - - 439992 + - 438882 - 4318881001 - - 43999100 - - 43999200 - - 43999300 + - 43888100 + - 43888200 + - 43888300