From: david22swan <david.swan@puppet.com>
Date: Wed, 30 Mar 2022 12:01:31 +0000 (+0100)
Subject: (GH-C&T-7) Remove code specific to unsupported OSs
X-Git-Tag: v3.5.0~6^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1ebfba05038e10ac2438978198024ca6005181db;p=puppet-modules%2Fpuppetlabs-firewall.git

(GH-C&T-7) Remove code specific to unsupported OSs
---

diff --git a/provision.yaml b/provision.yaml
index 43201c3..f42a647 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -16,7 +16,6 @@ travis_deb:
 travis_ub_6:
   provisioner: docker
   images:
-  - litmusimage/ubuntu:14.04
   - litmusimage/ubuntu:16.04
   - litmusimage/ubuntu:18.04
   - litmusimage/ubuntu:20.04
diff --git a/spec/acceptance/firewall_attributes_exceptions_spec.rb b/spec/acceptance/firewall_attributes_exceptions_spec.rb
index cf5f144..08af13c 100644
--- a/spec/acceptance/firewall_attributes_exceptions_spec.rb
+++ b/spec/acceptance/firewall_attributes_exceptions_spec.rb
@@ -1375,7 +1375,7 @@ describe 'firewall basics', docker: true do
   describe 'condition', condition_parameter_test: false do
     context 'is set' do
       pp = <<-PUPPETCODE
-        if $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['full'], '14.04') > 0 {
+        if $facts['os']['name'] == 'Ubuntu' {
           firewall { '010 isblue ipv4':
             ensure    => 'present',
             condition => '! isblue',
@@ -1389,7 +1389,7 @@ describe 'firewall basics', docker: true do
       it 'applies' do
         apply_manifest(pp)
       end
-      if fetch_os_name == 'ubuntu' && os[:release].to_i > 14
+      if fetch_os_name == 'ubuntu'
         it 'contains the rule' do
           run_shell('iptables-save') do |r|
             expect(r.stdout).to match(%r{-A INPUT -i enp0s8 -p icmp -m condition ! --condition "isblue"  -m comment --comment "010 isblue ipv4" -j DROP})
diff --git a/spec/unit/classes/firewall_linux_spec.rb b/spec/unit/classes/firewall_linux_spec.rb
index 4239104..755de35 100644
--- a/spec/unit/classes/firewall_linux_spec.rb
+++ b/spec/unit/classes/firewall_linux_spec.rb
@@ -28,7 +28,7 @@ describe 'firewall::linux', type: :class do
 
   ['Debian', 'Ubuntu'].each do |os|
     context "Debian Like: operatingsystem => #{os}" do
-      releases = ((os == 'Debian') ? ['8'] : ['14.04'])
+      releases = ((os == 'Debian') ? ['10'] : ['20.04'])
       releases.each do |osrel|
         let(:facts) do
           {
diff --git a/spec/unit/facter/iptables_persistent_version_spec.rb b/spec/unit/facter/iptables_persistent_version_spec.rb
index 04ff63f..82af6ce 100644
--- a/spec/unit/facter/iptables_persistent_version_spec.rb
+++ b/spec/unit/facter/iptables_persistent_version_spec.rb
@@ -6,12 +6,12 @@ describe 'Facter::Util::Fact iptables_persistent_version' do
   context 'when iptables-persistent applicable' do
     before(:each) { Facter.clear }
 
-    let(:dpkg_cmd) { "dpkg-query -Wf '${Version}' iptables-persistent 2>/dev/null" }
+    let(:dpkg_cmd) { "dpkg-query -Wf '${Version}' netfilter-persistent 2>/dev/null" }
 
     {
       'Ubuntu' => '0.5.3ubuntu2',
     }.each do |os, ver|
-      os_release = '14.04'
+      os_release = '20.04'
 
       describe "#{os} package installed" do
         before(:each) do
@@ -27,7 +27,7 @@ describe 'Facter::Util::Fact iptables_persistent_version' do
     describe 'Ubuntu package not installed' do
       before(:each) do
         allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Ubuntu')
-        allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('14.04')
+        allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('20.04')
         allow(Facter::Util::Resolution).to receive(:exec).with(dpkg_cmd)
                                                          .and_return(nil)
       end