Skip to content

Add RHEL Client Variant Support #1702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2017
Merged

Add RHEL Client Variant Support #1702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions shared/oval/installed_OS_is_rhel6.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,25 @@
<extend_definition comment="Installed OS is part of the Unix family"
definition_ref="installed_OS_is_part_of_Unix_family" />
<criteria operator="OR">
<criterion comment="RHEL 6 Client is installed" test_ref="test_rhel_client" />
<criterion comment="RHEL 6 Workstation is installed" test_ref="test_rhel_workstation" />
<criterion comment="RHEL 6 Server is installed" test_ref="test_rhel_server" />
<criterion comment="RHEL 6 Compute Node is installed" test_ref="test_rhel_computenode" />
</criteria>
</criteria>
</definition>

<linux:rpminfo_test check="all" check_existence="at_least_one_exists" comment="redhat-release-client is version 6" id="test_rhel_client" version="1">
<linux:object object_ref="obj_rhel_client" />
<linux:state state_ref="state_rhel_client" />
</linux:rpminfo_test>
<linux:rpminfo_state id="state_rhel_client" version="1">
<linux:version operation="pattern match">^6.*$</linux:version>
</linux:rpminfo_state>
<linux:rpminfo_object id="obj_rhel_client" version="1">
<linux:name>redhat-release-client</linux:name>
</linux:rpminfo_object>

<linux:rpminfo_test check="all" check_existence="at_least_one_exists" comment="redhat-release-workstation is version 6" id="test_rhel_workstation" version="1">
<linux:object object_ref="obj_rhel_workstation" />
<linux:state state_ref="state_rhel_workstation" />
Expand Down
12 changes: 12 additions & 0 deletions shared/oval/installed_OS_is_rhel7.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<criterion comment="Installed operating system is part of the unix family"
test_ref="test_rhel7_unix_family" />
<criteria operator="OR">
<criterion comment="RHEL 7 Client is installed" test_ref="test_rhel7_client" />
<criterion comment="RHEL 7 Workstation is installed" test_ref="test_rhel7_workstation" />
<criterion comment="RHEL 7 Server is installed" test_ref="test_rhel7_server" />
<criterion comment="RHEL 7 Compute Node is installed" test_ref="test_rhel7_computenode" />
Expand All @@ -31,6 +32,17 @@
</ind:family_state>
<ind:family_object id="obj_rhel7_unix_family" version="1" />

<linux:rpminfo_test check="all" check_existence="at_least_one_exists" comment="redhat-release-client is version 7" id="test_rhel7_client" version="1">
<linux:object object_ref="obj_rhel7_client" />
<linux:state state_ref="state_rhel7_client" />
</linux:rpminfo_test>
<linux:rpminfo_state id="state_rhel7_client" version="1">
<linux:version operation="pattern match">^7.*$</linux:version>
</linux:rpminfo_state>
<linux:rpminfo_object id="obj_rhel7_client" version="1">
<linux:name>redhat-release-client</linux:name>
</linux:rpminfo_object>

<linux:rpminfo_test check="all" check_existence="at_least_one_exists" comment="redhat-release-workstation is version 7" id="test_rhel7_workstation" version="1">
<linux:object object_ref="obj_rhel7_workstation" />
<linux:state state_ref="state_rhel7_workstation" />
Expand Down