diff --git a/Build.PL b/Build.PL index 6c1621f37f..d0d4dac4d7 100644 --- a/Build.PL +++ b/Build.PL @@ -33,6 +33,7 @@ my $builder = Local::Module::Build->new( 'HTML::FormHandler::Moose' => 0, 'HTML::FormHandler::Widget::Block::Bootstrap' => 0, 'Log::Log4perl::Catalyst' => 0, + 'Module::Runtime' => 0, 'Moose' => 2, 'Moose::Role' => 0, 'Moose::Util::TypeConstraints' => 0, diff --git a/lib/NGCP/Panel/Model/billing.pm b/lib/NGCP/Panel/Model/billing.pm index d5fb40bc47..919c48500c 100644 --- a/lib/NGCP/Panel/Model/billing.pm +++ b/lib/NGCP/Panel/Model/billing.pm @@ -1,6 +1,10 @@ package NGCP::Panel::Model::billing; +use Sipwise::Base; +use Module::Runtime qw(use_module); -use strict; -use base 'Catalyst::Model::DBIC::Schema'; +extends 'Catalyst::Model::DBIC::Schema'; -1; +__PACKAGE__->config( + connect_info => + use_module(NGCP::Panel->config->{'Model::billing'}{schema_class})->config->as_hash->{billingdb} +); diff --git a/lib/NGCP/Panel/Model/provisioning.pm b/lib/NGCP/Panel/Model/provisioning.pm index 8fe0ec2af8..86b8134d08 100644 --- a/lib/NGCP/Panel/Model/provisioning.pm +++ b/lib/NGCP/Panel/Model/provisioning.pm @@ -1,6 +1,10 @@ package NGCP::Panel::Model::provisioning; +use Sipwise::Base; +use Module::Runtime qw(use_module); -use strict; -use base 'Catalyst::Model::DBIC::Schema'; +extends 'Catalyst::Model::DBIC::Schema'; -1; +__PACKAGE__->config( + connect_info => + use_module(NGCP::Panel->config->{'Model::provisioning'}{schema_class})->config->as_hash->{provisioningdb} +); diff --git a/ngcp_panel.conf b/ngcp_panel.conf index de547f85b0..17fdf57781 100644 --- a/ngcp_panel.conf +++ b/ngcp_panel.conf @@ -12,16 +12,8 @@ log4perl.appender.Default.layout.ConversionPattern=%d{ISO8601} [%p] [%F +%L] %m{ schema_class NGCP::Schema::billing - - dsn "dbi:mysql:dbname=billing" - user root - schema_class NGCP::Schema::provisioning - - dsn = "dbi:mysql:dbname=provisioning" - user root -