From 1e41aeb435a6db7d69b4d60f46b37bd35bbca1e4 Mon Sep 17 00:00:00 2001
From: Watson Sato <wsato@redhat.com>
Date: Fri, 19 Apr 2024 19:56:41 +0200
Subject: [PATCH 1/2] Adjust OCP OVN platform check

Adjust the path where we check for OVN configuration.
The new path works from 4.12 to latest release 4.15.
---
 shared/applicability/oval/installed_app_is_ocp4_node.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared/applicability/oval/installed_app_is_ocp4_node.xml b/shared/applicability/oval/installed_app_is_ocp4_node.xml
index f90a38ca9a3..46db94b3ceb 100644
--- a/shared/applicability/oval/installed_app_is_ocp4_node.xml
+++ b/shared/applicability/oval/installed_app_is_ocp4_node.xml
@@ -24,7 +24,7 @@
 
   <!-- helpers for ovn/sdn network cpe check-->
   <local_variable id="ocp4_node_network_file_location" datatype="string" comment="The actual filepath of the network file to scan." version="1">
-      <literal_component>/etc/kubernetes/cni/net.d/00-multus.conf</literal_component>
+      <literal_component>/var/run/multus/cni/net.d/10-ovn-kubernetes.conf</literal_component>
   </local_variable>
 
   <unix:file_test id="test_file_for_ocp4_node_network" check="only one" comment="Find the actual file for the network to be scanned." version="1">
@@ -37,7 +37,7 @@
 
   <ind:yamlfilecontent_object id="object_ocp4_platform_node_network" version="1">
       <ind:filepath var_ref="ocp4_node_network_file_location"/>
-      <ind:yamlpath>.delegates[0].type</ind:yamlpath>
+      <ind:yamlpath>.type</ind:yamlpath>
   </ind:yamlfilecontent_object>
 
   <!-- Check for OpenShift Container Platform 4 using specific network type -->

From 7925bd08213f65ead82f0c220b68a32c4aafc4b5 Mon Sep 17 00:00:00 2001
From: Watson Sato <wsato@redhat.com>
Date: Fri, 19 Apr 2024 20:16:37 +0200
Subject: [PATCH 2/2] Align OVN e2e results with fixed platform check

Adust the e2e test results for the corrected OVN platform check.
---
 .../file_groupowner_ovn_cni_server_sock/tests/ocp4/4.12.yml  | 3 ---
 .../file_groupowner_ovn_cni_server_sock/tests/ocp4/4.13.yml  | 3 ---
 .../file_groupowner_ovn_cni_server_sock/tests/ocp4/e2e.yml   | 2 +-
 .../master/file_groupowner_ovn_db_files/tests/ocp4/4.12.yml  | 3 ---
 .../master/file_groupowner_ovn_db_files/tests/ocp4/4.13.yml  | 3 ---
 .../master/file_groupowner_ovn_db_files/tests/ocp4/e2e.yml   | 2 +-
 .../file_owner_ovn_cni_server_sock/tests/ocp4/4.12.yml       | 3 ---
 .../file_owner_ovn_cni_server_sock/tests/ocp4/4.13.yml       | 3 ---
 .../file_owner_ovn_cni_server_sock/tests/ocp4/4.14.yml       | 3 ---
 .../file_owner_ovn_cni_server_sock/tests/ocp4/4.15.yml       | 3 ---
 .../master/file_owner_ovn_cni_server_sock/tests/ocp4/e2e.yml | 5 +----
 .../master/file_owner_ovn_db_files/tests/ocp4/4.12.yml       | 3 ---
 .../master/file_owner_ovn_db_files/tests/ocp4/4.13.yml       | 3 ---
 .../master/file_owner_ovn_db_files/tests/ocp4/e2e.yml        | 2 +-
 .../file_permissions_ovn_cni_server_sock/tests/ocp4/4.12.yml | 3 ---
 .../file_permissions_ovn_cni_server_sock/tests/ocp4/4.13.yml | 3 ---
 .../file_permissions_ovn_cni_server_sock/tests/ocp4/e2e.yml  | 2 +-
 .../master/file_permissions_ovn_db_files/tests/ocp4/4.12.yml | 3 ---
 .../master/file_permissions_ovn_db_files/tests/ocp4/4.13.yml | 3 ---
 .../master/file_permissions_ovn_db_files/tests/ocp4/e2e.yml  | 2 +-
 20 files changed, 6 insertions(+), 51 deletions(-)
 delete mode 100644 applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/4.12.yml
 delete mode 100644 applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/4.13.yml
 delete mode 100644 applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/4.12.yml
 delete mode 100644 applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/4.13.yml
 delete mode 100644 applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.12.yml
 delete mode 100644 applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.13.yml
 delete mode 100644 applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.14.yml
 delete mode 100644 applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.15.yml
 delete mode 100644 applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/4.12.yml
 delete mode 100644 applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/4.13.yml
 delete mode 100644 applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/4.12.yml
 delete mode 100644 applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/4.13.yml
 delete mode 100644 applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/4.12.yml
 delete mode 100644 applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/4.13.yml

