From a49823876e83614bbc0980515f0814ba37773dfb Mon Sep 17 00:00:00 2001
From: Alan Moore <alan.moore@canonical.com>
Date: Thu, 6 Feb 2025 14:44:03 +0000
Subject: [PATCH] Clean up ufw sysctl.conf in all tests Created tests for ufw
 case

---
 shared/templates/sysctl/oval.template          |  2 +-
 shared/templates/sysctl/tests/comment.fail.sh  |  4 ++++
 .../tests/correct_etc_ufw_correct_rt.pass.sh   | 18 ++++++++++++++++++
 .../tests/correct_etc_ufw_wrong_rt.fail.sh     | 17 +++++++++++++++++
 .../sysctl/tests/correct_value.pass.sh         |  4 ++++
 .../sysctl/tests/correct_value_usr_lib.pass.sh |  6 +++++-
 .../tests/correct_value_usr_local_lib.pass.sh  |  7 ++++++-
 .../sysctl/tests/line_not_there.fail.sh        |  4 ++++
 .../tests/one_sysctl_conf_one_sysctl_d.pass.sh |  4 ++++
 ...ysctl_conf_one_sysctl_d_conflicting.fail.sh |  4 ++++
 .../sysctl/tests/symlink_conflicting.fail.sh   |  4 ++++
 .../tests/symlink_different_option.pass.sh     |  4 ++++
 .../tests/symlink_repeated_sysctl_conf.pass.sh |  4 ++++
 .../tests/symlink_root_duplicate.pass.sh       |  4 ++++
 .../symlink_root_duplicate_conflicting.fail.sh |  2 +-
 .../tests/symlink_root_incompliant.fail.sh     |  4 ++++
 .../sysctl/tests/symlink_same_option.pass.sh   |  4 ++++
 .../sysctl/tests/symlinks_to_same_file.pass.sh |  4 ++++
 .../sysctl/tests/two_sysctls_on_d.pass.sh      |  4 ++++
 .../tests/two_sysctls_on_d_conflicting.fail.sh |  4 ++++
 .../tests/two_sysctls_on_same_file.pass.sh     |  4 ++++
 .../two_sysctls_on_same_file_name.pass.sh      |  4 ++++
 ...sctls_on_same_file_name_conflicting.fail.sh |  4 ++++
 .../tests/wrong_etc_ufw_correct_rt.fail.sh     | 17 +++++++++++++++++
 .../sysctl/tests/wrong_runtime.fail.sh         |  4 ++++
 .../tests/wrong_usr_lib_correct_etc.pass.sh    |  4 ++++
 .../tests/wrong_usr_lib_wrong_etc.fail.sh      |  4 ++++
 .../templates/sysctl/tests/wrong_value.fail.sh |  4 ++++
 .../tests/wrong_value_d_directory.fail.sh      |  4 ++++
 .../tests/wrong_value_usr_local_lib.fail.sh    |  4 ++++
 30 files changed, 157 insertions(+), 4 deletions(-)
 create mode 100644 shared/templates/sysctl/tests/correct_etc_ufw_correct_rt.pass.sh
 create mode 100644 shared/templates/sysctl/tests/correct_etc_ufw_wrong_rt.fail.sh
 create mode 100644 shared/templates/sysctl/tests/wrong_etc_ufw_correct_rt.fail.sh

diff --git a/shared/templates/sysctl/oval.template b/shared/templates/sysctl/oval.template
index 17d466ea7e5..2b2931db929 100644
--- a/shared/templates/sysctl/oval.template
+++ b/shared/templates/sysctl/oval.template
@@ -205,7 +205,7 @@
     </set>
   </ind:textfilecontent54_object>
   <ind:textfilecontent54_object id="object_static_sysctl_{{{ rule_id }}}" version="1">
-{{% if product in [ "ubuntu2004", "ubuntu2204", "ubuntu2404" ] %}}
+{{% if "ubuntu" in product %}}
     <ind:filepath operation="pattern match">/etc(/ufw){0,1}/sysctl.conf$</ind:filepath>
 {{% else %}}
     <ind:filepath>/etc/sysctl.conf</ind:filepath>
