Merge pull request #161 from igalic/ipv6r

fix "absent" options

Author: bastelfreak

lib/puppet/provider/network_route/redhat.rb

@@ -86,11 +86,7 @@ def self.format_file(_filename, providers)
                   else
                     "#{provider.network}/#{provider.netmask} via #{provider.gateway} dev #{provider.interface}"
                   end
-      contents << if provider.options == :absent
-                    "\n"
-                  else
-                    " #{provider.options}\n"
-                  end
+      contents << (provider.options == :absent ? "\n" : " #{provider.options}\n")
     end
     contents.join
   end

lib/puppet/provider/network_route/routes.rb

@@ -91,7 +91,8 @@ def self.format_file(_filename, providers)
       raise Puppet::Error, "#{provider.name} is missing the required parameter 'gateway'." if provider.gateway.nil?
       raise Puppet::Error, "#{provider.name} is missing the required parameter 'interface'." if provider.interface.nil?
 
-      contents << "#{provider.network} #{provider.netmask} #{provider.gateway} #{provider.interface} #{provider.options}\n"
+      contents << "#{provider.network} #{provider.netmask} #{provider.gateway} #{provider.interface}"
+      contents << (provider.options == :absent ? "\n" : " #{provider.options}\n")
     end
 
     contents.join

spec/unit/provider/network_route/routes_spec.rb

@@ -107,6 +107,54 @@ def fixture_data(file)
         expect { content }.to raise_exception
       end
 
+      it 'should fail if the gateway property is not defined' do
+        route2_provider.unstub(:gateway)
+        route2_provider.stubs(:gateway).returns nil
+        expect { content }.to raise_exception
+      end
+    end
+  end
+  describe 'when formatting simple files' do
+    let(:route1_provider) do
+      stub('route1_provider',
+           name: '172.17.67.0',
+           network: '172.17.67.0',
+           netmask: '255.255.255.0',
+           gateway: '172.18.6.2',
+           interface: 'vlan200',
+           options: :absent,
+      )
+    end
+
+    let(:route2_provider) do
+      stub('lo_provider',
+           name: '172.28.45.0',
+           network: '172.28.45.0',
+           netmask: '255.255.255.0',
+           gateway: '172.18.6.2',
+           interface: 'eth0',
+           options: :absent,
+      )
+    end
+
+    let(:content) { described_class.format_file('', [route1_provider, route2_provider]) }
+
+    describe 'writing the route line' do
+      it 'should write only fields' do
+        expect(content.scan(/^172.17.67.0 .*$/).length).to eq(1)
+        expect(content.scan(/^172.17.67.0 .*$/).first.split(/\s/, 5).length).to eq(4)
+      end
+
+      it 'should have the correct fields appended' do
+        expect(content.scan(/^172.17.67.0 .*$/).first).to include('172.17.67.0 255.255.255.0 172.18.6.2 vlan200')
+      end
+
+      it 'should fail if the netmask property is not defined' do
+        route2_provider.unstub(:netmask)
+        route2_provider.stubs(:netmask).returns nil
+        expect { content }.to raise_exception
+      end
+
       it 'should fail if the gateway property is not defined' do
         route2_provider.unstub(:gateway)
         route2_provider.stubs(:gateway).returns nil