sipwise
/
ngcp-panel
mirror of https://github.com/sipwise/ngcp-panel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

TT#13301 Use cached API cert for API test speed-up

Browse Source 
If no locally cached API cert is available, download one and use it
throughout all of the tests. Speed-up factor is ~3x.

Change-Id: I083985f4e4ec7d8f7f4e0beec3a604be80a4bb59
changes/31/12131/2
Andreas Granig 8 years ago
parent f4bfa5e555
commit d117dc39c7
24 changed files with 135 additions and 230 deletions
Show Stats Download Patch File Download Diff File

BIN
sandbox/keys.zip
View File

Binary file not shown.

32
sandbox/unzip_keys.pl
Unescape View File

@ -0,0 +1,32 @@
#!/usr/bin/perl -w
use strict;
use Data::Dumper;
use File::Slurp qw/read_file/;
use IO::Uncompress::Unzip qw/unzip/;
my $zip = read_file("keys.zip");
my $z = IO::Uncompress::Unzip->new(\$zip, MultiStream => 0, Append => 1);
my $data;
while(!$z->eof() && (my $hdr = $z->getHeaderInfo())) {
print "+++ found $$hdr{Name}\n";
unless($hdr->{Name} =~ /\.pem$/) {
# wrong file, just read stream, clear buffer and try next
while($z->read($data) > 0) {};
$data = undef;
$z->nextStream();
next;
}
# got our pem file
while($z->read($data) > 0) {}
last;
}
$z->close();
unless($data) {
die "no PEM file found\n";
}
open my $fh, ">:raw", "/tmp/out.zip";
print $fh $data;
close $fh;

13
t/api-rest/api-all-links.t
Unescape View File

