diff --git a/cts/Makefile.am b/cts/Makefile.am index 5666a9f..de02aed 100644 --- a/cts/Makefile.am +++ b/cts/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001-2019 the Pacemaker project contributors +# Copyright 2001-2021 the Pacemaker project contributors # # The version control history for this file may have further details. # @@ -65,6 +65,7 @@ dist_cli_DATA = cli/constraints.xml \ cli/crm_diff_old.xml \ cli/crm_mon.xml \ cli/crm_mon-partial.xml \ + cli/crm_resource_digests.xml \ cli/regression.acls.exp \ cli/regression.crm_mon.exp \ cli/regression.dates.exp \ diff --git a/cts/cli/crm_resource_digests.xml b/cts/cli/crm_resource_digests.xml new file mode 100644 index 0000000..074ca3d --- /dev/null +++ b/cts/cli/crm_resource_digests.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cts/cli/regression.tools.exp b/cts/cli/regression.tools.exp index a85b7d6..510cc0a 100644 --- a/cts/cli/regression.tools.exp +++ b/cts/cli/regression.tools.exp @@ -4019,3 +4019,37 @@ Resources colocated with clone: =#=#=#= End test: Recursively check locations and constraints for clone in XML - OK (0) =#=#=#= * Passed: crm_resource - Recursively check locations and constraints for clone in XML +=#=#=#= Begin test: Show resource digests =#=#=#= + + + + + + + + + + + + + + +=#=#=#= End test: Show resource digests - OK (0) =#=#=#= +* Passed: crm_resource - Show resource digests +=#=#=#= Begin test: Show resource digests with overrides =#=#=#= + + + + + + + + + + + + + + +=#=#=#= End test: Show resource digests with overrides - OK (0) =#=#=#= +* Passed: crm_resource - Show resource digests with overrides diff --git a/cts/cts-cli.in b/cts/cts-cli.in index dfdd3de..96f5386 100755 --- a/cts/cts-cli.in +++ b/cts/cts-cli.in @@ -1,6 +1,6 @@ #!@BASH_PATH@ # -# Copyright 2008-2020 the Pacemaker project contributors +# Copyright 2008-2021 the Pacemaker project contributors # # The version control history for this file may have further details. # @@ -791,6 +791,18 @@ function test_tools() { done unset CIB_file + + export CIB_file="$test_home/cli/crm_resource_digests.xml" + + desc="Show resource digests" + cmd="crm_resource --digests -r rsc1 -N node1 --output-as=xml" + test_assert $CRM_EX_OK 0 + + desc="Show resource digests with overrides" + cmd="$cmd CRM_meta_interval=10000 CRM_meta_timeout=20000" + test_assert $CRM_EX_OK 0 + + unset CIB_file } INVALID_PERIODS=(