From 6e2aba6bb2b68934a2165b664b8cb58f8f078aac Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Feb 24 2021 16:09:01 +0000 Subject: Test: cts-cli: add crmadmin -N/--nodes tests patch_name: 030-crmadmin.patch present_in_specfile: true location_in_specfile: 30 squash_commits: true --- diff --git a/cts/Makefile.am b/cts/Makefile.am index de02aed..2a73774 100644 --- a/cts/Makefile.am +++ b/cts/Makefile.am @@ -61,6 +61,7 @@ cts_SCRIPTS = CTSlab.py \ clidir = $(testdir)/cli dist_cli_DATA = cli/constraints.xml \ + cli/crmadmin-cluster-remote-guest-nodes.xml \ cli/crm_diff_new.xml \ cli/crm_diff_old.xml \ cli/crm_mon.xml \ diff --git a/cts/cli/crmadmin-cluster-remote-guest-nodes.xml b/cts/cli/crmadmin-cluster-remote-guest-nodes.xml new file mode 100644 index 0000000..8db656f --- /dev/null +++ b/cts/cli/crmadmin-cluster-remote-guest-nodes.xml @@ -0,0 +1,483 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cts/cli/regression.tools.exp b/cts/cli/regression.tools.exp index 510cc0a..7324053 100644 --- a/cts/cli/regression.tools.exp +++ b/cts/cli/regression.tools.exp @@ -4053,3 +4053,27 @@ Resources colocated with clone: =#=#=#= End test: Show resource digests with overrides - OK (0) =#=#=#= * Passed: crm_resource - Show resource digests with overrides +=#=#=#= Begin test: List all nodes =#=#=#= +11 +=#=#=#= End test: List all nodes - OK (0) =#=#=#= +* Passed: crmadmin - List all nodes +=#=#=#= Begin test: List cluster nodes =#=#=#= +6 +=#=#=#= End test: List cluster nodes - OK (0) =#=#=#= +* Passed: crmadmin - List cluster nodes +=#=#=#= Begin test: List guest nodes =#=#=#= +2 +=#=#=#= End test: List guest nodes - OK (0) =#=#=#= +* Passed: crmadmin - List guest nodes +=#=#=#= Begin test: List remote nodes =#=#=#= +3 +=#=#=#= End test: List remote nodes - OK (0) =#=#=#= +* Passed: crmadmin - List remote nodes +=#=#=#= Begin test: List cluster,remote nodes =#=#=#= +9 +=#=#=#= End test: List cluster,remote nodes - OK (0) =#=#=#= +* Passed: crmadmin - List cluster,remote nodes +=#=#=#= Begin test: List guest,remote nodes =#=#=#= +5 +=#=#=#= End test: List guest,remote nodes - OK (0) =#=#=#= +* Passed: crmadmin - List guest,remote nodes diff --git a/cts/cts-cli.in b/cts/cts-cli.in index 96f5386..8e2dbe5 100755 --- a/cts/cts-cli.in +++ b/cts/cts-cli.in @@ -501,15 +501,15 @@ function test_tools() { desc="Default standby value" cmd="crm_standby -N node1 -G" test_assert $CRM_EX_OK - + desc="Set standby status" cmd="crm_standby -N node1 -v true" test_assert $CRM_EX_OK - + desc="Query standby value" cmd="crm_standby -N node1 -G" test_assert $CRM_EX_OK - + desc="Delete standby value" cmd="crm_standby -N node1 -D" test_assert $CRM_EX_OK @@ -657,7 +657,7 @@ function test_tools() { desc="Drop the status section" cmd="cibadmin -R -o status --xml-text ''" test_assert $CRM_EX_OK 0 - + desc="Create a clone" cmd="cibadmin -C -o resources --xml-text ''" test_assert $CRM_EX_OK 0 @@ -697,7 +697,7 @@ function test_tools() { desc="Update existing resource meta attribute" cmd="crm_resource -r test-clone --meta -p is-managed -v true" test_assert $CRM_EX_OK - + desc="Create a resource meta attribute in the parent" cmd="crm_resource -r test-clone --meta -p is-managed -v true --force" test_assert $CRM_EX_OK @@ -803,6 +803,34 @@ function test_tools() { test_assert $CRM_EX_OK 0 unset CIB_file + + export CIB_file="$test_home/cli/crmadmin-cluster-remote-guest-nodes.xml" + + desc="List all nodes" + cmd="crmadmin -N | wc -l | grep 11" + test_assert $CRM_EX_OK 0 + + desc="List cluster nodes" + cmd="crmadmin -N cluster | wc -l | grep 6" + test_assert $CRM_EX_OK 0 + + desc="List guest nodes" + cmd="crmadmin -N guest | wc -l | grep 2" + test_assert $CRM_EX_OK 0 + + desc="List remote nodes" + cmd="crmadmin -N remote | wc -l | grep 3" + test_assert $CRM_EX_OK 0 + + desc="List cluster,remote nodes" + cmd="crmadmin -N cluster,remote | wc -l | grep 9" + test_assert $CRM_EX_OK 0 + + desc="List guest,remote nodes" + cmd="crmadmin -N guest,remote | wc -l | grep 5" + test_assert $CRM_EX_OK 0 + + unset CIB_file } INVALID_PERIODS=( @@ -822,7 +850,7 @@ INVALID_PERIODS=( "P1Z/2019-02-20 00:00:00Z" # Invalid duration unit "P1YM/2019-02-20 00:00:00Z" # No number for duration unit ) - + function test_dates() { # Ensure invalid period specifications are rejected for spec in '' "${INVALID_PERIODS[@]}"; do @@ -1665,7 +1693,7 @@ for t in $tests; do done rm -rf "${shadow_dir}" - + failed=0 if [ $verbose -eq 1 ]; then