TT#21112 remove Moose from some modules

some simple refactorings, the Formhandler Fields are mostly cosmetic

Change-Id: I71fe5540a326e53d8bbf769c0f2f85540df71b58
changes/69/15469/5
Gerhard Jungwirth 8 years ago
parent 88b0d9d4b8
commit cbf8fd68f1

@ -11,6 +11,7 @@ use NGCP::Panel::Utils::Message;
use NGCP::Panel::Utils::Navigation; use NGCP::Panel::Utils::Navigation;
use NGCP::Panel::Utils::Prosody; use NGCP::Panel::Utils::Prosody;
use NGCP::Panel::Utils::Preferences; use NGCP::Panel::Utils::Preferences;
use NGCP::Panel::Utils::XMLDispatcher;
sub auto :Does(ACL) :ACLDetachTo('/denied_page') :AllowedRole(admin) :AllowedRole(reseller) { sub auto :Does(ACL) :ACLDetachTo('/denied_page') :AllowedRole(admin) :AllowedRole(reseller) {
my ($self, $c) = @_; my ($self, $c) = @_;
@ -402,8 +403,7 @@ sub load_preference_list :Private {
sub _sip_domain_reload { sub _sip_domain_reload {
my ($self, $c) = @_; my ($self, $c) = @_;
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new; my ($res) = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "proxy-ng", 1, 1, <<EOF );
my ($res) = $dispatcher->dispatch($c, "proxy-ng", 1, 1, <<EOF );
<?xml version="1.0" ?> <?xml version="1.0" ?>
<methodCall> <methodCall>
<methodName>domain.reload</methodName> <methodName>domain.reload</methodName>

@ -1,8 +1,10 @@
package NGCP::Panel::Controller::Logout; package NGCP::Panel::Controller::Logout;
use NGCP::Panel::Utils::Generic qw(:all); use NGCP::Panel::Utils::Generic qw(:all);
use Moose;
BEGIN { extends 'Catalyst::Controller'; } use strict;
use warnings;
use parent 'Catalyst::Controller';
=head1 NAME =head1 NAME

@ -1,8 +1,10 @@
package NGCP::Panel::Controller::Root; package NGCP::Panel::Controller::Root;
use NGCP::Panel::Utils::Generic qw(:all); use NGCP::Panel::Utils::Generic qw(:all);
use Moose;
BEGIN { extends 'Catalyst::Controller' } use warnings;
use strict;
use parent 'Catalyst::Controller';
use Scalar::Util qw(blessed); use Scalar::Util qw(blessed);
use NGCP::Panel::Utils::DateTime qw(); use NGCP::Panel::Utils::DateTime qw();

@ -10,7 +10,6 @@ use NGCP::Panel::Form;
use File::Type; use File::Type;
use File::Slurp; use File::Slurp;
use File::Basename; use File::Basename;
use NGCP::Panel::Utils::XMLDispatcher;
use NGCP::Panel::Utils::Sounds; use NGCP::Panel::Utils::Sounds;
use NGCP::Panel::Utils::Navigation; use NGCP::Panel::Utils::Navigation;
use NGCP::Panel::Utils::Sems; use NGCP::Panel::Utils::Sems;

@ -26,7 +26,6 @@ use NGCP::Panel::Utils::Kamailio;
use NGCP::Panel::Utils::Events; use NGCP::Panel::Utils::Events;
use NGCP::Panel::Utils::ProfilePackages qw(); use NGCP::Panel::Utils::ProfilePackages qw();
use NGCP::Panel::Utils::XMLDispatcher;
use UUID; use UUID;
=head1 NAME =head1 NAME

@ -1,5 +1,4 @@
package NGCP::Panel::Field::AliasNumber; package NGCP::Panel::Field::AliasNumber;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Repeatable'; extends 'HTML::FormHandler::Field::Repeatable';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::BillingNetwork; package NGCP::Panel::Field::BillingNetwork;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::BillingProfile; package NGCP::Panel::Field::BillingProfile;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::BillingZone; package NGCP::Panel::Field::BillingZone;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::Contact; package NGCP::Panel::Field::Contact;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::ContactNoReseller; package NGCP::Panel::Field::ContactNoReseller;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::ContactWithReseller; package NGCP::Panel::Field::ContactWithReseller;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::Contract; package NGCP::Panel::Field::Contract;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::ContractBalance; package NGCP::Panel::Field::ContractBalance;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::Country; package NGCP::Panel::Field::Country;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::CustomerContract; package NGCP::Panel::Field::CustomerContract;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::DataTable; package NGCP::Panel::Field::DataTable;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
use Template; use Template;
use JSON; use JSON;

@ -1,5 +1,4 @@
package NGCP::Panel::Field::DatePicker; package NGCP::Panel::Field::DatePicker;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
use Template; use Template;
extends 'HTML::FormHandler::Field'; extends 'HTML::FormHandler::Field';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::DateTime; package NGCP::Panel::Field::DateTime;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
use Sipwise::Base; use Sipwise::Base;
extends 'HTML::FormHandler::Field::Text'; extends 'HTML::FormHandler::Field::Text';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::Device; package NGCP::Panel::Field::Device;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::DeviceConfig; package NGCP::Panel::Field::DeviceConfig;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::Domain; package NGCP::Panel::Field::Domain;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::EmailList; package NGCP::Panel::Field::EmailList;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
use Email::Valid; use Email::Valid;
use Sipwise::Base; use Sipwise::Base;

@ -1,5 +1,4 @@
package NGCP::Panel::Field::EmailTemplate; package NGCP::Panel::Field::EmailTemplate;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::EmergencyMappingContainer; package NGCP::Panel::Field::EmergencyMappingContainer;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::IPAddress; package NGCP::Panel::Field::IPAddress;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
use Data::Validate::IP qw(is_ipv4 is_ipv6); use Data::Validate::IP qw(is_ipv4 is_ipv6);
extends 'HTML::FormHandler::Field::Text'; extends 'HTML::FormHandler::Field::Text';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::Identifier; package NGCP::Panel::Field::Identifier;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Text'; extends 'HTML::FormHandler::Field::Text';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::Interval; package NGCP::Panel::Field::Interval;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::InvoiceTemplate; package NGCP::Panel::Field::InvoiceTemplate;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::LnpCarrier; package NGCP::Panel::Field::LnpCarrier;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::MonthPicker; package NGCP::Panel::Field::MonthPicker;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
use Template; use Template;
extends 'HTML::FormHandler::Field'; extends 'HTML::FormHandler::Field';

@ -1,6 +1,6 @@
package NGCP::Panel::Field::NumRangeAPI; package NGCP::Panel::Field::NumRangeAPI;
use Moose;
use Sipwise::Base; use Sipwise::Base;
use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Text'; extends 'HTML::FormHandler::Field::Text';
has 'min_start' => (isa => 'Int', default => 0, is => 'rw'); has 'min_start' => (isa => 'Int', default => 0, is => 'rw');

@ -1,6 +1,6 @@
package NGCP::Panel::Field::NumberStatusSelect; package NGCP::Panel::Field::NumberStatusSelect;
use Moose;
use Sipwise::Base; use Sipwise::Base;
use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Select'; extends 'HTML::FormHandler::Field::Select';
sub build_options { sub build_options {

@ -1,5 +1,4 @@
package NGCP::Panel::Field::PbxCustomerContract; package NGCP::Panel::Field::PbxCustomerContract;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::PbxGroup; package NGCP::Panel::Field::PbxGroup;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::PbxGroupAPI; package NGCP::Panel::Field::PbxGroupAPI;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field'; extends 'HTML::FormHandler::Field';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::PbxGroupMemberAPI; package NGCP::Panel::Field::PbxGroupMemberAPI;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field'; extends 'HTML::FormHandler::Field';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::Product; package NGCP::Panel::Field::Product;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::ProfileNetwork; package NGCP::Panel::Field::ProfileNetwork;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::ProfilePackage; package NGCP::Panel::Field::ProfilePackage;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::Regexp; package NGCP::Panel::Field::Regexp;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Text'; extends 'HTML::FormHandler::Field::Text';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::Reseller; package NGCP::Panel::Field::Reseller;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::ResellerContract; package NGCP::Panel::Field::ResellerContract;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,5 @@
package NGCP::Panel::Field::ResellerStatusSelect; package NGCP::Panel::Field::ResellerStatusSelect;
use Moose; use HTML::FormHandler::Moose;
use Sipwise::Base; use Sipwise::Base;
extends 'HTML::FormHandler::Field::Select'; extends 'HTML::FormHandler::Field::Select';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::RewriteRuleAPI; package NGCP::Panel::Field::RewriteRuleAPI;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'NGCP::Panel::Field::RewriteRule'; extends 'NGCP::Panel::Field::RewriteRule';

@ -1,6 +1,6 @@
package NGCP::Panel::Field::SubscriberDestinationSet; package NGCP::Panel::Field::SubscriberDestinationSet;
use Moose;
use Sipwise::Base; use Sipwise::Base;
use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Select'; extends 'HTML::FormHandler::Field::Select';
sub build_options { sub build_options {

@ -1,6 +1,6 @@
package NGCP::Panel::Field::SubscriberLockSelect; package NGCP::Panel::Field::SubscriberLockSelect;
use Moose;
use Sipwise::Base; use Sipwise::Base;
use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Select'; extends 'HTML::FormHandler::Field::Select';
sub build_options { sub build_options {

@ -1,5 +1,4 @@
package NGCP::Panel::Field::SubscriberPbxGroup; package NGCP::Panel::Field::SubscriberPbxGroup;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::SubscriberProfile; package NGCP::Panel::Field::SubscriberProfile;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::SubscriberProfileSet; package NGCP::Panel::Field::SubscriberProfileSet;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,6 +1,6 @@
package NGCP::Panel::Field::SubscriberSourceSet; package NGCP::Panel::Field::SubscriberSourceSet;
use Moose;
use Sipwise::Base; use Sipwise::Base;
use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Select'; extends 'HTML::FormHandler::Field::Select';
sub build_options { sub build_options {

@ -1,6 +1,6 @@
package NGCP::Panel::Field::SubscriberStatusSelect; package NGCP::Panel::Field::SubscriberStatusSelect;
use Moose;
use Sipwise::Base; use Sipwise::Base;
use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Select'; extends 'HTML::FormHandler::Field::Select';
sub build_options { sub build_options {

@ -1,6 +1,6 @@
package NGCP::Panel::Field::SubscriberTimeSet; package NGCP::Panel::Field::SubscriberTimeSet;
use Moose;
use Sipwise::Base; use Sipwise::Base;
use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Select'; extends 'HTML::FormHandler::Field::Select';
sub build_options { sub build_options {

@ -1,5 +1,4 @@
package NGCP::Panel::Field::TimezoneSelect; package NGCP::Panel::Field::TimezoneSelect;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
use NGCP::Panel::Utils::DateTime; use NGCP::Panel::Utils::DateTime;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::URI; package NGCP::Panel::Field::URI;
use Moose;
use Sipwise::Base; use Sipwise::Base;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;

@ -1,5 +1,4 @@
package NGCP::Panel::Field::Voucher; package NGCP::Panel::Field::Voucher;
use Moose;
use HTML::FormHandler::Moose; use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound'; extends 'HTML::FormHandler::Field::Compound';

@ -140,8 +140,7 @@ sub item_by_id {
sub sip_domain_reload { sub sip_domain_reload {
my ($self, $c) = @_; my ($self, $c) = @_;
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new; my ($res) = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "proxy-ng", 1, 1, <<EOF );
my ($res) = $dispatcher->dispatch($c, "proxy-ng", 1, 1, <<EOF );
<?xml version="1.0" ?> <?xml version="1.0" ?>
<methodCall> <methodCall>
<methodName>domain.reload</methodName> <methodName>domain.reload</methodName>

@ -15,7 +15,6 @@ use Safe::Isa qw($_isa);
use Data::Validate::IP qw/is_ipv4 is_ipv6/; use Data::Validate::IP qw/is_ipv4 is_ipv6/;
use NGCP::Panel::Utils::Preferences; use NGCP::Panel::Utils::Preferences;
use NGCP::Panel::Utils::Prosody; use NGCP::Panel::Utils::Prosody;
use NGCP::Panel::Utils::XMLDispatcher;
sub get_form { sub get_form {
my ($self, $c) = @_; my ($self, $c) = @_;

@ -53,19 +53,19 @@ sub unregister_content {
return $self->{unregister_content}; return $self->{unregister_content};
} }
override 'parse_rpc_response_page' => sub { around 'parse_rpc_response_page' => sub {
my($self, $page) = @_; my($self, $page) = @_;
my $res = JSON::from_json($page); my $res = JSON::from_json($page);
return $res; return $res;
}; };
override 'parse_rpc_response' => sub { around 'parse_rpc_response' => sub {
my($self,$rpc_response) = @_; my($self,$rpc_response) = @_;
return $rpc_response; return $rpc_response;
}; };
#Todo: unify it with snome and vendor version somehow and move to VendorRPC.pm #Todo: unify it with snome and vendor version somehow and move to VendorRPC.pm
override 'extract_response_description' => sub { around 'extract_response_description' => sub {
my($self,$rpc_value) = @_; my($self,$rpc_value) = @_;
my $res = ''; my $res = '';

@ -1,7 +1,7 @@
package NGCP::Panel::Utils::DeviceBootstrap::Panasonic; package NGCP::Panel::Utils::DeviceBootstrap::Panasonic;
use strict; use strict;
use Moose; use Moo;
use Data::Dumper; use Data::Dumper;
extends 'NGCP::Panel::Utils::DeviceBootstrap::VendorRPC'; extends 'NGCP::Panel::Utils::DeviceBootstrap::VendorRPC';
@ -44,7 +44,7 @@ sub unregister_content {
return $self->{unregister_content}; return $self->{unregister_content};
} }
override 'process_bootstrap_uri' => sub { around 'process_bootstrap_uri' => sub {
my($self,$uri) = @_; my($self,$uri) = @_;
$uri = super($uri); $uri = super($uri);
$uri = $self->bootstrap_uri_mac($uri); $uri = $self->bootstrap_uri_mac($uri);

@ -4,13 +4,14 @@ use strict;
use URI::Escape; use URI::Escape;
use XML::Mini::Document;; use XML::Mini::Document;;
use Data::Dumper; use Data::Dumper;
use Moose; use Moo;
use Types::Standard qw(Str);
extends 'NGCP::Panel::Utils::DeviceBootstrap::VendorRPC'; extends 'NGCP::Panel::Utils::DeviceBootstrap::VendorRPC';
has 'register_subscriber_content' => ( has 'register_subscriber_content' => (
is => 'rw', is => 'rw',
isa => 'Str', isa => Str,
accessor => '_register_subscriber_content', accessor => '_register_subscriber_content',
); );
sub rpc_server_params{ sub rpc_server_params{
@ -81,14 +82,14 @@ sub unregister_content {
</request>"; </request>";
return $self->{unregister_content}; return $self->{unregister_content};
} }
override 'parse_rpc_response_page' => sub { around 'parse_rpc_response_page' => sub {
my($self, $page) = @_; my($self, $page) = @_;
my $xmlDoc = XML::Mini::Document->new(); my $xmlDoc = XML::Mini::Document->new();
$xmlDoc->parse($page); $xmlDoc->parse($page);
my $ref = $xmlDoc->toHash(); my $ref = $xmlDoc->toHash();
return $ref; return $ref;
}; };
override 'parse_rpc_response' => sub { around 'parse_rpc_response' => sub {
my($self, $rpc_response) = @_; my($self, $rpc_response) = @_;
my $c = $self->params->{c}; my $c = $self->params->{c};
my $ret = 0; my $ret = 0;

@ -1,7 +1,7 @@
package NGCP::Panel::Utils::DeviceBootstrap::Snom; package NGCP::Panel::Utils::DeviceBootstrap::Snom;
use strict; use strict;
use Moose; use Moo;
use Data::Dumper; use Data::Dumper;
extends 'NGCP::Panel::Utils::DeviceBootstrap::VendorRPC'; extends 'NGCP::Panel::Utils::DeviceBootstrap::VendorRPC';
@ -50,7 +50,7 @@ sub unregister_content {
</methodCall>"; </methodCall>";
return $self->{unregister_content}; return $self->{unregister_content};
} }
override 'extract_response_description' => sub { around 'extract_response_description' => sub {
my($self,$rpc_value) = @_; my($self,$rpc_value) = @_;
my $c = $self->params->{c}; my $c = $self->params->{c};
my $res = ''; my $res = '';
@ -70,7 +70,7 @@ override 'extract_response_description' => sub {
return $res; return $res;
}; };
override 'process_bootstrap_uri' => sub { around 'process_bootstrap_uri' => sub {
my($self,$uri) = @_; my($self,$uri) = @_;
$uri = super($uri); $uri = super($uri);
$uri = $self->bootstrap_uri_mac($uri); $uri = $self->bootstrap_uri_mac($uri);
@ -78,7 +78,7 @@ override 'process_bootstrap_uri' => sub {
return $self->content_params->{uri}; return $self->content_params->{uri};
}; };
override 'bootstrap_uri_mac' => sub { around 'bootstrap_uri_mac' => sub {
my($self, $uri) = @_; my($self, $uri) = @_;
if ($uri !~/\{mac\}$/){ if ($uri !~/\{mac\}$/){
if ($uri !~/\/$/){ if ($uri !~/\/$/){

@ -7,29 +7,30 @@ use Net::HTTPS::Any qw/https_post/;
use RPC::XML::ParserFactory 'XML::LibXML'; use RPC::XML::ParserFactory 'XML::LibXML';
use RPC::XML; use RPC::XML;
use Data::Dumper; use Data::Dumper;
use Moose; use Moo;
use Types::Standard qw(HashRef Str);
has 'params' => ( has 'params' => (
is => 'rw', is => 'rw',
isa => 'HashRef', isa => HashRef,
); );
has 'content_params' => ( has 'content_params' => (
is => 'rw', is => 'rw',
isa => 'HashRef', isa => HashRef,
); );
has 'rpc_server_params' => ( has 'rpc_server_params' => (
is => 'rw', is => 'rw',
isa => 'HashRef', isa => HashRef,
accessor => '_rpc_server_params', accessor => '_rpc_server_params',
); );
has 'register_content' => ( has 'register_content' => (
is => 'rw', is => 'rw',
isa => 'Str', isa => Str,
accessor => '_register_content', accessor => '_register_content',
); );
has 'unregister_content' => ( has 'unregister_content' => (
is => 'rw', is => 'rw',
isa => 'Str', isa => Str,
accessor => '_unregister_content', accessor => '_unregister_content',
); );

@ -1,13 +1,14 @@
package NGCP::Panel::Utils::DeviceBootstrap::Yealink; package NGCP::Panel::Utils::DeviceBootstrap::Yealink;
use strict; use strict;
use Moose; use Moo;
use Types::Standard qw(Str);
use Digest::MD5 qw/md5_hex/; use Digest::MD5 qw/md5_hex/;
extends 'NGCP::Panel::Utils::DeviceBootstrap::VendorRPC'; extends 'NGCP::Panel::Utils::DeviceBootstrap::VendorRPC';
has 'register_model_content' => ( has 'register_model_content' => (
is => 'rw', is => 'rw',
isa => 'Str', isa => Str,
accessor => '_register_model_content', accessor => '_register_model_content',
); );
sub rpc_server_params{ sub rpc_server_params{
@ -74,7 +75,7 @@ sub register_model_content {
return $self->{register_model_content}; return $self->{register_model_content};
} }
override 'process_bootstrap_uri' => sub { around 'process_bootstrap_uri' => sub {
my($self,$uri) = @_; my($self,$uri) = @_;
$uri = super($uri); $uri = super($uri);
$self->content_params->{uri} = $uri; $self->content_params->{uri} = $uri;

@ -9,8 +9,7 @@ sub delete_location_contact {
my ($c, $prov_subscriber, $contact) = @_; my ($c, $prov_subscriber, $contact) = @_;
my $aor = $prov_subscriber->username . '@' . $prov_subscriber->domain->domain; my $aor = $prov_subscriber->username . '@' . $prov_subscriber->domain->domain;
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new; my $ret = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "proxy-ng", 1, 1, <<EOF );
my $ret = $dispatcher->dispatch($c, "proxy-ng", 1, 1, <<EOF );
<?xml version="1.0" ?> <?xml version="1.0" ?>
<methodCall> <methodCall>
<methodName>ul.rm_contact</methodName> <methodName>ul.rm_contact</methodName>
@ -28,8 +27,7 @@ sub delete_location {
my ($c, $prov_subscriber) = @_; my ($c, $prov_subscriber) = @_;
my $aor = $prov_subscriber->username . '@' . $prov_subscriber->domain->domain; my $aor = $prov_subscriber->username . '@' . $prov_subscriber->domain->domain;
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new; my $ret = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "proxy-ng", 1, 1, <<EOF );
my $ret = $dispatcher->dispatch($c, "proxy-ng", 1, 1, <<EOF );
<?xml version="1.0" ?> <?xml version="1.0" ?>
<methodCall> <methodCall>
<methodName>ul.rm</methodName> <methodName>ul.rm</methodName>
@ -54,8 +52,7 @@ sub create_location {
} }
$flags //= 0; $flags //= 0;
$cflags //= 0; $cflags //= 0;
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new; my $ret = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "proxy-ng", 1, 1, <<EOF );
my $ret = $dispatcher->dispatch($c, "proxy-ng", 1, 1, <<EOF );
<?xml version="1.0" ?> <?xml version="1.0" ?>
<methodCall> <methodCall>
<methodName>ul.add</methodName> <methodName>ul.add</methodName>
@ -77,8 +74,7 @@ EOF
sub flush { sub flush {
my ($c) = @_; my ($c) = @_;
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new; my $ret = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "proxy-ng", 1, 1, <<EOF );
my $ret = $dispatcher->dispatch($c, "proxy-ng", 1, 1, <<EOF );
<?xml version="1.0" ?> <?xml version="1.0" ?>
<methodCall> <methodCall>
<methodName>ul.flush</methodName> <methodName>ul.flush</methodName>
@ -90,8 +86,7 @@ EOF
sub trusted_reload { sub trusted_reload {
my ($c) = @_; my ($c) = @_;
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new; my ($ret) = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "proxy-ng", 1, 1, <<EOF );
my ($ret) = $dispatcher->dispatch($c, "proxy-ng", 1, 1, <<EOF );
<?xml version="1.0" ?> <?xml version="1.0" ?>
<methodCall> <methodCall>
<methodName>permissions.trustedReload</methodName> <methodName>permissions.trustedReload</methodName>

@ -7,8 +7,7 @@ use warnings;
sub _sip_lcr_reload { sub _sip_lcr_reload {
my(%params) = @_; my(%params) = @_;
my($c) = @params{qw/c/}; my($c) = @params{qw/c/};
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new; NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "proxy-ng", 1, 1, <<EOF );
$dispatcher->dispatch($c, "proxy-ng", 1, 1, <<EOF );
<?xml version="1.0" ?> <?xml version="1.0" ?>
<methodCall> <methodCall>
<methodName>lcr.reload</methodName> <methodName>lcr.reload</methodName>
@ -21,8 +20,7 @@ EOF
sub _sip_dispatcher_reload { sub _sip_dispatcher_reload {
my ($self, $c) = @_; my ($self, $c) = @_;
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new; my ($res) = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "proxy-ng", 1, 1, <<EOF );
my ($res) = $dispatcher->dispatch($c, "proxy-ng", 1, 1, <<EOF );
<?xml version="1.0" ?> <?xml version="1.0" ?>
<methodCall> <methodCall>
<methodName>dispatcher.reload</methodName> <methodName>dispatcher.reload</methodName>

@ -7,8 +7,7 @@ use NGCP::Panel::Utils::XMLDispatcher;
sub sip_dialplan_reload { sub sip_dialplan_reload {
my ($c) = @_; my ($c) = @_;
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new; NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "proxy-ng", 1, 1, <<EOF );
$dispatcher->dispatch($c, "proxy-ng", 1, 1, <<EOF );
<?xml version="1.0" ?> <?xml version="1.0" ?>
<methodCall> <methodCall>
<methodName>dialplan.reload</methodName> <methodName>dialplan.reload</methodName>

@ -8,7 +8,6 @@ use NGCP::Panel::Utils::DateTime;
sub list_banned_ips { sub list_banned_ips {
my ( $c ) = @_; my ( $c ) = @_;
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new;
my $xml_parser = XML::LibXML->new(); my $xml_parser = XML::LibXML->new();
my $ip_xml = <<'EOF'; my $ip_xml = <<'EOF';
@ -21,7 +20,7 @@ sub list_banned_ips {
</methodCall> </methodCall>
EOF EOF
my $ip_res = $dispatcher->dispatch($c, "loadbalancer", 1, 1, $ip_xml); my $ip_res = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "loadbalancer", 1, 1, $ip_xml);
my @ips = (); my @ips = ();
for my $host (grep {$$_[1]} @$ip_res) { for my $host (grep {$$_[1]} @$ip_res) {
@ -40,7 +39,6 @@ EOF
sub list_banned_users { sub list_banned_users {
my ( $c, %params ) = @_; my ( $c, %params ) = @_;
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new;
my $xml_parser = XML::LibXML->new(); my $xml_parser = XML::LibXML->new();
my $user_xml = <<'EOF'; my $user_xml = <<'EOF';
@ -53,7 +51,7 @@ sub list_banned_users {
</methodCall> </methodCall>
EOF EOF
my $user_res = $dispatcher->dispatch($c, "loadbalancer", 1, 1, $user_xml); my $user_res = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "loadbalancer", 1, 1, $user_xml);
my @users = (); my @users = ();
my $usr = {}; my $usr = {};
for my $host (grep {$$_[1]} @$user_res) { for my $host (grep {$$_[1]} @$user_res) {
@ -97,7 +95,6 @@ sub ip_unban {
my ( $c, $ip ) = @_; my ( $c, $ip ) = @_;
my $decoder = URI::Encode->new; my $decoder = URI::Encode->new;
$ip = $decoder->decode($ip); $ip = $decoder->decode($ip);
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new;
my $xml = <<"EOF"; my $xml = <<"EOF";
<?xml version="1.0" ?> <?xml version="1.0" ?>
@ -110,14 +107,13 @@ sub ip_unban {
</methodCall> </methodCall>
EOF EOF
$dispatcher->dispatch($c, "loadbalancer", 1, 1, $xml); NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "loadbalancer", 1, 1, $xml);
} }
sub user_unban { sub user_unban {
my ( $c, $user ) = @_; my ( $c, $user ) = @_;
my $decoder = URI::Encode->new; my $decoder = URI::Encode->new;
$user = $decoder->decode($user); $user = $decoder->decode($user);
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new;
my @keys = ($user.'::auth_count', $user.'::last_auth'); my @keys = ($user.'::auth_count', $user.'::last_auth');
foreach my $key (@keys) { foreach my $key (@keys) {
@ -132,7 +128,7 @@ sub user_unban {
</methodCall> </methodCall>
EOF EOF
$dispatcher->dispatch($c, "loadbalancer", 1, 1, $xml); NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "loadbalancer", 1, 1, $xml);
} }
} }

@ -37,8 +37,6 @@ sub create_peer_registration {
$all = 0; $all = 0;
} }
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new;
$c->log->debug("creating peer registration for subscriber '".$prov_subscriber->username.'@'.$prov_subscriber->domain->domain."'"); $c->log->debug("creating peer registration for subscriber '".$prov_subscriber->username.'@'.$prov_subscriber->domain->domain."'");
my $sid = $prov_subscriber->id; my $sid = $prov_subscriber->id;
@ -52,7 +50,7 @@ sub create_peer_registration {
$transport = $outbound_sock->{transport}; $transport = $outbound_sock->{transport};
} }
my @ret = $dispatcher->dispatch($c, "appserver", $all, 1, <<EOF); my @ret = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "appserver", $all, 1, <<EOF);
<?xml version="1.0"?> <?xml version="1.0"?>
<methodCall> <methodCall>
<methodName>db_reg_agent.createRegistration</methodName> <methodName>db_reg_agent.createRegistration</methodName>
@ -75,7 +73,7 @@ EOF
# remove reg from successsful backends # remove reg from successsful backends
foreach my $ret (grep {!$$_[1]} @ret) { # successful backends foreach my $ret (grep {!$$_[1]} @ret) { # successful backends
$dispatcher->dispatch($c, $$ret[0], 1, 1, <<EOF); NGCP::Panel::Utils::XMLDispatcher::dispatch($c, $$ret[0], 1, 1, <<EOF);
<?xml version="1.0"?> <?xml version="1.0"?>
<methodCall> <methodCall>
<methodName>db_reg_agent.removeRegistration</methodName> <methodName>db_reg_agent.removeRegistration</methodName>
@ -104,8 +102,6 @@ sub update_peer_registration {
$all = 0; $all = 0;
} }
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new;
$c->log->debug("trying to update peer registration for subscriber '".$prov_subscriber->username.'@'.$prov_subscriber->domain->domain."'"); $c->log->debug("trying to update peer registration for subscriber '".$prov_subscriber->username.'@'.$prov_subscriber->domain->domain."'");
my $sid = $prov_subscriber->id; my $sid = $prov_subscriber->id;
@ -126,7 +122,7 @@ sub update_peer_registration {
$c->log->debug("+++++++++++++++++++ uuid=$uuid"); $c->log->debug("+++++++++++++++++++ uuid=$uuid");
$c->log->debug("+++++++++++++++++++ contact=$contact"); $c->log->debug("+++++++++++++++++++ contact=$contact");
my @ret = $dispatcher->dispatch($c, "appserver", $all, 1, <<EOF); my @ret = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "appserver", $all, 1, <<EOF);
<?xml version="1.0"?> <?xml version="1.0"?>
<methodCall> <methodCall>
<methodName>db_reg_agent.updateRegistration</methodName> <methodName>db_reg_agent.updateRegistration</methodName>
@ -149,7 +145,7 @@ EOF
# undo update on successsful backends # undo update on successsful backends
foreach my $ret (grep {!$$_[1]} @ret) { # successful backends foreach my $ret (grep {!$$_[1]} @ret) { # successful backends
$dispatcher->dispatch($c, $$ret[0], 1, 1, <<EOF); NGCP::Panel::Utils::XMLDispatcher::dispatch($c, $$ret[0], 1, 1, <<EOF);
<?xml version="1.0"?> <?xml version="1.0"?>
<methodCall> <methodCall>
<methodName>db_reg_agent.updateRegistration</methodName> <methodName>db_reg_agent.updateRegistration</methodName>
@ -182,15 +178,13 @@ sub delete_peer_registration {
$all = 0; $all = 0;
} }
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new;
$c->log->debug("trying to delete peer registration for subscriber '".$prov_subscriber->username.'@'.$prov_subscriber->domain->domain."'"); $c->log->debug("trying to delete peer registration for subscriber '".$prov_subscriber->username.'@'.$prov_subscriber->domain->domain."'");
my $sid = $prov_subscriber->id; my $sid = $prov_subscriber->id;
my $uuid = $prov_subscriber->uuid; my $uuid = $prov_subscriber->uuid;
my $contact = $c->config->{sip}->{lb_ext}; my $contact = $c->config->{sip}->{lb_ext};
my @ret = $dispatcher->dispatch($c, "appserver", $all, 1, <<EOF); my @ret = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "appserver", $all, 1, <<EOF);
<?xml version="1.0"?> <?xml version="1.0"?>
<methodCall> <methodCall>
<methodName>db_reg_agent.removeRegistration</methodName> <methodName>db_reg_agent.removeRegistration</methodName>
@ -209,7 +203,7 @@ EOF
# remove reg from successsful backends # remove reg from successsful backends
foreach my $ret (grep {!$$_[1]} @ret) { # successful backends foreach my $ret (grep {!$$_[1]} @ret) { # successful backends
$dispatcher->dispatch($c, $ret[0], 1, 1, <<EOF); NGCP::Panel::Utils::XMLDispatcher::dispatch($c, $ret[0], 1, 1, <<EOF);
<?xml version="1.0"?> <?xml version="1.0"?>
<methodCall> <methodCall>
<methodName>db_reg_agent.createRegistration</methodName> <methodName>db_reg_agent.createRegistration</methodName>
@ -252,9 +246,7 @@ sub clear_audio_cache {
sub _clear_audio_cache_service { sub _clear_audio_cache_service {
my ($c, $service, $sound_set_id, $handle_name) = @_; my ($c, $service, $sound_set_id, $handle_name) = @_;
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new; my @ret = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, $service, 1, 1, <<EOF );
my @ret = $dispatcher->dispatch($c, $service, 1, 1, <<EOF );
<?xml version="1.0"?> <?xml version="1.0"?>
<methodCall> <methodCall>
<methodName>postDSMEvent</methodName> <methodName>postDSMEvent</methodName>
@ -310,8 +302,7 @@ sub dial_out {
my $caller_domain = $prov_subscriber->domain->domain; my $caller_domain = $prov_subscriber->domain->domain;
my $caller_password = $prov_subscriber->password; my $caller_password = $prov_subscriber->password;
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new; my $ret = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "appserver", 0, 1, <<EOF );
my $ret = $dispatcher->dispatch($c, "appserver", 0, 1, <<EOF );
<?xml version="1.0"?> <?xml version="1.0"?>
<methodCall> <methodCall>
<methodName>dial_auth_b2b</methodName> <methodName>dial_auth_b2b</methodName>
@ -348,9 +339,8 @@ sub party_call_control {
@{$data}{qw(caller callee callid status token)}; @{$data}{qw(caller callee callid status token)};
my $service = 'appserver'; my $service = 'appserver';
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new;
my @ret = $dispatcher->dispatch($c, $service, 1, 1, <<EOF ); my @ret = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, $service, 1, 1, <<EOF );
<?xml version="1.0"?> <?xml version="1.0"?>
<methodCall> <methodCall>
<methodName>postDSMEvent</methodName> <methodName>postDSMEvent</methodName>

@ -1,22 +1,13 @@
package NGCP::Panel::Utils::XMLDispatcher; package NGCP::Panel::Utils::XMLDispatcher;
use Sipwise::Base; use Sipwise::Base;
use NGCP::Schema;
use Net::HTTP; use Net::HTTP;
use Errno; use Errno;
use Moose;
has 'schema' => (
is => 'rw',
isa => 'DBIx::Class::Schema',
default => sub { return NGCP::Schema->connect() },
);
sub dispatch { sub dispatch {
my ($self, $c, $target, $all, $sync, $body) = @_; my ($c, $target, $all, $sync, $body, $schema) = @_;
my $schema = $self->schema; $schema //= $c->model('DB');
$c->log->info("dispatching to target $target, all=$all, sync=$sync"); $c->log->info("dispatching to target $target, all=$all, sync=$sync");
$c->log->debug("dispatching body $body"); $c->log->debug("dispatching body $body");
@ -87,14 +78,14 @@ sub dispatch {
next; next;
} }
$self->_queue(join("::", "%TG%", $meth, $ip, $port, $path, $hostid), $body); _queue(join("::", "%TG%", $meth, $ip, $port, $path, $hostid), $body, $schema);
push(@ret, [$hostid, -1]); push(@ret, [$hostid, -1]);
} }
if (!$all) { if (!$all) {
# failure on all hosts # failure on all hosts
$sync and return; $sync and return;
$self->_queue($target, $body); _queue($target, $body, $schema);
return [$target, -1]; return [$target, -1];
} }
@ -102,9 +93,9 @@ sub dispatch {
} }
sub _queue { sub _queue {
my ($self, $target, $body) = @_; my ($target, $body, $schema) = @_;
$self->schema->resultset('xmlqueue')->create({ $schema->resultset('xmlqueue')->create({
target => $target, target => $target,
body => $body, body => $body,
ctime => \"unix_timestamp()", ctime => \"unix_timestamp()",
@ -113,22 +104,22 @@ sub _queue {
} }
sub queuerunner { sub queuerunner {
my ($self) = @_; my ($schema) = @_;
for (;; sleep(1)) { for (;; sleep(1)) {
my $row = $self->_dequeue; my $row = _dequeue($schema);
$row or next; $row or next;
my @ret = $self->dispatch($row->target, 0, 1, $row->body); my @ret = dispatch(undef, $row->target, 0, 1, $row->body, $schema);
@ret and $self->_unqueue($row->id); @ret and _unqueue($row->id, $schema);
} }
} }
sub _dequeue { sub _dequeue {
my ($self) = @_; my ($schema) = @_;
my $row = $self->schema->resultset('xmlqueue')->search({ my $row = $schema->resultset('xmlqueue')->search({
next_try => {'<=' => \'unix_timestamp()'}, next_try => {'<=' => \'unix_timestamp()'},
},{ },{
order_by => 'id' order_by => 'id'
@ -145,13 +136,11 @@ sub _dequeue {
} }
sub _unqueue { sub _unqueue {
my ($self, $id) = @_; my ($id, $schema) = @_;
$self->schema->resultset('xmlqueue')->find($id)->delete; $schema->resultset('xmlqueue')->find($id)->delete;
} }
no Moose;
1; 1;
=head1 NAME =head1 NAME

@ -233,11 +233,10 @@ foreach my $redis_host(@redis_hosts) {
} }
} }
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new;
my $c = DummyController->new; my $c = DummyController->new;
foreach my $tag(@nonpriotags) { foreach my $tag(@nonpriotags) {
DEBUG "Tearing down normal call tag $tag for call id $tag2cid{$tag}..."; DEBUG "Tearing down normal call tag $tag for call id $tag2cid{$tag}...";
my @ret = $dispatcher->dispatch($c, "appserver", 1, 1, <<EOF); my @ret = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "appserver", 1, 1, <<EOF);
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<methodCall> <methodCall>
<methodName>di</methodName> <methodName>di</methodName>

Loading…
Cancel
Save