From 265a82d54eee4127659d9ba330dcccc170d9752c Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Apr 07 2021 22:24:54 +0000 Subject: Test: scheduler: Add a test for rsc_defaults not specifying type. patch_name: 001-rules.patch present_in_specfile: true location_in_specfile: 1 squash_commits: true --- diff --git a/cts/cts-scheduler.in b/cts/cts-scheduler.in index 2c2d14f..346ada2 100644 --- a/cts/cts-scheduler.in +++ b/cts/cts-scheduler.in @@ -967,6 +967,7 @@ TESTS = [ [ "op-defaults-2", "Test op_defaults AND'ed conditional expressions" ], [ "op-defaults-3", "Test op_defaults precedence" ], [ "rsc-defaults", "Test rsc_defaults conditional expressions" ], + [ "rsc-defaults-2", "Test rsc_defaults conditional expressions without type" ], ], # @TODO: If pacemaker implements versioned attributes, uncomment these tests diff --git a/cts/scheduler/rsc-defaults-2.dot b/cts/scheduler/rsc-defaults-2.dot new file mode 100644 index 0000000..b43c5e6 --- /dev/null +++ b/cts/scheduler/rsc-defaults-2.dot @@ -0,0 +1,11 @@ + digraph "g" { +"dummy-rsc_monitor_0 cluster01" [ style=bold color="green" fontcolor="black"] +"dummy-rsc_monitor_0 cluster02" [ style=bold color="green" fontcolor="black"] +"fencing_monitor_0 cluster01" -> "fencing_start_0 cluster01" [ style = bold] +"fencing_monitor_0 cluster01" [ style=bold color="green" fontcolor="black"] +"fencing_monitor_0 cluster02" -> "fencing_start_0 cluster01" [ style = bold] +"fencing_monitor_0 cluster02" [ style=bold color="green" fontcolor="black"] +"fencing_start_0 cluster01" [ style=bold color="green" fontcolor="black"] +"ping-rsc-ping_monitor_0 cluster01" [ style=bold color="green" fontcolor="black"] +"ping-rsc-ping_monitor_0 cluster02" [ style=bold color="green" fontcolor="black"] +} diff --git a/cts/scheduler/rsc-defaults-2.exp b/cts/scheduler/rsc-defaults-2.exp new file mode 100644 index 0000000..e9e1b5f --- /dev/null +++ b/cts/scheduler/rsc-defaults-2.exp @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cts/scheduler/rsc-defaults-2.scores b/cts/scheduler/rsc-defaults-2.scores new file mode 100644 index 0000000..4b70f54 --- /dev/null +++ b/cts/scheduler/rsc-defaults-2.scores @@ -0,0 +1,7 @@ +Allocation scores: +pcmk__native_allocate: dummy-rsc allocation score on cluster01: 0 +pcmk__native_allocate: dummy-rsc allocation score on cluster02: 0 +pcmk__native_allocate: fencing allocation score on cluster01: 0 +pcmk__native_allocate: fencing allocation score on cluster02: 0 +pcmk__native_allocate: ping-rsc-ping allocation score on cluster01: 0 +pcmk__native_allocate: ping-rsc-ping allocation score on cluster02: 0 diff --git a/cts/scheduler/rsc-defaults-2.summary b/cts/scheduler/rsc-defaults-2.summary new file mode 100644 index 0000000..46a2a2d --- /dev/null +++ b/cts/scheduler/rsc-defaults-2.summary @@ -0,0 +1,27 @@ + +Current cluster status: +Online: [ cluster01 cluster02 ] + + fencing (stonith:fence_xvm): Stopped + dummy-rsc (ocf::pacemaker:Dummy): Stopped (unmanaged) + ping-rsc-ping (ocf::pacemaker:ping): Stopped (unmanaged) + +Transition Summary: + * Start fencing ( cluster01 ) + +Executing cluster transition: + * Resource action: fencing monitor on cluster02 + * Resource action: fencing monitor on cluster01 + * Resource action: dummy-rsc monitor on cluster02 + * Resource action: dummy-rsc monitor on cluster01 + * Resource action: ping-rsc-ping monitor on cluster02 + * Resource action: ping-rsc-ping monitor on cluster01 + * Resource action: fencing start on cluster01 + +Revised cluster status: +Online: [ cluster01 cluster02 ] + + fencing (stonith:fence_xvm): Started cluster01 + dummy-rsc (ocf::pacemaker:Dummy): Stopped (unmanaged) + ping-rsc-ping (ocf::pacemaker:ping): Stopped (unmanaged) + diff --git a/cts/scheduler/rsc-defaults-2.xml b/cts/scheduler/rsc-defaults-2.xml new file mode 100644 index 0000000..a160fae --- /dev/null +++ b/cts/scheduler/rsc-defaults-2.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +