From 27c3b7dc3b2cb97b9bbd43a0c755e84d2106efd3 Mon Sep 17 00:00:00 2001 From: Kirill Solomko Date: Fri, 8 Jul 2022 16:56:18 +0200 Subject: [PATCH] TT#182101 api-preferences.t fix header_rule_set preference processing Change-Id: I1a7156314876596e08eb1251213344d8ac584a17 --- t/api-rest/api-preferences.t | 6 +++++- t/api-rest/api-root.t | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/t/api-rest/api-preferences.t b/t/api-rest/api-preferences.t index bf0f87e765..bba5248a03 100644 --- a/t/api-rest/api-preferences.t +++ b/t/api-rest/api-preferences.t @@ -193,7 +193,11 @@ sub get_preference_existen_value{ if($preference->{name}=~/^rewrite_rule_set$/){ $res = get_fake_data_created_or_data('rewriterulesets','name'); }elsif($preference->{name}=~/^header_rule_set$/){ - $res = get_fake_data_created_or_data('headerrulesets','name'); + if ($ngcp_type eq 'sppro' || $ngcp_type eq 'carrier') { + $res = get_fake_data_created_or_data('headerrulesets','name'); + } else { + $res = 'no_process'; + } }elsif($preference->{name}=~/^(adm_)?(cf_)?ncos$/){ $res = get_fake_data_created_or_data('ncoslevels','level'); }elsif($preference->{name}=~/^(contract_)?sound_set$/){ diff --git a/t/api-rest/api-root.t b/t/api-rest/api-root.t index 9d88efa468..62391b2910 100644 --- a/t/api-rest/api-root.t +++ b/t/api-rest/api-root.t @@ -92,6 +92,10 @@ $ua = Test::Collection->new()->ua(); faxes => 1, faxrecordings => 1, faxserversettings => 1, + headerrulesets => 1, + headerrules => 1, + headerruleconditions => 1, + headerruleactions => 1, interceptions => 1, invoices => 1, invoicetemplates => 1, @@ -129,6 +133,7 @@ $ua = Test::Collection->new()->ua(); peeringserverpreferencedefs => 1, peeringserverpreferences => 1, peeringservers => 1, + phonebookentries => 1, resellerbrandings => 1, resellerpreferencedefs => 1, resellerpreferences => 1, @@ -174,11 +179,6 @@ $ua = Test::Collection->new()->ua(); # PRO/Carrier only links if ($ngcp_type eq 'sppro' || $ngcp_type eq 'carrier') { - $rels->{phonebookentries} = 1; - $rels->{headerrulesets} = 1; - $rels->{headerrules} = 1; - $rels->{headerruleconditions} = 1; - $rels->{headerruleactions} = 1; } foreach my $link(@links) {