Fix rubocop issues

ool-mddo · Sep 3, 2024 · c7b1624 · c7b1624
1 parent 9b80075
commit c7b1624
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 23 deletions.
diff --git a/lib/convert_namespace/namespace_convert_table/node_name_table.rb b/lib/convert_namespace/namespace_convert_table/node_name_table.rb
@@ -84,7 +84,7 @@ def make_pass_through_node_table(src_nw)
       # @param [Netomox::Topology::Networks] src_nws Source networks
       # @return [void]
       def make_table(src_nws)
-        super(src_nws)
+        super
         # convert table (for layer3, ospf-area)
         make_layer3_node_table(@src_nws.find_network('layer3'))
 

diff --git a/lib/convert_namespace/namespace_convert_table/ospf_proc_id_table.rb b/lib/convert_namespace/namespace_convert_table/ospf_proc_id_table.rb
@@ -40,7 +40,7 @@ def key?(node_name, proc_id = nil)
       # @param [Netomox::Topology::Networks] src_nws Source networks
       # @return [void]
       def make_table(src_nws)
-        super(src_nws)
+        super
         src_nw_list = @src_nws.find_all_networks_by_type(Netomox::NWTYPE_MDDO_OSPF_AREA)
         return if src_nw_list.empty?
 

diff --git a/lib/convert_namespace/namespace_convert_table/static_route_tp_table.rb b/lib/convert_namespace/namespace_convert_table/static_route_tp_table.rb
@@ -42,7 +42,7 @@ def key?(route_key, route_tp_name = nil)
       # @param [Netomox::Topology::Networks] src_nws Source networks
       # @return [void]
       def make_table(src_nws)
-        super(src_nws)
+        super
         src_nw = @src_nws.find_network('layer3')
         src_nw.nodes.each do |src_node|
           src_node.attribute.static_routes.each { |route| add_static_route_entry(src_node, route) }

diff --git a/lib/convert_namespace/namespace_convert_table/term_point_name_table.rb b/lib/convert_namespace/namespace_convert_table/term_point_name_table.rb
@@ -104,7 +104,7 @@ def make_pass_through_tp_table(src_nw)
       # @param [Netomox::Topology::Networks] src_nws Source networks
       # @return [void]
       def make_table(src_nws)
-        super(src_nws)
+        super
 
         # convert table (for layer3, ospf-area)
         make_layer3_tp_table(@src_nws.find_network('layer3'))

diff --git a/lib/convert_namespace/namespace_converter.rb b/lib/convert_namespace/namespace_converter.rb
@@ -42,7 +42,7 @@ def initialize
     # @return [void]
     # @raise [StandardError] if @src_nws is not initialized
     def load_origin_topology(topology_data)
-      super(topology_data)
+      super
 
       @convert_table.load_from_topology(topology_data)
     end

diff --git a/lib/topology_builder/l1_l3_data_builder.rb b/lib/topology_builder/l1_l3_data_builder.rb
@@ -10,14 +10,14 @@ module TopologyBuilder
     class L1L3DataBuilder < L1DataBuilder
       # @param [String] target Target network (config) data name
       def initialize(target:, debug: false)
-        super(target:, debug:)
+        super
 
         @ip_owners = CSVMapper::IPOwnersTable.new(target)
       end
 
       # @return [Netomox::PseudoDSL::PNetworks] Networks contains only layer1 network topology
       def make_networks
-        super()
+        super
 
         add_unlinked_ip_owner_tp
         @networks

diff --git a/lib/usecase_deliverer/pni/external_as_topology/bgp_proc_data_builder.rb b/lib/usecase_deliverer/pni/external_as_topology/bgp_proc_data_builder.rb
@@ -59,7 +59,7 @@ def layer3_tp_addr_str(layer3_tp)
   def bgp_proc_ibgp_router_pairs(bgp_proc_core_node)
     @peer_list.map { |peer_item| peer_item[:bgp_proc] }
               .append({ node_name: bgp_proc_core_node.name, node: bgp_proc_core_node })
-              .concat(find_all_bgp_proc_ebgp_candidate_routers.map { |node| { node_name: node.name, node: node } })
+              .concat(find_all_bgp_proc_ebgp_candidate_routers.map { |node| { node_name: node.name, node: } })
               .combination(2)
               .to_a
   end

