From bae1b06910deececdc57f4b55a67d31e41380268 Mon Sep 17 00:00:00 2001 From: Rene Krenn Date: Wed, 30 Jan 2019 01:38:52 +0100 Subject: [PATCH] TT#50974 ama: fix off-hook and disable destination_domain filter Change-Id: I48d999b3c59b13259d1efc1147a6f6049be1e1e3 (cherry picked from commit e54d587e55ac328b8ce33174d6f3334f132f7f89) --- lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/CDR.pm | 2 +- lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/settings.cfg | 2 +- .../BulkProcessor/Projects/Export/Ama/Ccs/settings.debug.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/CDR.pm b/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/CDR.pm index 7c26538..24f844d 100644 --- a/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/CDR.pm +++ b/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/CDR.pm @@ -326,7 +326,7 @@ sub _export_cdrs_init_context { $scenario->{duration} = $context->{cdrs}->[0]->{duration}; $scenario->{originating} = $context->{cdrs}->[0]->{$ama_originating_digits_cdr_field}; $scenario->{terminating} = $context->{cdrs}->[1]->{$ama_terminating_digits_cdr_field}; - $scenario->{unanswered} = ($context->{cdrs}->[1]->{call_status} != $NGCP::BulkProcessor::Dao::Trunk::accounting::cdr::OK_CALL_STATUS ? 1 : 0); + $scenario->{unanswered} = ($context->{cdrs}->[1]->{call_status} ne $NGCP::BulkProcessor::Dao::Trunk::accounting::cdr::OK_CALL_STATUS ? 1 : 0); $scenario->{correlation_id} = substr($context->{cdrs}->[0]->{id},-7); $scenario->{nod} = { originating_digits => $scenario->{originating}, diff --git a/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/settings.cfg b/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/settings.cfg index 82c0ea3..878979c 100755 --- a/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/settings.cfg +++ b/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/settings.cfg @@ -7,7 +7,7 @@ export_cdr_limit = 10000 export_cdr_stream = ama_ccs export_cdr_rollover_fsn = 1 -export_cdr_conditions = { 'accounting.cdr.destination_domain' => { 'IN' => '("80.110.2.164","ccs.upc.at")' } } +#export_cdr_conditions = { 'accounting.cdr.destination_domain' => { 'IN' => '("80.110.2.164","ccs.upc.at")' } } #export_cdr_conditions = { 'accounting.cdr.destination_domain' => { '=' => '"ccs.upc.at"' } } #{ 'accounting.cdr.export_status' => { '=' => '"unexported"' } }, { 'accounting.cdr.call_status' => { '=' => '"ok"' } }, { 'accounting.cdr.rating_status' => { '=' => '"ok"' } } #export_cdr_joins = { 'billing.voip_subscribers source_voip_subscribers' => { 'source_voip_subscribers.uuid' => 'accounting.cdr.source_user_id' } }, { 'billing.voip_subscribers destination_voip_subscribers' => { 'destination_voip_subscribers.uuid' => 'accounting.cdr.destination_user_id' } }, { 'billing.billing_zones_history source_carrier_bbz' => { 'source_carrier_bbz.id' => 'accounting.cdr.source_carrier_billing_zone_id' } }, { 'billing.billing_zones_history source_reseller_bbz' => { 'source_reseller_bbz.id' => 'accounting.cdr.source_reseller_billing_zone_id' } }, { 'billing.billing_zones_history source_customer_bbz' => { 'source_customer_bbz.id' => 'accounting.cdr.source_customer_billing_zone_id' } }, { 'billing.billing_zones_history destination_carrier_bbz' => { 'destination_carrier_bbz.id' => 'accounting.cdr.destination_carrier_billing_zone_id' } }, { 'billing.billing_zones_history destination_reseller_bbz' => { 'destination_reseller_bbz.id' => 'accounting.cdr.destination_reseller_billing_zone_id' } }, { 'billing.billing_zones_history destination_customer_bbz' => { 'destination_customer_bbz.id' => 'accounting.cdr.destination_customer_billing_zone_id' } } diff --git a/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/settings.debug.cfg b/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/settings.debug.cfg index 2a5b7d2..14537d6 100755 --- a/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/settings.debug.cfg +++ b/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/settings.debug.cfg @@ -7,7 +7,7 @@ export_cdr_stream = ama_ccs export_cdr_limit = 10000 export_cdr_rollover_fsn = 1 -export_cdr_conditions = { 'accounting.cdr.destination_domain' => { 'IN' => '("80.110.2.164","ccs.upc.at")' } } +#export_cdr_conditions = { 'accounting.cdr.destination_domain' => { 'IN' => '("80.110.2.164","ccs.upc.at")' } } #export_cdr_conditions = { 'accounting.cdr.destination_domain' => { '=' => '"ccs.upc.at"' } } #, { 'accounting.cdr.rating_status' => { '=' => '"ok"' } } #{ 'accounting.cdr.call_status' => { '=' => '"ok"' } }