diff --git a/shared/templates/sysctl/tests/comment.fail.sh b/shared/templates/sysctl/tests/comment.fail.sh
index 793963a9bb4..08894132609 100644
--- a/shared/templates/sysctl/tests/comment.fail.sh
+++ b/shared/templates/sysctl/tests/comment.fail.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 echo "# {{{ SYSCTLVAR }}} = {{{ SYSCTL_CORRECT_VALUE }}}" >> /etc/sysctl.conf
diff --git a/shared/templates/sysctl/tests/correct_etc_ufw_correct_rt.pass.sh b/shared/templates/sysctl/tests/correct_etc_ufw_correct_rt.pass.sh
new file mode 100644
index 00000000000..b631d7fcbaa
--- /dev/null
+++ b/shared/templates/sysctl/tests/correct_etc_ufw_correct_rt.pass.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# platform = multi_platform_ubuntu
+{{% if SYSCTLVAL == "" %}}
+# variables = sysctl_{{{ SYSCTLID }}}_value={{{ SYSCTL_CORRECT_VALUE }}}
+{{% endif %}}
+
+# Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
+
+sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
+
+echo "{{{ SYSCTLVAR }}} = {{{ SYSCTL_CORRECT_VALUE }}}" >> /etc/ufw/sysctl.conf
+
+sysctl -w {{{ SYSCTLVAR }}}="{{{ SYSCTL_CORRECT_VALUE }}}"
diff --git a/shared/templates/sysctl/tests/correct_etc_ufw_wrong_rt.fail.sh b/shared/templates/sysctl/tests/correct_etc_ufw_wrong_rt.fail.sh
new file mode 100644
index 00000000000..d7dfaf9eeb1
--- /dev/null
+++ b/shared/templates/sysctl/tests/correct_etc_ufw_wrong_rt.fail.sh
@@ -0,0 +1,17 @@
+# platform = multi_platform_ubuntu
+{{% if SYSCTLVAL == "" %}}
+# variables = sysctl_{{{ SYSCTLID }}}_value={{{ SYSCTL_CORRECT_VALUE }}}
+{{% endif %}}
+
+# Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
+
+sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
+
+echo "{{{ SYSCTLVAR }}} = {{{ SYSCTL_CORRECT_VALUE }}}" >> /etc/ufw/sysctl.conf
+
+sysctl -w {{{ SYSCTLVAR }}}="{{{ SYSCTL_WRONG_VALUE }}}"
diff --git a/shared/templates/sysctl/tests/correct_value.pass.sh b/shared/templates/sysctl/tests/correct_value.pass.sh
index 92aba14cf4b..1b65d1fbcdf 100644
--- a/shared/templates/sysctl/tests/correct_value.pass.sh
+++ b/shared/templates/sysctl/tests/correct_value.pass.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 echo "{{{ SYSCTLVAR }}} = {{{ SYSCTL_CORRECT_VALUE }}}" >> /etc/sysctl.conf
diff --git a/shared/templates/sysctl/tests/correct_value_usr_lib.pass.sh b/shared/templates/sysctl/tests/correct_value_usr_lib.pass.sh
index cf34728f96c..ec635a73f1e 100644
--- a/shared/templates/sysctl/tests/correct_value_usr_lib.pass.sh
+++ b/shared/templates/sysctl/tests/correct_value_usr_lib.pass.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
-rm -rf /usr/lib/sysctl.d/* /usr/local/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 mkdir -p /usr/lib/sysctl.d
diff --git a/shared/templates/sysctl/tests/correct_value_usr_local_lib.pass.sh b/shared/templates/sysctl/tests/correct_value_usr_local_lib.pass.sh
index 2a53fcf5ba5..4094647fee8 100644
--- a/shared/templates/sysctl/tests/correct_value_usr_local_lib.pass.sh
+++ b/shared/templates/sysctl/tests/correct_value_usr_local_lib.pass.sh
@@ -4,8 +4,13 @@
 {{% endif %}}
 
 # Clean sysctl config directories
-{{% if product not in ["sle12", "sle15", "slmicro5"] %}}
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% elif product not in ["sle12", "sle15", "slmicro5"] %}}
 rm -rf /usr/lib/sysctl.d/* /usr/local/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% else %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 mkdir -p /usr/local/lib/sysctl.d
diff --git a/shared/templates/sysctl/tests/line_not_there.fail.sh b/shared/templates/sysctl/tests/line_not_there.fail.sh
index 40b86bc183c..1a0958e8a3b 100644
--- a/shared/templates/sysctl/tests/line_not_there.fail.sh
+++ b/shared/templates/sysctl/tests/line_not_there.fail.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 
diff --git a/shared/templates/sysctl/tests/one_sysctl_conf_one_sysctl_d.pass.sh b/shared/templates/sysctl/tests/one_sysctl_conf_one_sysctl_d.pass.sh
index b8ab0b83e3a..0dc93f08d74 100644
--- a/shared/templates/sysctl/tests/one_sysctl_conf_one_sysctl_d.pass.sh
+++ b/shared/templates/sysctl/tests/one_sysctl_conf_one_sysctl_d.pass.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 echo "{{{ SYSCTLVAR }}} = {{{ SYSCTL_CORRECT_VALUE }}}" >> /etc/sysctl.conf
diff --git a/shared/templates/sysctl/tests/one_sysctl_conf_one_sysctl_d_conflicting.fail.sh b/shared/templates/sysctl/tests/one_sysctl_conf_one_sysctl_d_conflicting.fail.sh
index db7421debaf..70e118e73d7 100644
--- a/shared/templates/sysctl/tests/one_sysctl_conf_one_sysctl_d_conflicting.fail.sh
+++ b/shared/templates/sysctl/tests/one_sysctl_conf_one_sysctl_d_conflicting.fail.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 echo "{{{ SYSCTLVAR }}} = {{{ SYSCTL_CORRECT_VALUE }}}" >> /etc/sysctl.conf
diff --git a/shared/templates/sysctl/tests/symlink_conflicting.fail.sh b/shared/templates/sysctl/tests/symlink_conflicting.fail.sh
index e8109d0f9fd..fc218aaab5f 100644
--- a/shared/templates/sysctl/tests/symlink_conflicting.fail.sh
+++ b/shared/templates/sysctl/tests/symlink_conflicting.fail.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 echo "{{{ SYSCTLVAR }}} = {{{ SYSCTL_CORRECT_VALUE }}}" >> /etc/sysctl.conf
diff --git a/shared/templates/sysctl/tests/symlink_different_option.pass.sh b/shared/templates/sysctl/tests/symlink_different_option.pass.sh
index d8020b5bed1..64c8da30ddc 100644
--- a/shared/templates/sysctl/tests/symlink_different_option.pass.sh
+++ b/shared/templates/sysctl/tests/symlink_different_option.pass.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 echo "{{{ SYSCTLVAR }}} = {{{ SYSCTL_CORRECT_VALUE }}}" >> /etc/sysctl.conf
diff --git a/shared/templates/sysctl/tests/symlink_repeated_sysctl_conf.pass.sh b/shared/templates/sysctl/tests/symlink_repeated_sysctl_conf.pass.sh
index 50b1c5da72c..2944de36126 100644
--- a/shared/templates/sysctl/tests/symlink_repeated_sysctl_conf.pass.sh
+++ b/shared/templates/sysctl/tests/symlink_repeated_sysctl_conf.pass.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 echo "{{{ SYSCTLVAR }}} = {{{ SYSCTL_CORRECT_VALUE }}}" >> /etc/sysctl.conf
diff --git a/shared/templates/sysctl/tests/symlink_root_duplicate.pass.sh b/shared/templates/sysctl/tests/symlink_root_duplicate.pass.sh
index 0fb25ae7383..5455db4ad28 100644
--- a/shared/templates/sysctl/tests/symlink_root_duplicate.pass.sh
+++ b/shared/templates/sysctl/tests/symlink_root_duplicate.pass.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 echo "{{{ SYSCTLVAR }}} = {{{ SYSCTL_CORRECT_VALUE }}}" >> /etc/sysctl.conf
diff --git a/shared/templates/sysctl/tests/symlink_root_duplicate_conflicting.fail.sh b/shared/templates/sysctl/tests/symlink_root_duplicate_conflicting.fail.sh
index 001a59f24e3..0cb023f08d7 100644
--- a/shared/templates/sysctl/tests/symlink_root_duplicate_conflicting.fail.sh
+++ b/shared/templates/sysctl/tests/symlink_root_duplicate_conflicting.fail.sh
@@ -4,7 +4,7 @@
 {{% endif %}}
 
 # Clean sysctl config directories
-rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 echo "{{{ SYSCTLVAR }}} = {{{ SYSCTL_CORRECT_VALUE }}}" >> /etc/sysctl.conf
diff --git a/shared/templates/sysctl/tests/symlink_root_incompliant.fail.sh b/shared/templates/sysctl/tests/symlink_root_incompliant.fail.sh
index 001a59f24e3..676265225eb 100644
--- a/shared/templates/sysctl/tests/symlink_root_incompliant.fail.sh
+++ b/shared/templates/sysctl/tests/symlink_root_incompliant.fail.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 echo "{{{ SYSCTLVAR }}} = {{{ SYSCTL_CORRECT_VALUE }}}" >> /etc/sysctl.conf
diff --git a/shared/templates/sysctl/tests/symlink_same_option.pass.sh b/shared/templates/sysctl/tests/symlink_same_option.pass.sh
index 4a35ea14eee..3ccb4740dd5 100644
--- a/shared/templates/sysctl/tests/symlink_same_option.pass.sh
+++ b/shared/templates/sysctl/tests/symlink_same_option.pass.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 echo "{{{ SYSCTLVAR }}} = {{{ SYSCTL_CORRECT_VALUE }}}" >> /etc/sysctl.conf
diff --git a/shared/templates/sysctl/tests/symlinks_to_same_file.pass.sh b/shared/templates/sysctl/tests/symlinks_to_same_file.pass.sh
index 0b7f0405603..b8f79b31efd 100644
--- a/shared/templates/sysctl/tests/symlinks_to_same_file.pass.sh
+++ b/shared/templates/sysctl/tests/symlinks_to_same_file.pass.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 echo "{{{ SYSCTLVAR }}} = {{{ SYSCTL_CORRECT_VALUE }}}" >> /etc/sysctl.conf
diff --git a/shared/templates/sysctl/tests/two_sysctls_on_d.pass.sh b/shared/templates/sysctl/tests/two_sysctls_on_d.pass.sh
index 098aa71058d..b04f23c1df8 100644
--- a/shared/templates/sysctl/tests/two_sysctls_on_d.pass.sh
+++ b/shared/templates/sysctl/tests/two_sysctls_on_d.pass.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 
diff --git a/shared/templates/sysctl/tests/two_sysctls_on_d_conflicting.fail.sh b/shared/templates/sysctl/tests/two_sysctls_on_d_conflicting.fail.sh
index 9b40f6dae72..0702686f91a 100644
--- a/shared/templates/sysctl/tests/two_sysctls_on_d_conflicting.fail.sh
+++ b/shared/templates/sysctl/tests/two_sysctls_on_d_conflicting.fail.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 
diff --git a/shared/templates/sysctl/tests/two_sysctls_on_same_file.pass.sh b/shared/templates/sysctl/tests/two_sysctls_on_same_file.pass.sh
index 8646946b5ca..1669faa2375 100644
--- a/shared/templates/sysctl/tests/two_sysctls_on_same_file.pass.sh
+++ b/shared/templates/sysctl/tests/two_sysctls_on_same_file.pass.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 
diff --git a/shared/templates/sysctl/tests/two_sysctls_on_same_file_name.pass.sh b/shared/templates/sysctl/tests/two_sysctls_on_same_file_name.pass.sh
index 4e7e0c39c4d..c6ff1bc7ed5 100644
--- a/shared/templates/sysctl/tests/two_sysctls_on_same_file_name.pass.sh
+++ b/shared/templates/sysctl/tests/two_sysctls_on_same_file_name.pass.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 
diff --git a/shared/templates/sysctl/tests/two_sysctls_on_same_file_name_conflicting.fail.sh b/shared/templates/sysctl/tests/two_sysctls_on_same_file_name_conflicting.fail.sh
index 384a54296e4..f9f755dab20 100644
--- a/shared/templates/sysctl/tests/two_sysctls_on_same_file_name_conflicting.fail.sh
+++ b/shared/templates/sysctl/tests/two_sysctls_on_same_file_name_conflicting.fail.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 
diff --git a/shared/templates/sysctl/tests/wrong_etc_ufw_correct_rt.fail.sh b/shared/templates/sysctl/tests/wrong_etc_ufw_correct_rt.fail.sh
new file mode 100644
index 00000000000..50e91f9032d
--- /dev/null
+++ b/shared/templates/sysctl/tests/wrong_etc_ufw_correct_rt.fail.sh
@@ -0,0 +1,17 @@
+# platform = multi_platform_ubuntu
+{{% if SYSCTLVAL == "" %}}
+# variables = sysctl_{{{ SYSCTLID }}}_value={{{ SYSCTL_CORRECT_VALUE }}}
+{{% endif %}}
+
+# Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
+
+sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
+
+echo "{{{ SYSCTLVAR }}} = {{{ SYSCTL_WRONG_VALUE }}}" >> /etc/ufw/sysctl.conf
+
+sysctl -w {{{ SYSCTLVAR }}}="{{{ SYSCTL_CORRECT_VALUE }}}"
diff --git a/shared/templates/sysctl/tests/wrong_runtime.fail.sh b/shared/templates/sysctl/tests/wrong_runtime.fail.sh
index b7cc218460e..b9970e3e223 100644
--- a/shared/templates/sysctl/tests/wrong_runtime.fail.sh
+++ b/shared/templates/sysctl/tests/wrong_runtime.fail.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 echo "{{{ SYSCTLVAR }}} = {{{ SYSCTL_CORRECT_VALUE }}}" >> /etc/sysctl.conf
diff --git a/shared/templates/sysctl/tests/wrong_usr_lib_correct_etc.pass.sh b/shared/templates/sysctl/tests/wrong_usr_lib_correct_etc.pass.sh
index 69d60ed5ab7..8e693c5e2e7 100644
--- a/shared/templates/sysctl/tests/wrong_usr_lib_correct_etc.pass.sh
+++ b/shared/templates/sysctl/tests/wrong_usr_lib_correct_etc.pass.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 
diff --git a/shared/templates/sysctl/tests/wrong_usr_lib_wrong_etc.fail.sh b/shared/templates/sysctl/tests/wrong_usr_lib_wrong_etc.fail.sh
index 3412c726376..e958934cce5 100644
--- a/shared/templates/sysctl/tests/wrong_usr_lib_wrong_etc.fail.sh
+++ b/shared/templates/sysctl/tests/wrong_usr_lib_wrong_etc.fail.sh
@@ -3,7 +3,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 
diff --git a/shared/templates/sysctl/tests/wrong_value.fail.sh b/shared/templates/sysctl/tests/wrong_value.fail.sh
index aeee5050f93..5ecc6d02320 100644
--- a/shared/templates/sysctl/tests/wrong_value.fail.sh
+++ b/shared/templates/sysctl/tests/wrong_value.fail.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 echo "{{{ SYSCTLVAR }}} = {{{ SYSCTL_WRONG_VALUE }}}" >> /etc/sysctl.conf
diff --git a/shared/templates/sysctl/tests/wrong_value_d_directory.fail.sh b/shared/templates/sysctl/tests/wrong_value_d_directory.fail.sh
index fe6345945c4..bc760d7f55c 100644
--- a/shared/templates/sysctl/tests/wrong_value_d_directory.fail.sh
+++ b/shared/templates/sysctl/tests/wrong_value_d_directory.fail.sh
@@ -4,7 +4,11 @@
 {{% endif %}}
 
 # Clean sysctl config directories
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 echo "{{{ SYSCTLVAR }}} = {{{ SYSCTL_WRONG_VALUE }}}" >> /etc/sysctl.d/98-sysctl.conf
diff --git a/shared/templates/sysctl/tests/wrong_value_usr_local_lib.fail.sh b/shared/templates/sysctl/tests/wrong_value_usr_local_lib.fail.sh
index a9e8ac6f6d9..6b933bccbe1 100644
--- a/shared/templates/sysctl/tests/wrong_value_usr_local_lib.fail.sh
+++ b/shared/templates/sysctl/tests/wrong_value_usr_local_lib.fail.sh
@@ -5,7 +5,11 @@
 
 # Clean sysctl config directories
 {{% if product not in ["sle12", "sle15", "slmicro5"] %}}
+{{% if "ubuntu" in product %}}
+rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/* /etc/ufw/sysctl.conf
+{{% else %}}
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
+{{% endif %}}
 
 sed -i "/{{{ SYSCTLVAR }}}/d" /etc/sysctl.conf
 mkdir -p /usr/local/lib/sysctl.d