diff --git a/lib/usecase_deliverer/pni/external_as_topology/bgp_proc_data_builder_ibgp_links.rb b/lib/usecase_deliverer/pni/external_as_topology/bgp_proc_data_builder_ibgp_links.rb
@@ -13,7 +13,7 @@ def find_all_bgp_proc_ebgp_candidate_routers
 
   private
 
-  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 
   # @param [Netomox::PseudoDSL::PNode] bgp_proc_node1 bgp-proc node
   # @param [Netomox::PseudoDSL::PNode] bgp_proc_node2 bgp-proc node
@@ -33,17 +33,17 @@ def find_layer3_link_between_node(bgp_proc_node1, bgp_proc_node2)
       raise StandardError, "Layer3 link not found between: #{link_str}"
     end
   end
-  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
   # @param [String] local_ip
   # @param [String] remote_ip
   # @return [Hash] bgp_proc tp attribute
   def bgp_proc_tp_ibgp_attribute(local_ip, remote_ip)
     {
       local_as: @as_state[:ext_asn],
-      local_ip: local_ip,
+      local_ip:,
       remote_as: @as_state[:ext_asn], # iBGP
-      remote_ip: remote_ip,
+      remote_ip:,
       import_policies: [POLICY_PASS_ALL[:name]],
       export_policies: [POLICY_ADV_ALL_PREFIXES[:name]]
     }

diff --git a/lib/usecase_deliverer/pni/external_as_topology/bgp_proc_data_builder_routers.rb b/lib/usecase_deliverer/pni/external_as_topology/bgp_proc_data_builder_routers.rb
@@ -60,7 +60,7 @@ def bgp_proc_tp_ebgp_attribute(peer_item, preferred_peer, layer3_tp)
     }
   end
 
-  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 
   # @param [Hash] peer_item Peer item
   # @param [Netomox::PseudoDSL::PNode] layer3_node Layer3 node
@@ -83,7 +83,7 @@ def add_bgp_proc_edge_router_node_tp(peer_item, preferred_peer, layer3_node, lay
 
     [bgp_proc_node, bgp_proc_tp]
   end
-  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
   # @param [Hash] peer_item Peer-item
   # @return [void]

diff --git a/lib/usecase_deliverer/pni/external_as_topology/int_as_data_builder.rb b/lib/usecase_deliverer/pni/external_as_topology/int_as_data_builder.rb
@@ -66,7 +66,7 @@ def target_ebgp_peer?(bgp_proc_tp, remote_asn)
     tp_attr.remote_as == remote_asn && @params['allowed_peers'].include?(tp_attr.remote_ip)
   end
 
-  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 
   # @param [Netomox::Topology::Node] bgp_proc_node Internal-AS eBGP node
   # @param [Netomox::Topology::TermPoint] bgp_proc_tp Internal-AS eBGP term-point
@@ -90,7 +90,7 @@ def make_peer_item(bgp_proc_node, bgp_proc_tp)
       }
     }
   end
-  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
   # @param [Integer] remote_asn Remote ASN
   # @return [Array<Hash>] peer list

diff --git a/lib/usecase_deliverer/pni/external_as_topology/layer3_data_builder.rb b/lib/usecase_deliverer/pni/external_as_topology/layer3_data_builder.rb
@@ -75,7 +75,7 @@ def add_layer3_bdlink(node1, tp1, node2, tp2)
   def layer3_ibgp_router_pairs(layer3_core_node)
     @peer_list.map { |peer_item| peer_item[:layer3] }
               .append({ node_name: layer3_core_node.name, node: layer3_core_node })
-              .concat(find_all_layer3_ebgp_candidate_routers.map { |node| { node_name: node.name, node: node } })
+              .concat(find_all_layer3_ebgp_candidate_routers.map { |node| { node_name: node.name, node: } })
               .combination(2)
               .to_a
   end

diff --git a/lib/usecase_deliverer/pni/external_as_topology/layer3_data_builder_endpoint.rb b/lib/usecase_deliverer/pni/external_as_topology/layer3_data_builder_endpoint.rb
@@ -4,6 +4,8 @@
 class Layer3DataBuilder < IntASDataBuilder
   private
 
+  # rubocop:disable Metrics/MethodLength
+
   # @param [String] flow_prefix Prefix (e.g. a.b.c.d/xx)
   # @return [Hash] Segment ip address table
   # @raise [StandardError] Endpoint segment is too small
