Skip to content

Commit 4bff23c

Browse files
committed
Drop instance element and update yaml path syntax
1 parent 55ab772 commit 4bff23c

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

tests/probes/yamlfilecontent/test_probes_yamlfilecontent.xml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,36 +68,31 @@
6868
<ind-def:yamlfilecontent_object version="1" id="oval:0:obj:1">
6969
<ind-def:path>/tmp</ind-def:path>
7070
<ind-def:filename>openshift-logging.yaml</ind-def:filename>
71-
<ind-def:yamlpath>/kind</ind-def:yamlpath>
72-
<ind-def:instance operation="greater than or equal" datatype="int">0</ind-def:instance>
71+
<ind-def:yamlpath>.kind</ind-def:yamlpath>
7372
</ind-def:yamlfilecontent_object>
7473

7574
<ind-def:yamlfilecontent_object version="1" id="oval:0:obj:2">
7675
<ind-def:path>/tmp</ind-def:path>
7776
<ind-def:filename>openshift-logging.yaml</ind-def:filename>
78-
<ind-def:yamlpath>/metadata/namespace</ind-def:yamlpath>
79-
<ind-def:instance operation="greater than or equal" datatype="int">0</ind-def:instance>
77+
<ind-def:yamlpath>.metadata.namespace</ind-def:yamlpath>
8078
</ind-def:yamlfilecontent_object>
8179

8280
<ind-def:yamlfilecontent_object version="1" id="oval:0:obj:3">
8381
<ind-def:path>/tmp</ind-def:path>
8482
<ind-def:filename>openshift-logging.yaml</ind-def:filename>
85-
<ind-def:yamlpath>/spec/outputs[type=forward]/name</ind-def:yamlpath>
86-
<ind-def:instance operation="greater than or equal" datatype="int">0</ind-def:instance>
83+
<ind-def:yamlpath>.spec.outputs[type=forward].name</ind-def:yamlpath>
8784
</ind-def:yamlfilecontent_object>
8885

8986
<ind-def:yamlfilecontent_object version="1" id="oval:0:obj:4">
9087
<ind-def:path>/tmp</ind-def:path>
9188
<ind-def:filename>openshift-logging.yaml</ind-def:filename>
92-
<ind-def:yamlpath>/spec/outputs[type=elasticsearch]/name</ind-def:yamlpath>
93-
<ind-def:instance operation="greater than or equal" datatype="int">0</ind-def:instance>
89+
<ind-def:yamlpath>.spec.outputs[type=elasticsearch].name</ind-def:yamlpath>
9490
</ind-def:yamlfilecontent_object>
9591

9692
<ind-def:yamlfilecontent_object version="1" id="oval:0:obj:5">
9793
<ind-def:path>/tmp</ind-def:path>
9894
<ind-def:filename>openshift-logging.yaml</ind-def:filename>
99-
<ind-def:yamlpath>/spec/outputs[type=elasticsearch]</ind-def:yamlpath>
100-
<ind-def:instance operation="greater than or equal" datatype="int">0</ind-def:instance>
95+
<ind-def:yamlpath>.spec.outputs[type=elasticsearch]</ind-def:yamlpath>
10196
</ind-def:yamlfilecontent_object>
10297

10398
</objects>

0 commit comments

Comments
 (0)