Skip to content

Commit

Permalink
add src/dst_network_type_id to CDR. refs #1643 (#1656)
Browse files Browse the repository at this point in the history 
* add src/dst_network_type_id to CDR. refs #1643
* routing returns src/dst_network_type_id
  • Loading branch information
@dmitry-sinina
dmitry-sinina authored Dec 16, 2024
1 parent a24781f commit b26b5d1
Show file tree
Hide file tree
Showing 19 changed files with 5,945 additions and 34 deletions.
2 changes: 2 additions & 0 deletions app/admin/cdr/cdrs.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,10 @@ def scoped_collection

row :src_country
row :src_network
row :src_network_type
row :dst_country
row :dst_network
row :dst_network_type

row :node
row :pop
Expand Down
10 changes: 8 additions & 2 deletions app/models/cdr/cdr.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
# dst_area_id :integer(4)
# dst_country_id :integer(4)
# dst_network_id :integer(4)
# dst_network_type_id :integer(2)
# dump_level_id :integer(2)
# failed_resource_id :bigint(8)
# failed_resource_type_id :integer(2)
Expand All @@ -138,6 +139,7 @@
# src_area_id :integer(4)
# src_country_id :integer(4)
# src_network_id :integer(4)
# src_network_type_id :integer(2)
# term_call_id :string
# term_gw_external_id :bigint(8)
# term_gw_id :integer(4)
Expand Down Expand Up @@ -201,8 +203,8 @@ class Cdr::Cdr < Cdr::Base
ADMIN_PRELOAD_LIST = %i[
dialpeer routing_group destination
auth_orig_transport_protocol sign_orig_transport_protocol
src_network src_country
dst_network dst_country
src_network src_country src_network_type
dst_network dst_country dst_network_type
routing_plan vendor
term_gw orig_gw customer_auth vendor_acc customer_acc
dst_area customer rateplan pop src_area lnp_database
Expand Down Expand Up @@ -234,10 +236,14 @@ class Cdr::Cdr < Cdr::Base
belongs_to :node, class_name: 'Node', foreign_key: :node_id, optional: true
belongs_to :pop, class_name: 'Pop', foreign_key: :pop_id, optional: true
belongs_to :pop, class_name: 'Pop', foreign_key: :pop_id, optional: true

belongs_to :src_network, class_name: 'System::Network', foreign_key: :src_network_id, optional: true
belongs_to :src_network_type, class_name: 'System::NetworkType', foreign_key: :src_network_type_id, optional: true
belongs_to :src_country, class_name: 'System::Country', foreign_key: :src_country_id, optional: true
belongs_to :dst_network, class_name: 'System::Network', foreign_key: :dst_network_id, optional: true
belongs_to :dst_network_type, class_name: 'System::NetworkType', foreign_key: :dst_network_type_id, optional: true
belongs_to :dst_country, class_name: 'System::Country', foreign_key: :dst_country_id, optional: true

belongs_to :lnp_database, class_name: 'Lnp::Database', foreign_key: :lnp_database_id, optional: true
belongs_to :auth_orig_transport_protocol, class_name: 'Equipment::TransportProtocol', foreign_key: :auth_orig_transport_protocol_id, optional: true
belongs_to :sign_orig_transport_protocol, class_name: 'Equipment::TransportProtocol', foreign_key: :sign_orig_transport_protocol_id, optional: true
Expand Down
2 changes: 2 additions & 0 deletions app/models/report/realtime/bad_routing.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
# dst_area_id :integer(4)
# dst_country_id :integer(4)
# dst_network_id :integer(4)
# dst_network_type_id :integer(2)
# dump_level_id :integer(2)
# failed_resource_id :bigint(8)
# failed_resource_type_id :integer(2)
Expand All @@ -138,6 +139,7 @@
# src_area_id :integer(4)
# src_country_id :integer(4)
# src_network_id :integer(4)
# src_network_type_id :integer(2)
# term_call_id :string
# term_gw_external_id :bigint(8)
# term_gw_id :integer(4)
Expand Down
2 changes: 2 additions & 0 deletions app/models/report/realtime/not_authenticated.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
# dst_area_id :integer(4)
# dst_country_id :integer(4)
# dst_network_id :integer(4)
# dst_network_type_id :integer(2)
# dump_level_id :integer(2)
# failed_resource_id :bigint(8)
# failed_resource_type_id :integer(2)
Expand All @@ -138,6 +139,7 @@
# src_area_id :integer(4)
# src_country_id :integer(4)
# src_network_id :integer(4)
# src_network_type_id :integer(2)
# term_call_id :string
# term_gw_external_id :bigint(8)
# term_gw_id :integer(4)
Expand Down
2 changes: 2 additions & 0 deletions app/models/report/realtime/origination_performance.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
# dst_area_id :integer(4)
# dst_country_id :integer(4)
# dst_network_id :integer(4)
# dst_network_type_id :integer(2)
# dump_level_id :integer(2)
# failed_resource_id :bigint(8)
# failed_resource_type_id :integer(2)
Expand All @@ -138,6 +139,7 @@
# src_area_id :integer(4)
# src_country_id :integer(4)
# src_network_id :integer(4)
# src_network_type_id :integer(2)
# term_call_id :string
# term_gw_external_id :bigint(8)
# term_gw_id :integer(4)
Expand Down
2 changes: 2 additions & 0 deletions app/models/report/realtime/termination_distribution.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
# dst_area_id :integer(4)
# dst_country_id :integer(4)
# dst_network_id :integer(4)
# dst_network_type_id :integer(2)
# dump_level_id :integer(2)
# failed_resource_id :bigint(8)
# failed_resource_type_id :integer(2)
Expand All @@ -138,6 +139,7 @@
# src_area_id :integer(4)
# src_country_id :integer(4)
# src_network_id :integer(4)
# src_network_type_id :integer(2)
# term_call_id :string
# term_gw_external_id :bigint(8)
# term_gw_id :integer(4)
Expand Down
Loading

0 comments on commit b26b5d1

Please sign in to comment.