From 2a4abdb98e7688999400eb6d580dff44d2a92367 Mon Sep 17 00:00:00 2001 From: Kirill Solomko Date: Fri, 8 Jul 2022 13:08:13 +0200 Subject: [PATCH] TT#182101 ngcp type related api-rest test fixups * api-all-links skips PRO only endpoints * api-preferences skips PRO only endpoints Change-Id: I1a14f61e031fb7aa0db63cdc7cb671d229c57ab4 (cherry picked from commit d6c928fbfdefc2f5c12a38a17bf161733b580475) --- t/api-rest/api-all-links.t | 11 +++++++++++ t/api-rest/api-preferences.t | 10 ++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/t/api-rest/api-all-links.t b/t/api-rest/api-all-links.t index 2a1963752d..61b4456cc4 100644 --- a/t/api-rest/api-all-links.t +++ b/t/api-rest/api-all-links.t @@ -7,6 +7,7 @@ use Test::More; my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443'); my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!); +my $ngcp_type = $ENV{NGCP_TYPE} || "sppro"; my ($ua, $req, $res); @@ -41,6 +42,16 @@ $ua = Test::Collection->new()->ua(); (my ($relname)) = ($link =~ $rex); # skip interceptions since there is no longer an LI admin by default next if $relname eq "interceptions"; + my $skip = 0; + if ($ngcp_type ne "sppro" && $ngcp_type ne "carrier") { + foreach my $pro_only (qw(phonebookentries headerrulesets headerrules headerruleconditions headerruleactions)) { + if ($relname eq $pro_only) { + ok(1, "skip '$pro_only' links check as it is a PRO only endpoint"); + $skip = 1; + } + } + } + next if $skip; # now get this rel $req = HTTP::Request->new('OPTIONS', "$uri/api/$relname/"); $res = $ua->request($req); diff --git a/t/api-rest/api-preferences.t b/t/api-rest/api-preferences.t index e9ac19e3e4..c12e20c7f8 100644 --- a/t/api-rest/api-preferences.t +++ b/t/api-rest/api-preferences.t @@ -10,6 +10,7 @@ use Clone qw/clone/; use MIME::Base64 qw(encode_base64); use feature "state"; +my $ngcp_type = $ENV{NGCP_TYPE} || "sppro"; #init test_machine my $test_machine = Test::Collection->new( @@ -67,7 +68,10 @@ $fake_data->set_data_from_script({ emergencymappingcontainer_id => sub { return shift->get_id('emergencymappingcontainers',@_); }, rewriteruleset_id => sub { return shift->get_id('rewriterulesets',@_); }, - headerruleset_id => sub { return shift->get_id('headerrulesets',@_); }, + (($ngcp_type eq 'sppro' || $ngcp_type eq 'carrier') + ? (headerruleset_id => sub { return shift->get_id('headerrulesets',@_); }) + : () + ), soundset_id => sub { return shift->get_id('soundsets',@_); }, orphan_soundset_id => sub { return $fake_data_soundsets->get_id('soundsets',@_); }, ncoslevel_id => sub { return shift->get_id('ncoslevels',@_); }, @@ -190,7 +194,9 @@ 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'); + } }elsif($preference->{name}=~/^(adm_)?(cf_)?ncos$/){ $res = get_fake_data_created_or_data('ncoslevels','level'); }elsif($preference->{name}=~/^(contract_)?sound_set$/){