lib/facter/util/resolvers/networking/networking.rb in facter-4.5.2 vs lib/facter/util/resolvers/networking/networking.rb in facter-4.6.0
- old
+ new
@@ -52,11 +52,12 @@
'link'
elsif addrinfo.ipv6_sitelocal?
'site'
elsif addrinfo.ipv6_loopback?
'host'
- else 'global'
+ else
+ 'global'
end
scope6.join
end
def find_valid_binding(bindings)
@@ -100,20 +101,20 @@
private
def expand_interfaces(interfaces)
interfaces.each_value do |values|
expand_binding(values, values[:bindings]) if values[:bindings]
- expand_binding(values, values[:bindings6], false) if values[:bindings6]
+ expand_binding(values, values[:bindings6], ipv4_type: false) if values[:bindings6]
end
end
def expand_primary_interface(networking_facts, primary)
networking_facts[:interfaces][primary]&.each do |key, value|
networking_facts[key] = value unless %i[bindings bindings6].include?(key)
end
end
- def expand_binding(values, bindings, ipv4_type = true)
+ def expand_binding(values, bindings, ipv4_type: true)
binding = find_valid_binding(bindings)
ip_protocol_type = ipv4_type ? '' : '6'
values["ip#{ip_protocol_type}".to_sym] = binding[:address]
values["netmask#{ip_protocol_type}".to_sym] = binding[:netmask]