diff --git a/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/4.12.yml b/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/4.12.yml
deleted file mode 100644
index a700773455b..00000000000
--- a/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/4.12.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-default_result: PASS
-
diff --git a/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/4.13.yml b/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/4.13.yml
deleted file mode 100644
index a700773455b..00000000000
--- a/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/4.13.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-default_result: PASS
-
diff --git a/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/e2e.yml b/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/e2e.yml
index 26875d6e9f6..a700773455b 100644
--- a/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/e2e.yml
+++ b/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/e2e.yml
@@ -1,3 +1,3 @@
 ---
-default_result: NOT-APPLICABLE
+default_result: PASS
 
diff --git a/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/4.12.yml b/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/4.12.yml
deleted file mode 100644
index a700773455b..00000000000
--- a/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/4.12.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-default_result: PASS
-
diff --git a/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/4.13.yml b/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/4.13.yml
deleted file mode 100644
index a700773455b..00000000000
--- a/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/4.13.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-default_result: PASS
-
diff --git a/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/e2e.yml b/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/e2e.yml
index 26875d6e9f6..a700773455b 100644
--- a/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/e2e.yml
+++ b/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/e2e.yml
@@ -1,3 +1,3 @@
 ---
-default_result: NOT-APPLICABLE
+default_result: PASS
 
diff --git a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.12.yml b/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.12.yml
deleted file mode 100644
index a700773455b..00000000000
--- a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.12.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-default_result: PASS
-
diff --git a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.13.yml b/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.13.yml
deleted file mode 100644
index a700773455b..00000000000
--- a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.13.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-default_result: PASS
-
diff --git a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.14.yml b/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.14.yml
deleted file mode 100644
index 26875d6e9f6..00000000000
--- a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.14.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-default_result: NOT-APPLICABLE
-
diff --git a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.15.yml b/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.15.yml
deleted file mode 100644
index 26875d6e9f6..00000000000
--- a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.15.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-default_result: NOT-APPLICABLE
-
diff --git a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/e2e.yml b/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/e2e.yml
index d833f6aaf36..b49fd368b98 100644
--- a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/e2e.yml
+++ b/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/e2e.yml
@@ -1,5 +1,2 @@
 ---
-default_result:
-  master: PASS
-  worker: NOT-APPLICABLE
-
+default_result: PASS
diff --git a/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/4.12.yml b/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/4.12.yml
deleted file mode 100644
index a700773455b..00000000000
--- a/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/4.12.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-default_result: PASS
-
diff --git a/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/4.13.yml b/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/4.13.yml
deleted file mode 100644
index a700773455b..00000000000
--- a/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/4.13.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-default_result: PASS
-
diff --git a/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/e2e.yml b/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/e2e.yml
index 26875d6e9f6..a700773455b 100644
--- a/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/e2e.yml
+++ b/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/e2e.yml
@@ -1,3 +1,3 @@
 ---
-default_result: NOT-APPLICABLE
+default_result: PASS
 
diff --git a/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/4.12.yml b/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/4.12.yml
deleted file mode 100644
index a700773455b..00000000000
--- a/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/4.12.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-default_result: PASS
-
diff --git a/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/4.13.yml b/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/4.13.yml
deleted file mode 100644
index a700773455b..00000000000
--- a/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/4.13.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-default_result: PASS
-
diff --git a/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/e2e.yml b/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/e2e.yml
index 26875d6e9f6..a700773455b 100644
--- a/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/e2e.yml
+++ b/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/e2e.yml
@@ -1,3 +1,3 @@
 ---
-default_result: NOT-APPLICABLE
+default_result: PASS
 
diff --git a/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/4.12.yml b/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/4.12.yml
deleted file mode 100644
index a700773455b..00000000000
--- a/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/4.12.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-default_result: PASS
-
diff --git a/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/4.13.yml b/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/4.13.yml
deleted file mode 100644
index a700773455b..00000000000
--- a/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/4.13.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-default_result: PASS
-
diff --git a/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/e2e.yml b/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/e2e.yml
index 26875d6e9f6..a700773455b 100644
--- a/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/e2e.yml
+++ b/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/e2e.yml
@@ -1,3 +1,3 @@
 ---
-default_result: NOT-APPLICABLE
+default_result: PASS