From 4468d0fe5af9324863bd2cd574999fdf403d5148 Mon Sep 17 00:00:00 2001
From: Reid Wahl <nrwahl@protonmail.com>
Date: Sun, 12 May 2024 23:05:15 -0700
Subject: [PATCH] Test: cts-scheduler: Update test after remote migrate_from
 fix

Ref T214

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
---
 cts/scheduler/dot/remote-partial-migrate3.dot |  6 ++-
 cts/scheduler/exp/remote-partial-migrate3.exp | 42 +++++++++++++------
 .../scores/remote-partial-migrate3.scores     |  4 +-
 .../summary/remote-partial-migrate3.summary   | 13 +++---
 4 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/cts/scheduler/dot/remote-partial-migrate3.dot b/cts/scheduler/dot/remote-partial-migrate3.dot
index 975b8408913..212f674c98d 100644
--- a/cts/scheduler/dot/remote-partial-migrate3.dot
+++ b/cts/scheduler/dot/remote-partial-migrate3.dot
@@ -1,5 +1,9 @@
  digraph "g" {
+"fastvm-fedora39-23_monitor_60000 fastvm-fedora39-24" [ style=bold color="green" fontcolor="black"]
+"fastvm-fedora39-23_start_0 fastvm-fedora39-24" -> "fastvm-fedora39-23_monitor_60000 fastvm-fedora39-24" [ style = bold]
+"fastvm-fedora39-23_start_0 fastvm-fedora39-24" [ style=bold color="green" fontcolor="black"]
+"fastvm-fedora39-23_stop_0 fastvm-fedora39-22" -> "fastvm-fedora39-23_start_0 fastvm-fedora39-24" [ style = bold]
 "fastvm-fedora39-23_stop_0 fastvm-fedora39-22" [ style=bold color="green" fontcolor="black"]
+"fastvm-fedora39-23_stop_0 fastvm-fedora39-24" -> "fastvm-fedora39-23_start_0 fastvm-fedora39-24" [ style = bold]
 "fastvm-fedora39-23_stop_0 fastvm-fedora39-24" [ style=bold color="green" fontcolor="black"]
-"stonith 'reboot' fastvm-fedora39-23" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/cts/scheduler/exp/remote-partial-migrate3.exp b/cts/scheduler/exp/remote-partial-migrate3.exp
index 5b0188b65ff..9be4e7fbea6 100644
--- a/cts/scheduler/exp/remote-partial-migrate3.exp
+++ b/cts/scheduler/exp/remote-partial-migrate3.exp
@@ -1,21 +1,38 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <rsc_op id="5" operation="stop" operation_key="fastvm-fedora39-23_stop_0" on_node="fastvm-fedora39-22" on_node_uuid="1">
+      <rsc_op id="6" operation="monitor" operation_key="fastvm-fedora39-23_monitor_60000" on_node="fastvm-fedora39-24" on_node_uuid="2">
         <primitive id="fastvm-fedora39-23" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_node="fastvm-fedora39-22" CRM_meta_on_node_uuid="1" CRM_meta_timeout="60000"  reconnect_interval="30s" server="fastvm-fedora39-23"/>
-        <downed>
-          <node id="fastvm-fedora39-23"/>
-        </downed>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="fastvm-fedora39-24" CRM_meta_on_node_uuid="2" CRM_meta_timeout="30000"  reconnect_interval="30s" server="fastvm-fedora39-23"/>
       </rsc_op>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <rsc_op id="5" operation="start" operation_key="fastvm-fedora39-23_start_0" on_node="fastvm-fedora39-24" on_node_uuid="2"/>
+      </trigger>
+    </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="2" operation="stop" operation_key="fastvm-fedora39-23_stop_0" on_node="fastvm-fedora39-24" on_node_uuid="2">
+      <rsc_op id="5" operation="start" operation_key="fastvm-fedora39-23_start_0" on_node="fastvm-fedora39-24" on_node_uuid="2">
         <primitive id="fastvm-fedora39-23" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_node="fastvm-fedora39-24" CRM_meta_on_node_uuid="2" CRM_meta_timeout="60000"  reconnect_interval="30s" server="fastvm-fedora39-23"/>
+        <attributes CRM_meta_name="start" CRM_meta_on_node="fastvm-fedora39-24" CRM_meta_on_node_uuid="2" CRM_meta_timeout="60000"  reconnect_interval="30s" server="fastvm-fedora39-23"/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="1" operation="stop" operation_key="fastvm-fedora39-23_stop_0" on_node="fastvm-fedora39-24" on_node_uuid="2"/>
+      </trigger>
+      <trigger>
+        <rsc_op id="4" operation="stop" operation_key="fastvm-fedora39-23_stop_0" on_node="fastvm-fedora39-22" on_node_uuid="1"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="2">
+    <action_set>
+      <rsc_op id="4" operation="stop" operation_key="fastvm-fedora39-23_stop_0" on_node="fastvm-fedora39-22" on_node_uuid="1">
+        <primitive id="fastvm-fedora39-23" class="ocf" provider="pacemaker" type="remote"/>
+        <attributes CRM_meta_name="stop" CRM_meta_on_node="fastvm-fedora39-22" CRM_meta_on_node_uuid="1" CRM_meta_timeout="60000"  reconnect_interval="30s" server="fastvm-fedora39-23"/>
         <downed>
           <node id="fastvm-fedora39-23"/>
         </downed>
@@ -23,14 +40,15 @@
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="2">
+  <synapse id="3">
     <action_set>
-      <crm_event id="1" operation="stonith" operation_key="stonith-fastvm-fedora39-23-reboot" on_node="fastvm-fedora39-23" on_node_uuid="fastvm-fedora39-23">
-        <attributes CRM_meta_on_node="fastvm-fedora39-23" CRM_meta_on_node_uuid="fastvm-fedora39-23" CRM_meta_stonith_action="reboot" />
+      <rsc_op id="1" operation="stop" operation_key="fastvm-fedora39-23_stop_0" on_node="fastvm-fedora39-24" on_node_uuid="2">
+        <primitive id="fastvm-fedora39-23" class="ocf" provider="pacemaker" type="remote"/>
+        <attributes CRM_meta_name="stop" CRM_meta_on_node="fastvm-fedora39-24" CRM_meta_on_node_uuid="2" CRM_meta_timeout="60000"  reconnect_interval="30s" server="fastvm-fedora39-23"/>
         <downed>
           <node id="fastvm-fedora39-23"/>
         </downed>
-      </crm_event>
+      </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
diff --git a/cts/scheduler/scores/remote-partial-migrate3.scores b/cts/scheduler/scores/remote-partial-migrate3.scores
index d36e8d4436a..1208ccfb062 100644
--- a/cts/scheduler/scores/remote-partial-migrate3.scores
+++ b/cts/scheduler/scores/remote-partial-migrate3.scores
@@ -1,7 +1,7 @@
 
-pcmk__primitive_assign: fastvm-fedora39-23 allocation score on fastvm-fedora39-22: -INFINITY
+pcmk__primitive_assign: fastvm-fedora39-23 allocation score on fastvm-fedora39-22: 0
 pcmk__primitive_assign: fastvm-fedora39-23 allocation score on fastvm-fedora39-23: -INFINITY
-pcmk__primitive_assign: fastvm-fedora39-23 allocation score on fastvm-fedora39-24: -INFINITY
+pcmk__primitive_assign: fastvm-fedora39-23 allocation score on fastvm-fedora39-24: INFINITY
 pcmk__primitive_assign: xvm allocation score on fastvm-fedora39-22: 1
 pcmk__primitive_assign: xvm allocation score on fastvm-fedora39-23: -INFINITY
 pcmk__primitive_assign: xvm allocation score on fastvm-fedora39-24: 0
diff --git a/cts/scheduler/summary/remote-partial-migrate3.summary b/cts/scheduler/summary/remote-partial-migrate3.summary
index a57a0f879a0..b048a9e559c 100644
--- a/cts/scheduler/summary/remote-partial-migrate3.summary
+++ b/cts/scheduler/summary/remote-partial-migrate3.summary
@@ -1,29 +1,28 @@
 Using the original execution date of: 2024-05-13 04:25:37Z
 Current cluster status:
   * Node List:
-    * RemoteNode fastvm-fedora39-23: UNCLEAN (offline)
     * Online: [ fastvm-fedora39-22 fastvm-fedora39-24 ]
+    * RemoteOFFLINE: [ fastvm-fedora39-23 ]
 
   * Full List of Resources:
     * fastvm-fedora39-23	(ocf:pacemaker:remote):	 FAILED [ fastvm-fedora39-22 fastvm-fedora39-24 ]
     * xvm	(stonith:fence_xvm):	 Started fastvm-fedora39-22
 
 Transition Summary:
-  * Fence (reboot) fastvm-fedora39-23 'remote connection is unrecoverable'
-  * Stop       fastvm-fedora39-23     ( fastvm-fedora39-22 )  due to node availability
-  * Stop       fastvm-fedora39-23     ( fastvm-fedora39-24 )  due to node availability
+  * Recover    fastvm-fedora39-23     ( fastvm-fedora39-22 -> fastvm-fedora39-24 )
 
 Executing Cluster Transition:
   * Resource action: fastvm-fedora39-23 stop on fastvm-fedora39-22
   * Resource action: fastvm-fedora39-23 stop on fastvm-fedora39-24
-  * Fencing fastvm-fedora39-23 (reboot)
+  * Resource action: fastvm-fedora39-23 start on fastvm-fedora39-24
+  * Resource action: fastvm-fedora39-23 monitor=60000 on fastvm-fedora39-24
 Using the original execution date of: 2024-05-13 04:25:37Z
 
 Revised Cluster Status:
   * Node List:
-    * RemoteNode fastvm-fedora39-23: UNCLEAN (offline)
     * Online: [ fastvm-fedora39-22 fastvm-fedora39-24 ]
+    * RemoteOnline: [ fastvm-fedora39-23 ]
 
   * Full List of Resources:
-    * fastvm-fedora39-23	(ocf:pacemaker:remote):	 FAILED
+    * fastvm-fedora39-23	(ocf:pacemaker:remote):	 Started fastvm-fedora39-24
     * xvm	(stonith:fence_xvm):	 Started fastvm-fedora39-22