From 7bcebc967c2bb9ba942cbb170c9fce9f92ee3871 Mon Sep 17 00:00:00 2001
From: Rene Krenn <rkrenn@sipwise.com>
Date: Mon, 16 Apr 2018 12:24:20 +0200
Subject: [PATCH] TT#35715 tolerate collection uris including pagination query
 params

Change-Id: I8e6d826a32acdfbed821e3b28ed4e45b15909f5d
(cherry picked from commit 9a8c580f0092379812c6c8917114d0e04b6a6681)
---
 lib/NGCP/API/Client.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/NGCP/API/Client.pm b/lib/NGCP/API/Client.pm
index d71eb46..842a7e3 100644
--- a/lib/NGCP/API/Client.pm
+++ b/lib/NGCP/API/Client.pm
@@ -104,6 +104,8 @@ sub next_page {
     my ($self, $uri) = @_;
 
     (my $params = $uri) =~ s/^[^?]+\?//;
+    $params =~ s/[&?]rows(=\d+)?//;
+    $params =~ s/[&?]page(=\d+)?//;
 
     unless ($self->{_ua}) {
         ($self->{_ua},$self->{_urlbase}) = $self->_create_ua($uri);
@@ -124,7 +126,7 @@ sub next_page {
     my $data = $res->as_hash();
     if ($data && ref($data) eq 'HASH') {
         $uri = $data->{_links}->{next}->{href};
-        return $res unless $uri && $uri =~ /rows/;
+        return $res unless $uri && $uri =~ /page/;
         $uri .= '&'.$params if $params && $uri !~ /\Q$params\E/;
         $self->{_collection_url} = $self->_get_url($self->{_urlbase},$uri) if $uri;
     }