@ -2,7 +2,6 @@ use warnings;
use strict;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
@ -10,15 +9,9 @@ my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
# OPTIONS tests
{

13
t/api-rest/api-balanceintervals.t
Unescape View File

@ -5,7 +5,6 @@ use threads::shared qw();
#use Sipwise::Base; #causes segfault when creating threads..
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
use Time::HiRes; #prevent warning from Time::Warp
@ -53,18 +52,10 @@ if ($is_local_env) {
my %config = $catalyst_config->getall();
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
my $req_identifier;
my $infinite_future;

14
t/api-rest/api-billingnetworks.t
Unescape View File

@ -1,6 +1,5 @@
use Sipwise::Base;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
use Storable qw();
@ -17,18 +16,11 @@ use NGCP::Panel::Utils::BillingNetworks qw();
my $is_local_env = 0;
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
{
my $blocks = [{ip=>'fdfe::5a55:caff:fefa:9089',mask=>128},

14
t/api-rest/api-billingprofiles.t
Unescape View File

@ -1,24 +1,16 @@
use Sipwise::Base;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
my $is_local_env = 0;
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
# OPTIONS tests
{

12
t/api-rest/api-contracts.t
Unescape View File

@ -2,7 +2,6 @@
use Sipwise::Base;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
@ -11,18 +10,11 @@ use DateTime::Format::Strptime qw();
use DateTime::Format::ISO8601 qw();
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
# OPTIONS tests
{

14
t/api-rest/api-customercontacts.t
Unescape View File

@ -1,22 +1,14 @@
use Sipwise::Base;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
#goto SKIP;
# OPTIONS tests

13
t/api-rest/api-customerfraudpreferences.t
Unescape View File

@ -1,22 +1,13 @@
#use Sipwise::Base;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
#$ua->add_handler("request_send", sub {
# my ($request, $ua, $h) = @_;

17
t/api-rest/api-customers.t
Unescape View File

@ -4,7 +4,6 @@ use strict;
use warnings;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
@ -12,23 +11,11 @@ use DateTime qw();
use DateTime::Format::Strptime qw();
use DateTime::Format::ISO8601 qw();
BEGIN {
unshift(@INC,'../../lib');
}
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
# OPTIONS tests
{

12
t/api-rest/api-events.t
Unescape View File

@ -1,6 +1,5 @@
#use Sipwise::Base;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
use Data::Dumper;
@ -8,18 +7,11 @@ use Data::Dumper;
my $is_local_env = 0;
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
#$ua->add_handler("request_send", sub {
# my ($request, $ua, $h) = @_;

14
t/api-rest/api-journals.t
Unescape View File

@ -1,6 +1,5 @@
use Sipwise::Base;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
use Storable qw();
@ -39,18 +38,11 @@ if ($is_local_env) {
my %config = $catalyst_config->getall();
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
my $t = time;
my $default_reseller_id = 1;

14
t/api-rest/api-lnp.t
Unescape View File

@ -1,6 +1,5 @@
use Sipwise::Base;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
use DateTime::Format::ISO8601;
@ -13,18 +12,11 @@ use warnings;
my $is_local_env = 0;
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
#$ua->add_handler("request_send", sub {
# my ($request, $ua, $h) = @_;

14
t/api-rest/api-method-override.t
Unescape View File

@ -1,24 +1,16 @@
use Sipwise::Base;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
my $is_local_env = 0;
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
#$ua->add_handler("request_send", sub {
# my ($request, $ua, $h) = @_;

12
t/api-rest/api-profilepackages.t
Unescape View File

@ -2,7 +2,6 @@ use warnings;
use strict;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
use Storable qw();
@ -12,18 +11,11 @@ use JSON::PP;
use LWP::Debug;
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
# OPTIONS tests
{

14
t/api-rest/api-resellers.t
Unescape View File

@ -2,23 +2,15 @@ use warnings;
use strict;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
# OPTIONS tests
{

14
t/api-rest/api-rewriterulesets.t
Unescape View File

@ -2,23 +2,15 @@ use warnings;
use strict;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
# OPTIONS tests
{

12
t/api-rest/api-root.t
Unescape View File

@ -2,23 +2,15 @@ use strict;
use warnings;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
# OPTIONS tests
{

14
t/api-rest/api-rtc-full.t
Unescape View File

@ -2,7 +2,6 @@ use warnings;
use strict;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
use URI::Escape qw();
@ -17,7 +16,6 @@ unless ($ENV{TEST_RTC}) {
}
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my $domain_name = $ENV{TEST_RTC_DOMAIN};
unless ($domain_name) {
@ -25,15 +23,9 @@ unless ($domain_name) {
}
my ($ua, $req, $res, $data);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
my ($domain_id);
{

14
t/api-rest/api-subscribers-groups.t
Unescape View File

@ -1,24 +1,16 @@
use Sipwise::Base;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
my $is_local_env = 0;
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
#$ua->add_handler("request_send", sub {
# my ($request, $ua, $h) = @_;

14
t/api-rest/api-systemcontacts.t
Unescape View File

@ -2,23 +2,15 @@ use strict;
use warnings;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
#goto SKIP;
# OPTIONS tests

14
t/api-rest/api-topuplogs.t
Unescape View File

@ -5,7 +5,6 @@ use Scalar::Util qw(looks_like_number);
#use Sipwise::Base; #causes segfault when creating threads..
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
use DateTime::Format::Strptime;
@ -37,18 +36,11 @@ if ($is_local_env) {
my %config = $catalyst_config->getall();
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
my $t = time;
my $default_reseller_id = 1;

14
t/api-rest/api-valid-patch.t
Unescape View File

@ -2,23 +2,15 @@ use strict;
use warnings;
use Net::Domain qw(hostfqdn);
use LWP::UserAgent;
use JSON qw();
use Test::More;
my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443');
my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!);
my ($ua, $req, $res);
$ua = LWP::UserAgent->new;
$ua->ssl_opts(
verify_hostname => 0,
SSL_verify_mode => 0,
);
my $user = $ENV{API_USER} // 'administrator';
my $pass = $ENV{API_PASS} // 'administrator';
$ua->credentials($netloc, "api_admin_http", $user, $pass);
use Test::Collection;
$ua = Test::Collection->new()->ua();
my $body;

47
t/lib/Test/Collection.pm
Unescape View File

@ -19,6 +19,14 @@ use Data::Dumper;
use File::Slurp qw/write_file/;
use Storable;
use Carp qw(cluck longmess shortmess);
use IO::Uncompress::Unzip;
has 'crt_path' => (
is => 'ro',
isa => 'Str',
lazy => 1,
default => sub {'/tmp/apicert.pem';},
);
has 'data_cache_file' => (
is => 'ro',
@ -252,8 +260,47 @@ sub init_ua {
verify_hostname => 0,
SSL_verify_mode => 0,
);
$self->init_ssl_cert($ua);
return $ua;
}
sub init_ssl_cert {
my ($self, $ua) = @_;
unless(-f $self->crt_path) {
my $res = $ua->post(
$self->base_uri . '/api/admincerts/',
Content_Type => 'application/json',
Content => '{}'
);
unless($res->is_success) {
die "failed to fetch client certificate: " . $res->status_line . "\n";
}
my $zip = $res->decoded_content;
my $z = IO::Uncompress::Unzip->new(\$zip, MultiStream => 0, Append => 1);
my $data;
while(!$z->eof() && (my $hdr = $z->getHeaderInfo())) {
unless($hdr->{Name} =~ /\.pem$/) {
# wrong file, just read stream, clear buffer and try next
while($z->read($data) > 0) {}
$data = undef;
$z->nextStream();
next;
}
while($z->read($data) > 0) {}
last;
}
$z->close();
unless($data) {
die "failed to find PEM file in client certificate zip file\n";
}
open my $fh, ">:raw", $self->crt_path or die "failed to open " . $self->crt_path . ": $!\n";
print $fh $data;
close $fh;
}
$ua->ssl_opts(
SSL_cert_file => $self->crt_path,
SSL_key_file => $self->crt_path,
);
}
sub runas {
my $self = shift;
my($role_in,$uri) = @_;

Write Preview
Loading…
Cancel
Save