TT#35715 ensure that next_page() retains original query params

* it is important that next_page() retains the original
      query params via links->next->href as otherwise
      that leads to unpredicted results and no filtering

Change-Id: I8606a9fa03758eb214c7aa38958f158f2cc1a16e
(cherry picked from commit bb51c3ee49)
(cherry picked from commit 2d262bc34d)

lib/NGCP/API/Client.pm

@@ -103,6 +103,8 @@ sub request {
 sub next_page {
     my ($self, $uri) = @_;
 
+    (my $params = $uri) =~ s/^[^?]+\?//;
+
     unless ($self->{_ua}) {
         ($self->{_ua},$self->{_urlbase}) = $self->_create_ua($uri);
         $self->{_collection_url} = sprintf "https://%s%s%spage=1&rows=%d", $self->{_urlbase},
@@ -118,8 +120,12 @@ sub next_page {
     my $res = NGCP::API::Client::Result->new($self->{_ua}->request($req));
 
     undef $self->{_collection_url};
-    if ('HASH' eq ref (my $data = $res->as_hash())) {
+
+    my $data = $res->as_hash();
+    if ($data && ref($data) eq 'HASH') {
         $uri = $data->{_links}->{next}->{href};
+        return $res unless $uri && $uri =~ /rows/;
+        $uri .= '&'.$params if $params && $uri !~ /\Q$params\E/;
         $self->{_collection_url} = $self->_get_url($self->{_urlbase},$uri) if $uri;
     }