From 53f32134cdf844ea8352535ef39b0e5238a843c6 Mon Sep 17 00:00:00 2001 From: Rene Krenn Date: Fri, 1 Sep 2017 16:15:49 +0200 Subject: [PATCH] TT#21083 implement Teletek/generic importer #2 + fix process umask + make it work with new files from Teletek Change-Id: I82ed65d5d6bae9cff911fdbc2d56a5a130d8cb44 --- .../Projects/Migration/Teletek/Provisioning.pm | 11 ++++++----- .../Projects/Migration/Teletek/config.cfg | 12 ++++++------ .../Projects/Migration/Teletek/settings.cfg | 7 +++++-- lib/NGCP/BulkProcessor/Utils.pm | 2 +- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/lib/NGCP/BulkProcessor/Projects/Migration/Teletek/Provisioning.pm b/lib/NGCP/BulkProcessor/Projects/Migration/Teletek/Provisioning.pm index d32a9302..e7784b6e 100644 --- a/lib/NGCP/BulkProcessor/Projects/Migration/Teletek/Provisioning.pm +++ b/lib/NGCP/BulkProcessor/Projects/Migration/Teletek/Provisioning.pm @@ -122,7 +122,8 @@ sub provision_subscribers { uninit_process_context_code => sub { my ($context)= @_; undef $context->{db}; - print('non-unique contacts: ' . join("\n",keys %{$context->{nonunique_contacts}})); + _warn($context,'non-unique contacts: ' . join("\n",keys %{$context->{nonunique_contacts}})) + if (scalar keys %{$context->{nonunique_contacts}}) > 0; destroy_all_dbs(); { lock $warning_count; @@ -240,7 +241,7 @@ sub _provision_subscribers_checks { $context->{reseller_map}->{$resellername} = NGCP::BulkProcessor::Dao::Trunk::billing::resellers::findby_name($resellername); }; if ($@ or not $context->{reseller_map}->{$resellername}) { - rowprocessingerror(threadid(),"cannot find reseller $resellername",getlogger(__PACKAGE__)); + rowprocessingerror(threadid(),"cannot find reseller '$resellername'",getlogger(__PACKAGE__)); $result = 0; #even in skip-error mode.. } else { $context->{reseller_map}->{$resellername}->{billingprofile_map} = {}; @@ -251,7 +252,7 @@ sub _provision_subscribers_checks { $context->{domain_map}->{$domain} = NGCP::BulkProcessor::Dao::Trunk::billing::domains::findby_domain($domain); }; if ($@ or not $context->{domain_map}->{$domain}) { - rowprocessingerror(threadid(),"cannot find domain $domain (billing)",getlogger(__PACKAGE__)); + rowprocessingerror(threadid(),"cannot find domain '$domain' (billing)",getlogger(__PACKAGE__)); $result = 0; #even in skip-error mode.. } else { eval { @@ -259,7 +260,7 @@ sub _provision_subscribers_checks { NGCP::BulkProcessor::Dao::Trunk::provisioning::voip_domains::findby_domain($domain); }; if ($@ or not $context->{domain_map}->{$domain}->{prov_domain}) { - rowprocessingerror(threadid(),"cannot find domain $domain (provisioning)",getlogger(__PACKAGE__)); + rowprocessingerror(threadid(),"cannot find domain '$domain' (provisioning)",getlogger(__PACKAGE__)); $result = 0; #even in skip-error mode.. } } @@ -286,7 +287,7 @@ sub _provision_subscribers_checks { )->[0]; }; if ($@ or not $context->{reseller_map}->{$resellername}->{billingprofile_map}->{$billingprofilename}) { - rowprocessingerror(threadid(),"cannot find billing profile $billingprofilename of reseller $resellername",getlogger(__PACKAGE__)); + rowprocessingerror(threadid(),"cannot find billing profile '$billingprofilename' of reseller '$resellername'",getlogger(__PACKAGE__)); $result = 0; #even in skip-error mode.. } } diff --git a/lib/NGCP/BulkProcessor/Projects/Migration/Teletek/config.cfg b/lib/NGCP/BulkProcessor/Projects/Migration/Teletek/config.cfg index 5a277b74..8b69bdd0 100644 --- a/lib/NGCP/BulkProcessor/Projects/Migration/Teletek/config.cfg +++ b/lib/NGCP/BulkProcessor/Projects/Migration/Teletek/config.cfg @@ -1,5 +1,5 @@ ##general settings: -working_path = /var/sipwise/Migration/Teletek +working_path = /home/rkrenn/temp/teletek cpucount = 4 enablemultithreading = 0 @@ -9,35 +9,35 @@ jobservers = 127.0.0.1:4730 #provisioning_conf = /etc/ngcp-panel/provisioning.conf ##NGCP MySQL connectivity - "accounting" db: -accounting_host = 127.0.0.1 +accounting_host = 192.168.0.84 accounting_port = 3306 accounting_databasename = accounting accounting_username = root accounting_password = ##NGCP MySQL connectivity - "billing" db: -billing_host = 192.168.0.212 +billing_host = 192.168.0.84 billing_port = 3306 billing_databasename = billing billing_username = root billing_password = ##NGCP MySQL connectivity - "provisioning" db: -provisioning_host = 192.168.0.212 +provisioning_host = 192.168.0.84 provisioning_port = 3306 provisioning_databasename = provisioning provisioning_username = root provisioning_password = ##NGCP MySQL connectivity - "kamailio" db: -kamailio_host = 192.168.0.212 +kamailio_host = 192.168.0.84 kamailio_port = 3306 kamailio_databasename = kamailio kamailio_username = root kamailio_password = ##NGCP MySQL connectivity - default db for distributed transactions (XA) to connect to: -xa_host = 192.168.0.212 +xa_host = 192.168.0.84 xa_port = 3306 xa_databasename = ngcp xa_username = root diff --git a/lib/NGCP/BulkProcessor/Projects/Migration/Teletek/settings.cfg b/lib/NGCP/BulkProcessor/Projects/Migration/Teletek/settings.cfg index 21763243..61a6f499 100644 --- a/lib/NGCP/BulkProcessor/Projects/Migration/Teletek/settings.cfg +++ b/lib/NGCP/BulkProcessor/Projects/Migration/Teletek/settings.cfg @@ -6,14 +6,17 @@ import_multithreading = 0 #subscriber_filename = /home/rkrenn/test/teletek/teletek_format.txt #subscriber_filename = /home/rkrenn/test/teletek/teletek_format_test1.txt #subscriber_filename = /home/rkrenn/test/teletek/teletek_format_test2.txt -subscriber_filename = /home/rkrenn/test/teletek/export_kundinfo_leica2.csv +#subscriber_filename = /home/rkrenn/test/teletek/export_kundinfo_leica2.csv +subscriber_filename = /home/rkrenn/temp/teletek/export_nummer_sip3.csv subscriber_import_numofthreads = 2 ignore_subscriber_unique = 1 subscriber_import_single_row_txn = 1 subscriber_import_unfold_ranges = 1 -allowedcli_filename = /home/rkrenn/test/teletek/export_multiple_DID_Leica.csv +#allowedcli_filename = /home/rkrenn/test/teletek/export_multiple_DID_Leica.csv +#allowedcli_filename = /home/rkrenn/temp/teletek/export_screeningOnly_170824.csv +allowedcli_filename = /home/rkrenn/temp/teletek/export_MultipleDID_170823.csv allowedcli_import_numofthreads = 2 ignore_allowedcli_unique = 1 allowedcli_import_single_row_txn = 1 diff --git a/lib/NGCP/BulkProcessor/Utils.pm b/lib/NGCP/BulkProcessor/Utils.pm index 40b14104..ceb97e5c 100644 --- a/lib/NGCP/BulkProcessor/Utils.pm +++ b/lib/NGCP/BulkProcessor/Utils.pm @@ -107,7 +107,7 @@ our @EXPORT_OK = qw( check_ipnet ); -our $chmod_umask = 0644; +our $chmod_umask = 0777; my $default_epsilon = 1e-3; #float comparison tolerance