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

TT#21112 remove Moose from some modules

Browse Source 
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
71 changed files with 80 additions and 154 deletions
Show Stats Download Patch File Download Diff File

4
lib/NGCP/Panel/Controller/Domain.pm
Unescape View File

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

6
lib/NGCP/Panel/Controller/Logout.pm
Unescape View File

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

6
lib/NGCP/Panel/Controller/Root.pm
Unescape View File

@ -1,8 +1,10 @@
package NGCP::Panel::Controller::Root;
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 NGCP::Panel::Utils::DateTime qw();

1
lib/NGCP/Panel/Controller/Sound.pm
Unescape View File

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

1
lib/NGCP/Panel/Controller/Subscriber.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/AliasNumber.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/BillingNetwork.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/BillingProfile.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/BillingZone.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/Contact.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/ContactNoReseller.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/ContactWithReseller.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/Contract.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/ContractBalance.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/Country.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/CustomerContract.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/DataTable.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/DatePicker.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/DateTime.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/Device.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/DeviceConfig.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/Domain.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/EmailList.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/EmailTemplate.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/EmergencyMappingContainer.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/IPAddress.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/Identifier.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/Interval.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/InvoiceTemplate.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/LnpCarrier.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/MonthPicker.pm
Unescape View File

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

2
lib/NGCP/Panel/Field/NumRangeAPI.pm
Unescape View File

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

2
lib/NGCP/Panel/Field/NumberStatusSelect.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/PbxCustomerContract.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/PbxGroup.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/PbxGroupAPI.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/PbxGroupMemberAPI.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/Product.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/ProfileNetwork.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/ProfilePackage.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/Regexp.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/Reseller.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/ResellerContract.pm
Unescape View File

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

2
lib/NGCP/Panel/Field/ResellerStatusSelect.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/RewriteRuleAPI.pm
Unescape View File

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

2
lib/NGCP/Panel/Field/SubscriberDestinationSet.pm
Unescape View File

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

2
lib/NGCP/Panel/Field/SubscriberLockSelect.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/SubscriberPbxGroup.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/SubscriberProfile.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/SubscriberProfileSet.pm
Unescape View File

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

2
lib/NGCP/Panel/Field/SubscriberSourceSet.pm
Unescape View File

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

2
lib/NGCP/Panel/Field/SubscriberStatusSelect.pm
Unescape View File

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

2
lib/NGCP/Panel/Field/SubscriberTimeSet.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/TimezoneSelect.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/URI.pm
Unescape View File

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

1
lib/NGCP/Panel/Field/Voucher.pm
Unescape View File

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

3
lib/NGCP/Panel/Role/API/Domains.pm
Unescape View File

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

1
lib/NGCP/Panel/Role/API/Preferences.pm
Unescape View File

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

6
lib/NGCP/Panel/Utils/DeviceBootstrap/Grandstream.pm
Unescape View File

@ -53,19 +53,19 @@ sub unregister_content {
return $self->{unregister_content};
}
override 'parse_rpc_response_page' => sub {
around 'parse_rpc_response_page' => sub {
my($self, $page) = @_;
my $res = JSON::from_json($page);
return $res;
};
override 'parse_rpc_response' => sub {
around 'parse_rpc_response' => sub {
my($self,$rpc_response) = @_;
return $rpc_response;
};
#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 $res = '';

4
lib/NGCP/Panel/Utils/DeviceBootstrap/Panasonic.pm
Unescape View File

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

9
lib/NGCP/Panel/Utils/DeviceBootstrap/Polycom.pm
Unescape View File

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

8
lib/NGCP/Panel/Utils/DeviceBootstrap/Snom.pm
Unescape View File

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

13
lib/NGCP/Panel/Utils/DeviceBootstrap/VendorRPC.pm
Unescape View File

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

7
lib/NGCP/Panel/Utils/DeviceBootstrap/Yealink.pm
Unescape View File

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

15
lib/NGCP/Panel/Utils/Kamailio.pm
Unescape View File

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

6
lib/NGCP/Panel/Utils/Peering.pm
Unescape View File

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

3
lib/NGCP/Panel/Utils/Rewrite.pm
Unescape View File

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

12
lib/NGCP/Panel/Utils/Security.pm
Unescape View File

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

28
lib/NGCP/Panel/Utils/Sems.pm
Unescape View File

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

39
lib/NGCP/Panel/Utils/XMLDispatcher.pm
Unescape View File

@ -1,22 +1,13 @@
package NGCP::Panel::Utils::XMLDispatcher;
use Sipwise::Base;
use NGCP::Schema;
use Net::HTTP;
use Errno;
use Moose;
has 'schema' => (
is => 'rw',
isa => 'DBIx::Class::Schema',
default => sub { return NGCP::Schema->connect() },
);
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->debug("dispatching body $body");
@ -87,14 +78,14 @@ sub dispatch {
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]);
}
if (!$all) {
# failure on all hosts
$sync and return;
$self->_queue($target, $body);
_queue($target, $body, $schema);
return [$target, -1];
}
@ -102,9 +93,9 @@ sub dispatch {
}
sub _queue {
my ($self, $target, $body) = @_;
my ($target, $body, $schema) = @_;
$self->schema->resultset('xmlqueue')->create({
$schema->resultset('xmlqueue')->create({
target => $target,
body => $body,
ctime => \"unix_timestamp()",
@ -113,22 +104,22 @@ sub _queue {
}
sub queuerunner {
my ($self) = @_;
my ($schema) = @_;
for (;; sleep(1)) {
my $row = $self->_dequeue;
my $row = _dequeue($schema);
$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 {
my ($self) = @_;
my ($schema) = @_;
my $row = $self->schema->resultset('xmlqueue')->search({
my $row = $schema->resultset('xmlqueue')->search({
next_try => {'<=' => \'unix_timestamp()'},
},{
order_by => 'id'
@ -145,13 +136,11 @@ sub _dequeue {
}
sub _unqueue {
my ($self, $id) = @_;
my ($id, $schema) = @_;
$self->schema->resultset('xmlqueue')->find($id)->delete;
$schema->resultset('xmlqueue')->find($id)->delete;
}
no Moose;
1;
=head1 NAME

3
tools_bin/ngcp-emergency-mode
Unescape View File

@ -233,11 +233,10 @@ foreach my $redis_host(@redis_hosts) {
}
}
my $dispatcher = NGCP::Panel::Utils::XMLDispatcher->new;
my $c = DummyController->new;
foreach my $tag(@nonpriotags) {
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"?>
<methodCall>
<methodName>di</methodName>

Write Preview
Loading…
Cancel
Save