build a simple structured networking fact for older facter versions, refs saz#293

Author: saz

lib/puppet/functions/ssh/ipaddresses.rb

@@ -17,8 +17,24 @@ def ipaddresses(excluded_interfaces = [])
     # always exclude loopback interface
     excluded_interfaces += ['lo']
 
+    if !facts['networking'].nil? && !facts['networking'].empty?
+      interfaces = facts['networking']['interfaces']
+    else
+      interfaces = {}
+      facts['interfaces'].split(',').each do |iface|
+        next if facts["ipaddress_#{iface}"].nil? && facts["ipaddress6_#{iface}"].nil?
+        interfaces[iface] = {}
+        if !facts["ipaddress_#{iface}"].nil? && !facts["ipaddress_#{iface}"].empty?
+          interfaces[iface]['bindings'] = [{ 'address' => facts["ipaddress_#{iface}"] }]
+        end
+        if !facts["ipaddress6_#{iface}"].nil? && !facts["ipaddress6_#{iface}"].empty?
+          interfaces[iface]['bindings6'] = [{ 'address' => facts["ipaddress6_#{iface}"] }]
+        end
+      end
+    end
+
     result = []
-    facts['networking']['interfaces'].each do |iface, data|
+    interfaces.each do |iface, data|
       # skip excluded interfaces
       next if excluded_interfaces.include?(iface)
 

spec/functions/ssh/ipaddresses_spec.rb

@@ -5,7 +5,7 @@
     is_expected.not_to be_nil
   end
 
-  context 'with dummy fact data' do
+  context 'with dummy structured fact data' do
     let(:facts) do
       JSON.parse File.read(File.join(File.dirname(__FILE__), '../../fixtures/mock-interface-fact.json'))
     end
@@ -27,4 +27,33 @@
       end
     end
   end
+
+  context 'with dummy legacy fact data' do
+    let(:facts) do
+      {
+        networking: {},
+        interfaces: 'lo,docker0,eno1',
+        ipaddress_lo: '127.0.0.1',
+        ipaddress_eno1: '10.13.42.61',
+        ipaddress_docker0: '172.17.0.1'
+      }
+    end
+
+    describe 'without parameters' do
+      it 'returns all IPs other than localhost' do
+        is_expected.to run.and_return(['172.17.0.1', '10.13.42.61'])
+      end
+    end
+
+    describe 'with excluded interface' do
+      it 'doesn\'t return the IPs of excluded interface' do
+        is_expected.to run.with_params(['docker0']).and_return(['10.13.42.61'])
+      end
+    end
+    describe 'with excluded interfaces' do
+      it 'doesn\'t return the IPs of those interfaces' do
+        is_expected.to run.with_params(%w[docker0 eno1]).and_return([])
+      end
+    end
+  end
 end