From c3db5b2cb5260377997d47c6df24a3bca377d4db Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Thu, 20 Apr 2023 14:39:03 +0200 Subject: [PATCH] MT#57227 API: fix query to check if entity exists * provide_scenario.sh: continue even if the domain is not there when deleting It seems that API behavior has changed Change-Id: I6373eba6903491b39623329e29128de059f0b569 --- bin/provide_scenario.sh | 2 +- lib/Sipwise/API.pm | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/provide_scenario.sh b/bin/provide_scenario.sh index e8ccc5b2..99f2cb38 100755 --- a/bin/provide_scenario.sh +++ b/bin/provide_scenario.sh @@ -130,7 +130,7 @@ delete_voip() { "${BIN_DIR}/create_registrations.pl" -delete "${SCEN_CHECK_DIR}/registration.yml" fi - ngcp-delete-domain "$1" >/dev/null 2>&1 + ngcp-delete-domain "$1" >/dev/null 2>&1 || echo "$(date) - can't delete domain $1" if [ -f "${SCEN_CHECK_DIR}/peer.yml" ]; then echo "$(date) - Deleting peers" diff --git a/lib/Sipwise/API.pm b/lib/Sipwise/API.pm index 2f0bca12..b6678d6b 100644 --- a/lib/Sipwise/API.pm +++ b/lib/Sipwise/API.pm @@ -283,6 +283,10 @@ sub _post_content { sub _exists { my ($self, $data, $urldata, $collection_id) = @_; + # remove empty values + foreach (keys %{$data}) { + delete $data->{$_} unless $data->{$_}; + } my $collection = $self->_get_content($data, $urldata); if (defined $collection && $collection->{total_count} == 1) {