Merge pull request #229 from lukebigum/master

Allow Type network_config to take a Numeric value for the MTU parameter

Author: igalic

lib/puppet/type/network_config.rb

@@ -87,8 +87,14 @@
     validate do |value|
       # reject floating point and negative integers
       # XXX this lets 1500.0 pass
-      unless value =~ %r{^\d+$}
-        raise ArgumentError, "#{value} is not a valid mtu (must be a positive integer)"
+      if value.is_a? Numeric
+        unless value.integer?
+          raise ArgumentError, "#{value} is not a valid mtu (must be a positive integer)"
+        end
+      else
+        unless value =~ %r{^\d+$}
+          raise ArgumentError, "#{value} is not a valid mtu (must be a positive integer)"
+        end
       end
 
       # Intel 82598 & 82599 chips support MTUs up to 16110; is there any

spec/unit/type/network_config_spec.rb

@@ -146,14 +146,26 @@
         Puppet::Type.type(:network_config).new(name: 'yay', mtu: '42')
       end
 
+      it 'validates a tiny mtu size as a number' do
+        Puppet::Type.type(:network_config).new(name: 'yay', mtu: 42)
+      end
+
       it 'validates a normal mtu size' do
         Puppet::Type.type(:network_config).new(name: 'yay', mtu: '1500')
       end
 
+      it 'validates a normal mtu size as a number' do
+        Puppet::Type.type(:network_config).new(name: 'yay', mtu: 1500)
+      end
+
       it 'validates a large mtu size' do
         Puppet::Type.type(:network_config).new(name: 'yay', mtu: '16384')
       end
 
+      it 'validates a large mtu size as a number' do
+        Puppet::Type.type(:network_config).new(name: 'yay', mtu: 16_384)
+      end
+
       it 'fails if an random string is passed' do
         expect do
           Puppet::Type.type(:network_config).new(name: 'yay', mtu: 'This is clearly not a mtu')
@@ -166,29 +178,59 @@
         end.to raise_error
       end
 
+      it 'fails on numeric values < 42' do
+        expect do
+          Puppet::Type.type(:network_config).new(name: 'yay', mtu: 41)
+        end.to raise_error
+      end
+
       it 'fails on zero' do
         expect do
           Puppet::Type.type(:network_config).new(name: 'yay', mtu: '0')
         end.to raise_error
       end
 
+      it 'fails on numeric zero' do
+        expect do
+          Puppet::Type.type(:network_config).new(name: 'yay', mtu: 0)
+        end.to raise_error
+      end
+
       it 'fails on values > 65536' do
         expect do
           Puppet::Type.type(:network_config).new(name: 'yay', mtu: '65537')
         end.to raise_error
       end
 
+      it 'fails on numeric values > 65536' do
+        expect do
+          Puppet::Type.type(:network_config).new(name: 'yay', mtu: 65_537)
+        end.to raise_error
+      end
+
       it 'fails on negative values' do
         expect do
           Puppet::Type.type(:network_config).new(name: 'yay', mtu: '-1500')
         end.to raise_error
       end
 
+      it 'fails on negative numbers' do
+        expect do
+          Puppet::Type.type(:network_config).new(name: 'yay', mtu: -1500)
+        end.to raise_error
+      end
+
       it 'fails on non-integer values' do
         expect do
           Puppet::Type.type(:network_config).new(name: 'yay', mtu: '1500.1')
         end.to raise_error
       end
+
+      it 'fails on numeric non-integer values' do
+        expect do
+          Puppet::Type.type(:network_config).new(name: 'yay', mtu: 1500.1)
+        end.to raise_error
+      end
     end
 
     describe 'mode' do