TT#17650 Switch to use YAML::XS instead of YAML

This module is more compliant and it is faster than the pure perl
implementation. The latter is also deprecated in favor of the former
(see man YAML for more details).

Change-Id: I15240ac294476c0d9cc30e36e622adc7e07db136
changes/27/13827/2
Guillem Jover 9 years ago
parent a38c6237f5
commit 31f441ad1a

@ -25,7 +25,7 @@ use Getopt::Long;
use strict;
use Tie::File;
use warnings;
use YAML qw/LoadFile DumpFile/;
use YAML::XS qw(LoadFile DumpFile);
use Hash::Merge qw(merge);
sub usage

@ -22,7 +22,7 @@ use strict;
use warnings;
use English;
use YAML;
use YAML:XS qw();
use Getopt::Long;
use Cwd 'abs_path';
use Config::Tiny;
@ -168,7 +168,7 @@ sub do_create
exit;
}
my $r = YAML::LoadFile(abs_path($ARGV[0]));
my $r = YAML::XS::LoadFile(abs_path($ARGV[0]));
if ($del) {
do_delete($r);
}

@ -22,7 +22,7 @@ use strict;
use warnings;
use English;
use YAML;
use YAML::XS;
use Getopt::Long;
use Cwd 'abs_path';
use Config::Tiny;
@ -131,7 +131,7 @@ sub do_create
exit;
}
my $r = YAML::LoadFile(abs_path($ARGV[0]));
my $r = YAML::XS::LoadFile(abs_path($ARGV[0]));
if ($del) {
do_delete($r);
}

@ -26,7 +26,7 @@ use Getopt::Long;
use Cwd 'abs_path';
use Config::Tiny;
use Sipwise::API qw(all);
use YAML qw{ DumpFile LoadFile };
use YAML::XS qw(DumpFile LoadFile);
my $config = Config::Tiny->read('/etc/default/ngcp-api');
my $opts;

@ -26,7 +26,7 @@ use Getopt::Long;
use Cwd 'abs_path';
use Config::Tiny;
use Sipwise::API qw(all);
use YAML;
use YAML::XS;
my $config = Config::Tiny->read('/etc/default/ngcp-api');
my $opts;
@ -121,4 +121,4 @@ sub main {
}
}
main(YAML::LoadFile(abs_path($ARGV[0])));
main(YAML::XS::LoadFile(abs_path($ARGV[0])));

@ -26,7 +26,7 @@ use Getopt::Long;
use Cwd 'abs_path';
use Config::Tiny;
use Sipwise::API qw(all);
use YAML qw{ DumpFile LoadFile };
use YAML::XS qw(DumpFile LoadFile);
use File::Basename qw{ basename };
my $config = Config::Tiny->read('/etc/default/ngcp-api');

@ -23,7 +23,7 @@ use warnings;
use English;
use Cwd 'abs_path';
use YAML qw{ DumpFile LoadFile };
use YAML::XS qw(DumpFile LoadFile);
use Getopt::Long;
use List::MoreUtils qw{ none };
use Config::Tiny;

@ -23,7 +23,7 @@ use warnings;
use Getopt::Long;
use Cwd 'abs_path';
use Template;
use YAML qw{ LoadFile };
use YAML::XS qw(LoadFile);
sub usage
{

@ -63,8 +63,8 @@ if($json_in) {
$inlog = decode_json($json);
}
else {
use YAML;
$inlog = YAML::LoadFile($filename);
use YAML::XS;
$inlog = YAML::XS::LoadFile($filename);
}
my @prevs = ();
my $name = '';

@ -26,7 +26,7 @@ use Cwd 'abs_path';
use File::Basename;
use File::Spec;
use IO::File;
use YAML;
use YAML::XS;
use Text::CSV;
use Template;
use Data::Dumper;
@ -49,7 +49,7 @@ die("Wrong number of arguments\n".usage()) unless ($#ARGV == 0);
my $filename = abs_path($ARGV[0]);
our $base_check_dir = dirname($filename);
my $cf = YAML::LoadFile($filename);
my $cf = YAML::XS::LoadFile($filename);
our $bin_dir = '/usr/share/kamailio-config-tests/bin';
our $template_dir = '/usr/share/kamailio-config-tests/scenarios/templates';

@ -22,7 +22,7 @@ use strict;
use warnings;
use English;
use YAML;
use YAML::XS;
use Getopt::Long;
use Cwd 'abs_path';
use Config::Tiny;
@ -106,7 +106,7 @@ sub set_subscriber_voicemailsettings
}
sub main {
my $r = YAML::LoadFile(abs_path($ARGV[0]));
my $r = YAML::XS::LoadFile(abs_path($ARGV[0]));
for my $key (keys %{$r})
{

@ -22,7 +22,7 @@ use strict;
use warnings;
use English;
use YAML;
use YAML::XS;
use Getopt::Long;
use Cwd 'abs_path';
use Config::Tiny;
@ -82,7 +82,7 @@ sub set_subscriber_speeddial
sub main {
my $r = YAML::LoadFile(abs_path($ARGV[0]));
my $r = YAML::XS::LoadFile(abs_path($ARGV[0]));
for my $key (keys %{$r})
{

@ -61,8 +61,8 @@ if($json_in) {
$inlog = decode_json($json);
}
else {
use YAML;
$inlog = YAML::LoadFile($filename);
use YAML::XS;
$inlog = YAML::XS::LoadFile($filename);
}
foreach my $i (@{$inlog->{'flow'}})

@ -23,7 +23,7 @@ use strict;
use warnings;
use English;
use JSON;
use YAML;
use YAML::XS;
use File::Spec;
use Cwd 'abs_path';
use Data::Dumper;
@ -73,7 +73,7 @@ sub save_data
{
if (!$data->{'sip_out'}) { print "no sip_out\n"; }
$path = File::Spec->catfile( $output_dir, (sprintf "%04i", $data->{'msgid'}).".yml");
YAML::DumpFile($path, $data);
YAML::XS::DumpFile($path, $data);
#print "$data->{'msgid'} saved\n";
# This tries to fix problems with string values '-' being saved
# without quotes.

2
debian/control vendored

@ -19,7 +19,7 @@ Depends:
libjson-perl,
libtemplate-perl,
libtext-csv-perl,
libyaml-perl,
libyaml-libyaml-perl,
ngcp-provisioning-tools,
parallel,
python,

Loading…
Cancel
Save