From f9ce228e76de6b9a6e6f1f5081976b5a50699276 Mon Sep 17 00:00:00 2001 From: Andreas Granig Date: Thu, 17 Dec 2015 13:32:05 +0100 Subject: [PATCH] MT#16985 Rename CentralDB to RoDB Change-Id: I3e4fcf39dc2323213e3f3a69c3bac375421f6bd4 --- lib/NGCP/Panel/Controller/API/Interceptions.pm | 4 ++-- lib/NGCP/Panel/Controller/API/InterceptionsItem.pm | 4 ++-- lib/NGCP/Panel/Model/{CentralDB.pm => RoDB.pm} | 2 +- lib/NGCP/Panel/Model/{CentralDB => RoDB}/Base.pm | 6 +++--- lib/NGCP/Panel/Role/API/Interceptions.pm | 2 +- ngcp_panel.conf | 3 +++ 6 files changed, 12 insertions(+), 9 deletions(-) rename lib/NGCP/Panel/Model/{CentralDB.pm => RoDB.pm} (95%) rename lib/NGCP/Panel/Model/{CentralDB => RoDB}/Base.pm (91%) diff --git a/lib/NGCP/Panel/Controller/API/Interceptions.pm b/lib/NGCP/Panel/Controller/API/Interceptions.pm index 143ca1510e..e6f8d05da7 100644 --- a/lib/NGCP/Panel/Controller/API/Interceptions.pm +++ b/lib/NGCP/Panel/Controller/API/Interceptions.pm @@ -160,7 +160,7 @@ sub POST :Allow { my ($self, $c) = @_; my $guard = $c->model('DB')->txn_scope_guard; - my $cguard = $c->model('CentralDB')->txn_scope_guard; + my $cguard = $c->model('RoDB')->txn_scope_guard; { my $resource = $self->get_valid_post_data( c => $c, @@ -175,7 +175,7 @@ sub POST :Allow { form => $form, ); - my $num_rs = $c->model('CentralDB')->resultset('voip_numbers')->search( + my $num_rs = $c->model('RoDB')->resultset('voip_numbers')->search( \[ 'concat(cc,ac,sn) = ?', [ {} => $resource->{number} ]] ); unless($num_rs->first) { diff --git a/lib/NGCP/Panel/Controller/API/InterceptionsItem.pm b/lib/NGCP/Panel/Controller/API/InterceptionsItem.pm index c79d0886b0..88d5f7ed1a 100644 --- a/lib/NGCP/Panel/Controller/API/InterceptionsItem.pm +++ b/lib/NGCP/Panel/Controller/API/InterceptionsItem.pm @@ -87,7 +87,7 @@ sub OPTIONS :Allow { sub PATCH :Allow { my ($self, $c, $id) = @_; - my $cguard = $c->model('CentralDB')->txn_scope_guard; + my $cguard = $c->model('RoDB')->txn_scope_guard; my $guard = $c->model('DB')->txn_scope_guard; { my $preference = $self->require_preference($c); @@ -152,7 +152,7 @@ sub PATCH :Allow { sub PUT :Allow { my ($self, $c, $id) = @_; - my $cguard = $c->model('CentralDB')->txn_scope_guard; + my $cguard = $c->model('RoDB')->txn_scope_guard; my $guard = $c->model('DB')->txn_scope_guard; { my $preference = $self->require_preference($c); diff --git a/lib/NGCP/Panel/Model/CentralDB.pm b/lib/NGCP/Panel/Model/RoDB.pm similarity index 95% rename from lib/NGCP/Panel/Model/CentralDB.pm rename to lib/NGCP/Panel/Model/RoDB.pm index 32ce9fb5d0..97f9c7cd98 100644 --- a/lib/NGCP/Panel/Model/CentralDB.pm +++ b/lib/NGCP/Panel/Model/RoDB.pm @@ -1,4 +1,4 @@ -package NGCP::Panel::Model::CentralDB; +package NGCP::Panel::Model::RoDB; use strict; use File::ShareDir 'dist_file'; diff --git a/lib/NGCP/Panel/Model/CentralDB/Base.pm b/lib/NGCP/Panel/Model/RoDB/Base.pm similarity index 91% rename from lib/NGCP/Panel/Model/CentralDB/Base.pm rename to lib/NGCP/Panel/Model/RoDB/Base.pm index bfa25effde..2268b11a19 100644 --- a/lib/NGCP/Panel/Model/CentralDB/Base.pm +++ b/lib/NGCP/Panel/Model/RoDB/Base.pm @@ -1,7 +1,7 @@ -package NGCP::Panel::Model::CentralDB::Base; +package NGCP::Panel::Model::RoDB::Base; #use base 'Catalyst::Model::Adaptor'; use base 'Catalyst::Model'; -use NGCP::Panel::Model::CentralDB; +use NGCP::Panel::Model::RoDB; use Moose; @@ -69,6 +69,6 @@ __PACKAGE__->config( has 'schema' => ( is => 'rw', - isa => 'NGCP::Panel::Model::CentralDB', + isa => 'NGCP::Panel::Model::RoDB', ); 1; diff --git a/lib/NGCP/Panel/Role/API/Interceptions.pm b/lib/NGCP/Panel/Role/API/Interceptions.pm index 568282ed8f..452ac1a993 100644 --- a/lib/NGCP/Panel/Role/API/Interceptions.pm +++ b/lib/NGCP/Panel/Role/API/Interceptions.pm @@ -153,7 +153,7 @@ sub update_item { sub subres_from_number { my ($self, $c, $number) = @_; - my $num_rs = $c->model('CentralDB')->resultset('voip_numbers')->search( + my $num_rs = $c->model('RoDB')->resultset('voip_numbers')->search( \[ 'concat(cc,ac,sn) = ?', [ {} => $number ]] ); unless($num_rs->first) { diff --git a/ngcp_panel.conf b/ngcp_panel.conf index 9edab90145..cad4bd992d 100644 --- a/ngcp_panel.conf +++ b/ngcp_panel.conf @@ -18,6 +18,9 @@ log4perl.appender.Default.layout.ConversionPattern=%d{ISO8601} [%p] [%F +%L] %m{ schema_class NGCP::Schema + + schema_class NGCP::RoSchema + email postmaster@domain.invalid