lib/resolvers/aix/networking_resolver.rb in facter-4.0.28 vs lib/resolvers/aix/networking_resolver.rb in facter-4.0.29

@@ -13,20 +13,62 @@
           def post_resolve(fact_name)
             @fact_list.fetch(fact_name) { read_netstat(fact_name) }
           end
 
           def read_netstat(fact_name)
+            @fact_list[:interfaces] = {}
             output = Facter::Core::Execution.execute('netstat -rn', logger: log)
-            output = output.split("\n").select { |line| (line =~ /\s\s[0-9]+.[0-9]+.[0-9]+.[0-9]+|\s\s.*:[0-9a-f]+/) }
-            get_primary_interface_info(output)
+            output = output.each_line.select { |line| (line =~ /\s\s[0-9]+.[0-9]+.[0-9]+.[0-9]+|\s\s.*:[0-9a-f]+/) }
+            extract_interfaces(output)
 
+            populate_with_mtu_and_mac!(@fact_list[:interfaces])
+            get_primary_interface_info(output)
+            ::Resolvers::Utils::Networking.expand_main_bindings(@fact_list)
             @fact_list[fact_name]
           end
 
           def get_primary_interface_info(output)
-            primary_interface_info = output.find { |line| line =~ /=>/ }.split(' ')
-            @fact_list[:primary] = primary_interface_info[5]
-            @fact_list[:ip] = primary_interface_info[1]
+            primary_interface_info = output.find { |line| line =~ /=>/ }&.split(' ')
+            @fact_list[:primary_interface] = primary_interface_info[5] if primary_interface_info
+          end
+
+          def extract_interfaces(netstat_output)
+            netstat_output.each do |line|
+              next if line =~ /default/
+
+              info = line.split("\s")
+              mask_length = info[0].match(%r{/([0-9]+)|%([0-9]+)})
+              next unless mask_length
+
+              is_ipv4 = info[1] =~ /[0-9]+.[0-9]+.[0-9]+.[0-9]+/
+              build_bindings(info[5], info[1], mask_length[1] || mask_length[2], is_ipv4)
+            end
+          end
+
+          def build_bindings(name, ip, mask_length, is_ipv4)
+            bind_to_add = is_ipv4 ? :bindings : :bindings6
+            ip = ip.gsub(/%[0-9]$/, '') # remove mask information if it exists
+            mask_length = mask_length.to_i - 1 unless is_ipv4
+            @fact_list[:interfaces][name] ||= {}
+            @fact_list[:interfaces][name][bind_to_add] ||= []
+            @fact_list[:interfaces][name][bind_to_add] << ::Resolvers::Utils::Networking.build_binding(ip, mask_length)
+          end
+
+          def populate_with_mtu_and_mac!(interfaces)
+            output = Facter::Core::Execution.execute('netstat -in', logger: log)
+            output.each_line do |line|
+              next if line =~ /Name\s/
+
+              info = line.split("\s")
+              interface_name = info[0]
+              mac = info[3][/^([0-9a-f]{1,2}[\.:-]){5}([0-9a-f]{1,2})$/]
+              interfaces[interface_name][:mtu] = info[1].to_i
+              interfaces[interface_name][:mac] = format_mac_address(mac) if mac
+            end
+          end
+
+          def format_mac_address(address)
+            address.split('.').map { |e| format('%<mac_address>02s', mac_address: e) }.join(':').tr(' ', '0')
           end
         end
       end
     end
   end