@@ -23,6 +25,7 @@ def flow_addr_table(flow_prefix)
       endpoint_addr_prefix: "#{endpoint_addr}/#{endpoint_addr.prefix}"
     }
   end
+  # rubocop:enable Metrics/MethodLength
 
   # @param [Netomox::PseudoDSL::PNode] layer3_core_node Core router
   # @param [Hash] addrs Segment ip address table
@@ -40,6 +43,8 @@ def add_core_node_tp_for_endpoint(layer3_core_node, addrs)
     [layer3_core_node, layer3_core_tp]
   end
 
+  # rubocop:disable Metrics/MethodLength
+
   # @param [String] ep_name Endpoint node name
   # @param [Hash] addrs Segment ip address table
   # @return [Array(Netomox::PseudoDSL::PNode, Netomox::PseudoDSL::PTermPoint)] Added node/tp
@@ -60,6 +65,7 @@ def add_layer3_endpoint_node_tp(ep_name, addrs)
 
     [layer3_endpoint_node, layer3_endpoint_tp]
   end
+  # rubocop:enable Metrics/MethodLength
 
   # @param [String] tp1_name Name of term-point1
   # @param [String] tp2_name Name of term-point2

diff --git a/lib/usecase_deliverer/pni/external_as_topology/layer3_data_builder_ibgp_links.rb b/lib/usecase_deliverer/pni/external_as_topology/layer3_data_builder_ibgp_links.rb
@@ -56,7 +56,7 @@ def add_seg_node_tp_by_l3_pair(tp1_name, tp2_name, link_ip_str)
     [layer3_seg_node, layer3_seg_tp1, layer3_seg_tp2]
   end
 
-  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 
   # @param [Array<Hash>] peer_item_l3_pair Peer item (layer3 part)
   # @return [void]
@@ -83,5 +83,5 @@ def add_layer3_ibgp_links(peer_item_l3_pair)
       add_layer3_bdlink(layer3_seg_node, layer3_seg_tp2, layer3_node2, layer3_tp2)
     end
   end
-  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 end
diff --git a/lib/usecase_deliverer/pni/external_as_topology/layer3_data_builder_routers.rb b/lib/usecase_deliverer/pni/external_as_topology/layer3_data_builder_routers.rb
@@ -44,7 +44,7 @@ def add_layer3_core_router
     layer3_core_node
   end
 
-  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 
   # @param [Hash] peer_item Peer-item
   # @param [Integer] peer_index
@@ -70,7 +70,7 @@ def add_layer3_edge_router_node_tp(peer_item, peer_index, segment_ip)
     # memo to peer_item
     peer_item[:layer3][:node] = layer3_node
   end
-  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
   # @param [Hash] peer_item Peer-item
   # @param [Integer] peer_index
@@ -84,6 +84,8 @@ def add_layer3_edge_router(peer_item, peer_index)
     add_layer3_edge_router_node_tp(peer_item, peer_index, segment_ip)
   end
 
+  # rubocop:disable Metrics/MethodLength
+
   # @param [Hash] add_link One of a parameter from @params['add_links']
   # @param [IPAddr] link_segment_ip IP Address of eBGP link segment
   # @return [Array(Netomox::PseudoDSL::PNode, Netomox::PseudoDSL::PTermPoint)] Added node/tp
@@ -106,6 +108,7 @@ def add_layer3_ext_as_candidate_node_tp(add_link, link_segment_ip)
 
     [layer3_ext_node, layer3_ext_tp]
   end
+  # rubocop:enable Metrics/MethodLength
 
   # @param [Hash] add_link One of a parameter from @params['add_links']
   # @return [Array(Netomox::Topology::Node, Netomox::Topology::TermPoint)] found node/tp

diff --git a/lib/usecase_deliverer/pni/external_as_topology/p_network.rb b/lib/usecase_deliverer/pni/external_as_topology/p_network.rb
@@ -6,7 +6,7 @@ module Netomox
   module PseudoDSL
     # pseudo network
     class PNetwork
-      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/MethodLength
 
       # @param [String] node1 Node1 name
       # @param [String] node2 Node2 name
@@ -31,7 +31,7 @@ def find_link_between_node(node1, node2)
           PLink.new(link1.src, link2.dst)
         end
       end
-      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/MethodLength
 
       # @param [PNode] node (upper layer node)
       # @return [PNode, nil] supported node