Merge pull request voxpupuli#47 from jhoblitt/redhat_provider_tagged_…

…interfaces Redhat provider tagged interfaces
aelsabbahy · Jul 11, 2013 · f01aa12 · f01aa12
2 parents 0522487 + 66f66cc
commit f01aa12
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 3 deletions.
diff --git a/lib/puppet/provider/network_config/redhat.rb b/lib/puppet/provider/network_config/redhat.rb
@@ -21,8 +21,11 @@
   # @return [String] The path to network-script directory on redhat systems
   SCRIPT_DIRECTORY = "/etc/sysconfig/network-scripts"
 
+  # 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]]
+
   # @return [Regexp] The regular expression for interface scripts on redhat systems
-  SCRIPT_REGEX     = %r[\Aifcfg-[a-z]+\d+(?::\d)?\Z]
+  SCRIPT_REGEX     = %r[\Aifcfg-[a-z]+\d+(?::\d+|\.#{vlan_range_regex})?\Z]
 
   NAME_MAPPINGS = {
     :ipaddress  => 'IPADDR',

diff --git a/spec/fixtures/provider/network_config/redhat_spec/network-scripts/ifcfg-eth0.0 b/spec/fixtures/provider/network_config/redhat_spec/network-scripts/ifcfg-eth0.0
@@ -0,0 +1,9 @@
+DEVICE="eth0.0"
+VLAN="yes"
+BOOTPROTO="none"
+IPV6INIT="no"
+MTU="9000"
+NM_CONTROLLED="no"
+ONBOOT="yes"
+TYPE="Ethernet"
+BRIDGE="br1"
diff --git a/spec/fixtures/provider/network_config/redhat_spec/network-scripts/ifcfg-eth0.1 b/spec/fixtures/provider/network_config/redhat_spec/network-scripts/ifcfg-eth0.1
@@ -0,0 +1,9 @@
+DEVICE="eth0.1"
+VLAN="yes"
+BOOTPROTO="none"
+IPV6INIT="no"
+MTU="9000"
+NM_CONTROLLED="no"
+ONBOOT="yes"
+TYPE="Ethernet"
+BRIDGE="br1"
diff --git a/spec/fixtures/provider/network_config/redhat_spec/network-scripts/ifcfg-eth0.4095 b/spec/fixtures/provider/network_config/redhat_spec/network-scripts/ifcfg-eth0.4095
@@ -0,0 +1,9 @@
+DEVICE="eth0.4095"
+VLAN="yes"
+BOOTPROTO="none"
+IPV6INIT="no"
+MTU="9000"
+NM_CONTROLLED="no"
+ONBOOT="yes"
+TYPE="Ethernet"
+BRIDGE="br4095"
diff --git a/spec/fixtures/provider/network_config/redhat_spec/network-scripts/ifcfg-eth0.4096 b/spec/fixtures/provider/network_config/redhat_spec/network-scripts/ifcfg-eth0.4096
@@ -0,0 +1,9 @@
+DEVICE="eth0.4096"
+VLAN="yes"
+BOOTPROTO="none"
+IPV6INIT="no"
+MTU="9000"
+NM_CONTROLLED="no"
+ONBOOT="yes"
+TYPE="Ethernet"
+BRIDGE="br4095"
diff --git a/spec/fixtures/provider/network_config/redhat_spec/network-scripts/ifcfg-eth0:10000000 b/spec/fixtures/provider/network_config/redhat_spec/network-scripts/ifcfg-eth0:10000000
@@ -0,0 +1,9 @@
+DEVICE="eth0:10000000"
+IPADDR="10.10.10.10"
+NETMASK="255.255.255.0"
+BOOTPROTO="none"
+IPV6INIT="no"
+MTU="9000"
+NM_CONTROLLED="no"
+ONBOOT="yes"
+TYPE="Ethernet"
diff --git a/spec/unit/provider/network_config/redhat_spec.rb b/spec/unit/provider/network_config/redhat_spec.rb
@@ -31,9 +31,11 @@ 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-vlan300 ifcfg-vlan400 ifcfg-vlan500 ifcfg-eth0.0
+                     ifcfg-eth0.1 ifcfg-eth0.4095 ifcfg-eth0:10000000]
 
-    invalid_files = %w[.ifcfg-bond0.swp ifcfg-bond1~ ifcfg-vlan500.bak]
+    invalid_files = %w[.ifcfg-bond0.swp ifcfg-bond1~ ifcfg-vlan500.bak
+                       ifcfg-eth0.4096]
 
     valid_files.each do |file|
       it { should be_include file }