Merge pull request #248 from KeithWard/fix_invalid_vlan_regex

Correct VLAN_RANGE_REGEX.

Author: bastelfreak

lib/puppet/provider/network_config/redhat.rb

@@ -22,7 +22,7 @@
   SCRIPT_DIRECTORY = '/etc/sysconfig/network-scripts'.freeze
 
   # The valid vlan ID range is 0-4095; 4096 is out of range
-  VLAN_RANGE_REGEX = %r{\d{1,3}|40[0-9][0-5]}
+  VLAN_RANGE_REGEX = %r{[1-3]?\d{1,3}|40[0-8]\d|409[0-5]}
 
   # @return [Regexp] The regular expression for interface scripts on redhat systems
   SCRIPT_REGEX     = %r{\Aifcfg-[a-z]+[a-z\d]+(?::\d+|\.#{VLAN_RANGE_REGEX})?\Z}

spec/fixtures/provider/network_config/redhat_spec/network-scripts/ifcfg-bond1.1001

@@ -0,0 +1,5 @@
+VLAN=yes
+DEVICE=bond1.1001
+BOOTPROTO=static
+NETMASK=255.255.255.0
+IPADDR=172.24.66.1

spec/unit/provider/network_config/redhat_spec.rb

@@ -30,7 +30,8 @@ def fixture_data(file)
     valid_files = %w[ifcfg-bond0 ifcfg-bond1 ifcfg-eth0 ifcfg-eth1 ifcfg-eth2
                      ifcfg-eth3 ifcfg-vlan100 ifcfg-vlan100:0 ifcfg-vlan200
                      ifcfg-vlan300 ifcfg-vlan400 ifcfg-vlan500 ifcfg-eth0.0
-                     ifcfg-eth0.1 ifcfg-eth0.4095 ifcfg-eth0:10000000]
+                     ifcfg-eth0.1 ifcfg-eth0.4095 ifcfg-eth0:10000000
+                     ifcfg-bond1.1001]
 
     invalid_files = %w[.ifcfg-bond0.swp ifcfg-bond1~ ifcfg-vlan500.bak
                        ifcfg-eth0.4096]