Merge pull request #11861 from yuumasato/update_ocp_ovn_check

Fix OCP node OVN check
ComplianceAsCode · Apr 23, 2024 · c8d9096 · c8d9096
2 parents ac2a1ec + 7925bd0
commit c8d9096
Show file tree

Hide file tree

Showing 21 changed files with 8 additions and 53 deletions.
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
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
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
@@ -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
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
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
@@ -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
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
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
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
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
@@ -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
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
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
@@ -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
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
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
@@ -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
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
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
@@ -1,3 +1,3 @@
 ---
-default_result: NOT-APPLICABLE
+default_result: PASS
 
diff --git 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 -->