]> review.fuel-infra Code Review - puppet-modules/puppetlabs-firewall.git/commitdiff
mac_source is downcased by iptables also on debian-11 pdksync_IAC-1709/main/add_debian_11_support
authoradrianiurca <adrian.iurca@gmail.com>
Sun, 8 Aug 2021 21:21:50 +0000 (00:21 +0300)
committeradrianiurca <adrian.iurca@gmail.com>
Sun, 8 Aug 2021 21:49:54 +0000 (00:49 +0300)
lib/puppet/type/firewall.rb
spec/acceptance/firewall_attributes_ipv6_happy_path_spec.rb

index 428174f585c4c4d3066a7a87cc414e0aa7f8d01e..bd57ce9562967770a6d2483315f6ec46829a3884 100644 (file)
@@ -1852,7 +1852,7 @@ Puppet::Type.newtype(:firewall) do
     newvalues(%r{^([0-9a-f]{2}[:]){5}([0-9a-f]{2})$}i)
     facter_os_name = Facter.value(:os)['name'].downcase
     facter_os_release = Facter.value(:os)['release']['major'].to_i
-    if facter_os_name == 'sles' && facter_os_release == 15
+    if ['debian-11', 'sles-15'].include?("#{facter_os_name}-#{facter_os_release}")
       munge do |value|
         _value = value.downcase
       end
index 96291e48a6c32eea220c3418eba4b1bef49e3d1f..e2772f2c35cf8a6163629c72d33f5cf9f05cf4c6 100644 (file)
@@ -321,7 +321,7 @@ describe 'firewall attribute testing, happy path', unless: (os[:family] == 'redh
       expect(result.stdout).to match(%r{-A INPUT -p tcp -m iprange --dst-range 2001:db8::1-2001:db8::ff -m multiport --dports 602 -m comment --comment "602 - dst_range" -j ACCEPT})
     end
     it 'mac_source is set' do
-      expect(result.stdout).to match(%r{-A INPUT -s 2001:db8::1\/(128|ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff) -p tcp -m mac --mac-source 0A:1B:3C:4D:5E:6F -m comment --comment "604 - mac_source"})
+      expect(result.stdout).to match(%r{-A INPUT -s 2001:db8::1\/(128|ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff) -p tcp -m mac --mac-source 0(a|A):1(b|B):3(c|C):4(d|D):5(e|E):6(f|F) -m comment --comment "604 - mac_source"}) # rubocop:disable Layout/LineLength
     end
     it 'socket when true' do
       expect(result.stdout).to match(%r{-A INPUT -p tcp -m multiport --dports 605 -m socket -m comment --comment "605 - socket true" -j ACCEPT})