diff --git a/cts/scheduler/11-a-then-bm-b-move-a-clone-starting.dot b/cts/scheduler/11-a-then-bm-b-move-a-clone-starting.dot
index 4a89db6757..4fd6a7db81 100644
--- a/cts/scheduler/11-a-then-bm-b-move-a-clone-starting.dot
+++ b/cts/scheduler/11-a-then-bm-b-move-a-clone-starting.dot
@@ -1,30 +1,31 @@
digraph "g" {
"myclone-clone_running_0" -> "vm_migrate_to_0 f20node1" [ style = dashed]
"myclone-clone_running_0" -> "vm_start_0 f20node2" [ style = bold]
"myclone-clone_running_0" [ style=bold color="green" fontcolor="orange"]
"myclone-clone_start_0" -> "myclone-clone_running_0" [ style = bold]
"myclone-clone_start_0" -> "myclone_start_0 f20node2" [ style = bold]
"myclone-clone_start_0" [ style=bold color="green" fontcolor="orange"]
"myclone-clone_stop_0" -> "myclone-clone_stopped_0" [ style = bold]
"myclone-clone_stop_0" -> "myclone_stop_0 f20node1" [ style = bold]
"myclone-clone_stop_0" [ style=bold color="green" fontcolor="orange"]
"myclone-clone_stopped_0" -> "myclone-clone_start_0" [ style = bold]
"myclone-clone_stopped_0" [ style=bold color="green" fontcolor="orange"]
"myclone_monitor_0 f20node2" -> "myclone-clone_start_0" [ style = bold]
"myclone_monitor_0 f20node2" -> "myclone-clone_stopped_0" [ style = bold]
+"myclone_monitor_0 f20node2" -> "vm_stop_0 f20node1" [ style = bold]
"myclone_monitor_0 f20node2" [ style=bold color="green" fontcolor="black"]
"myclone_start_0 f20node2" -> "myclone-clone_running_0" [ style = bold]
"myclone_start_0 f20node2" [ style=bold color="green" fontcolor="black"]
"myclone_stop_0 f20node1" -> "myclone-clone_stopped_0" [ style = bold]
"myclone_stop_0 f20node1" -> "myclone_start_0 f20node2" [ style = bold]
"myclone_stop_0 f20node1" [ style=bold color="green" fontcolor="black"]
"vm_migrate_from_0 f20node2" -> "vm_start_0 f20node2" [ style = dashed]
"vm_migrate_from_0 f20node2" -> "vm_stop_0 f20node1" [ style = dashed]
"vm_migrate_from_0 f20node2" [ style=dashed color="red" fontcolor="black"]
"vm_migrate_to_0 f20node1" -> "vm_migrate_from_0 f20node2" [ style = dashed]
"vm_migrate_to_0 f20node1" [ style=dashed color="red" fontcolor="black"]
"vm_start_0 f20node2" [ style=bold color="green" fontcolor="black"]
"vm_stop_0 f20node1" -> "myclone-clone_stop_0" [ style = bold]
"vm_stop_0 f20node1" -> "vm_start_0 f20node2" [ style = bold]
"vm_stop_0 f20node1" [ style=bold color="green" fontcolor="black"]
}
diff --git a/cts/scheduler/11-a-then-bm-b-move-a-clone-starting.exp b/cts/scheduler/11-a-then-bm-b-move-a-clone-starting.exp
index 4eeb08613c..d3ce8b7ab7 100644
--- a/cts/scheduler/11-a-then-bm-b-move-a-clone-starting.exp
+++ b/cts/scheduler/11-a-then-bm-b-move-a-clone-starting.exp
@@ -1,125 +1,129 @@
-
+
+
+
+
+
diff --git a/cts/scheduler/bug-n-387749.dot b/cts/scheduler/bug-n-387749.dot
index 5095351656..a820108721 100644
--- a/cts/scheduler/bug-n-387749.dot
+++ b/cts/scheduler/bug-n-387749.dot
@@ -1,67 +1,74 @@
digraph "g" {
"export_home_ocfs2:0_monitor_0 power720-1" -> "export_home_ocfs2_clone_set_start_0" [ style = bold]
+"export_home_ocfs2:0_monitor_0 power720-1" -> "resource_ipaddr1_single_stop_0 power720-2" [ style = bold]
+"export_home_ocfs2:0_monitor_0 power720-1" -> "resource_nfsserver_single_stop_0 power720-2" [ style = bold]
"export_home_ocfs2:0_monitor_0 power720-1" [ style=bold color="green" fontcolor="black" ]
"export_home_ocfs2:0_post_notify_start_0 power720-1" -> "export_home_ocfs2_clone_set_confirmed-post_notify_running_0" [ style = bold]
"export_home_ocfs2:0_post_notify_start_0 power720-1" [ style=bold color="green" fontcolor="black" ]
"export_home_ocfs2:0_start_0 power720-1" -> "export_home_ocfs2_clone_set_running_0" [ style = bold]
"export_home_ocfs2:0_start_0 power720-1" [ style=bold color="green" fontcolor="black" ]
"export_home_ocfs2:1_monitor_0 power720-1" -> "export_home_ocfs2_clone_set_start_0" [ style = bold]
+"export_home_ocfs2:1_monitor_0 power720-1" -> "resource_ipaddr1_single_stop_0 power720-2" [ style = bold]
+"export_home_ocfs2:1_monitor_0 power720-1" -> "resource_nfsserver_single_stop_0 power720-2" [ style = bold]
"export_home_ocfs2:1_monitor_0 power720-1" [ style=bold color="green" fontcolor="black" ]
"export_home_ocfs2:1_post_notify_start_0 power720-2" -> "export_home_ocfs2_clone_set_confirmed-post_notify_running_0" [ style = bold]
"export_home_ocfs2:1_post_notify_start_0 power720-2" [ style=bold color="green" fontcolor="black" ]
"export_home_ocfs2:1_pre_notify_start_0 power720-2" -> "export_home_ocfs2_clone_set_confirmed-pre_notify_start_0" [ style = bold]
"export_home_ocfs2:1_pre_notify_start_0 power720-2" [ style=bold color="green" fontcolor="black" ]
"export_home_ocfs2:2_monitor_0 power720-1" -> "export_home_ocfs2_clone_set_start_0" [ style = bold]
+"export_home_ocfs2:2_monitor_0 power720-1" -> "resource_ipaddr1_single_stop_0 power720-2" [ style = bold]
+"export_home_ocfs2:2_monitor_0 power720-1" -> "resource_nfsserver_single_stop_0 power720-2" [ style = bold]
"export_home_ocfs2:2_monitor_0 power720-1" [ style=bold color="green" fontcolor="black" ]
"export_home_ocfs2_clone_set_confirmed-post_notify_running_0" -> "group_nfs_start_0" [ style = bold]
"export_home_ocfs2_clone_set_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange" ]
"export_home_ocfs2_clone_set_confirmed-pre_notify_start_0" -> "export_home_ocfs2_clone_set_post_notify_running_0" [ style = bold]
"export_home_ocfs2_clone_set_confirmed-pre_notify_start_0" -> "export_home_ocfs2_clone_set_start_0" [ style = bold]
"export_home_ocfs2_clone_set_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
"export_home_ocfs2_clone_set_post_notify_running_0" -> "export_home_ocfs2:0_post_notify_start_0 power720-1" [ style = bold]
"export_home_ocfs2_clone_set_post_notify_running_0" -> "export_home_ocfs2:1_post_notify_start_0 power720-2" [ style = bold]
"export_home_ocfs2_clone_set_post_notify_running_0" -> "export_home_ocfs2_clone_set_confirmed-post_notify_running_0" [ style = bold]
"export_home_ocfs2_clone_set_post_notify_running_0" [ style=bold color="green" fontcolor="orange" ]
"export_home_ocfs2_clone_set_pre_notify_start_0" -> "export_home_ocfs2:1_pre_notify_start_0 power720-2" [ style = bold]
"export_home_ocfs2_clone_set_pre_notify_start_0" -> "export_home_ocfs2_clone_set_confirmed-pre_notify_start_0" [ style = bold]
"export_home_ocfs2_clone_set_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
"export_home_ocfs2_clone_set_running_0" -> "export_home_ocfs2_clone_set_post_notify_running_0" [ style = bold]
"export_home_ocfs2_clone_set_running_0" [ style=bold color="green" fontcolor="orange" ]
"export_home_ocfs2_clone_set_start_0" -> "export_home_ocfs2:0_start_0 power720-1" [ style = bold]
"export_home_ocfs2_clone_set_start_0" -> "export_home_ocfs2_clone_set_running_0" [ style = bold]
"export_home_ocfs2_clone_set_start_0" [ style=bold color="green" fontcolor="orange" ]
"group_nfs_running_0" [ style=bold color="green" fontcolor="orange" ]
"group_nfs_start_0" -> "group_nfs_running_0" [ style = bold]
"group_nfs_start_0" -> "resource_ipaddr1_single_start_0 power720-1" [ style = bold]
"group_nfs_start_0" -> "resource_nfsserver_single_start_0 power720-1" [ style = bold]
"group_nfs_start_0" [ style=bold color="green" fontcolor="orange" ]
"group_nfs_stop_0" -> "group_nfs_stopped_0" [ style = bold]
"group_nfs_stop_0" -> "resource_ipaddr1_single_stop_0 power720-2" [ style = bold]
"group_nfs_stop_0" -> "resource_nfsserver_single_stop_0 power720-2" [ style = bold]
"group_nfs_stop_0" [ style=bold color="green" fontcolor="orange" ]
"group_nfs_stopped_0" -> "group_nfs_start_0" [ style = bold]
"group_nfs_stopped_0" [ style=bold color="green" fontcolor="orange" ]
"resource_ipaddr1_single_monitor_0 power720-1" -> "group_nfs_stopped_0" [ style = bold]
"resource_ipaddr1_single_monitor_0 power720-1" -> "resource_ipaddr1_single_start_0 power720-1" [ style = bold]
+"resource_ipaddr1_single_monitor_0 power720-1" -> "resource_nfsserver_single_stop_0 power720-2" [ style = bold]
"resource_ipaddr1_single_monitor_0 power720-1" [ style=bold color="green" fontcolor="black" ]
"resource_ipaddr1_single_monitor_5000 power720-1" [ style=bold color="green" fontcolor="black" ]
"resource_ipaddr1_single_start_0 power720-1" -> "group_nfs_running_0" [ style = bold]
"resource_ipaddr1_single_start_0 power720-1" -> "resource_ipaddr1_single_monitor_5000 power720-1" [ style = bold]
"resource_ipaddr1_single_start_0 power720-1" -> "resource_nfsserver_single_start_0 power720-1" [ style = bold]
"resource_ipaddr1_single_start_0 power720-1" [ style=bold color="green" fontcolor="black" ]
"resource_ipaddr1_single_stop_0 power720-2" -> "group_nfs_stopped_0" [ style = bold]
"resource_ipaddr1_single_stop_0 power720-2" -> "resource_ipaddr1_single_start_0 power720-1" [ style = bold]
"resource_ipaddr1_single_stop_0 power720-2" [ style=bold color="green" fontcolor="black" ]
"resource_nfsserver_single_monitor_0 power720-1" -> "group_nfs_stopped_0" [ style = bold]
"resource_nfsserver_single_monitor_0 power720-1" -> "resource_ipaddr1_single_stop_0 power720-2" [ style = bold]
"resource_nfsserver_single_monitor_0 power720-1" -> "resource_nfsserver_single_start_0 power720-1" [ style = bold]
"resource_nfsserver_single_monitor_0 power720-1" [ style=bold color="green" fontcolor="black" ]
"resource_nfsserver_single_monitor_15000 power720-1" [ style=bold color="green" fontcolor="black" ]
"resource_nfsserver_single_start_0 power720-1" -> "group_nfs_running_0" [ style = bold]
"resource_nfsserver_single_start_0 power720-1" -> "resource_nfsserver_single_monitor_15000 power720-1" [ style = bold]
"resource_nfsserver_single_start_0 power720-1" [ style=bold color="green" fontcolor="black" ]
"resource_nfsserver_single_stop_0 power720-2" -> "group_nfs_stopped_0" [ style = bold]
"resource_nfsserver_single_stop_0 power720-2" -> "resource_ipaddr1_single_stop_0 power720-2" [ style = bold]
"resource_nfsserver_single_stop_0 power720-2" -> "resource_nfsserver_single_start_0 power720-1" [ style = bold]
"resource_nfsserver_single_stop_0 power720-2" [ style=bold color="green" fontcolor="black" ]
}
diff --git a/cts/scheduler/bug-n-387749.exp b/cts/scheduler/bug-n-387749.exp
index d6fe8e4415..5b646bc52b 100644
--- a/cts/scheduler/bug-n-387749.exp
+++ b/cts/scheduler/bug-n-387749.exp
@@ -1,355 +1,376 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cts/scheduler/group5.dot b/cts/scheduler/group5.dot
index 3fe019378e..4776b1e458 100644
--- a/cts/scheduler/group5.dot
+++ b/cts/scheduler/group5.dot
@@ -1,60 +1,63 @@
digraph "g" {
"child_rsc1_monitor_0 node2" -> "child_rsc1_start_0 node2" [ style = bold]
+"child_rsc1_monitor_0 node2" -> "child_rsc2_stop_0 node1" [ style = bold]
+"child_rsc1_monitor_0 node2" -> "child_rsc3_stop_0 node1" [ style = bold]
"child_rsc1_monitor_0 node2" -> "rsc2_stopped_0" [ style = bold]
"child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1_start_0 node2" -> "child_rsc2_start_0 node2" [ style = bold]
"child_rsc1_start_0 node2" -> "rsc2_running_0" [ style = bold]
"child_rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1_stop_0 node1" -> "child_rsc1_start_0 node2" [ style = bold]
"child_rsc1_stop_0 node1" -> "rsc2_stopped_0" [ style = bold]
"child_rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc2_monitor_0 node2" -> "child_rsc1_stop_0 node1" [ style = bold]
"child_rsc2_monitor_0 node2" -> "child_rsc2_start_0 node2" [ style = bold]
+"child_rsc2_monitor_0 node2" -> "child_rsc3_stop_0 node1" [ style = bold]
"child_rsc2_monitor_0 node2" -> "rsc2_stopped_0" [ style = bold]
"child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc2_start_0 node2" -> "child_rsc3_start_0 node2" [ style = bold]
"child_rsc2_start_0 node2" -> "rsc2_running_0" [ style = bold]
"child_rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc2_stop_0 node1" -> "child_rsc1_stop_0 node1" [ style = bold]
"child_rsc2_stop_0 node1" -> "child_rsc2_start_0 node2" [ style = bold]
"child_rsc2_stop_0 node1" -> "rsc2_stopped_0" [ style = bold]
"child_rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc3_monitor_0 node2" -> "child_rsc2_stop_0 node1" [ style = bold]
"child_rsc3_monitor_0 node2" -> "child_rsc3_start_0 node2" [ style = bold]
"child_rsc3_monitor_0 node2" -> "rsc2_stopped_0" [ style = bold]
"child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc3_start_0 node2" -> "rsc2_running_0" [ style = bold]
"child_rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc3_stop_0 node1" -> "child_rsc2_stop_0 node1" [ style = bold]
"child_rsc3_stop_0 node1" -> "child_rsc3_start_0 node2" [ style = bold]
"child_rsc3_stop_0 node1" -> "rsc2_stopped_0" [ style = bold]
"child_rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold]
"rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc1_start_0 node2" -> "rsc2_start_0" [ style = bold]
"rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold]
"rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc2_running_0" -> "rsc3_start_0 node2" [ style = bold]
"rsc2_running_0" [ style=bold color="green" fontcolor="orange" ]
"rsc2_start_0" -> "child_rsc1_start_0 node2" [ style = bold]
"rsc2_start_0" -> "child_rsc2_start_0 node2" [ style = bold]
"rsc2_start_0" -> "child_rsc3_start_0 node2" [ style = bold]
"rsc2_start_0" -> "rsc2_running_0" [ style = bold]
"rsc2_start_0" [ style=bold color="green" fontcolor="orange" ]
"rsc2_stop_0" -> "child_rsc1_stop_0 node1" [ style = bold]
"rsc2_stop_0" -> "child_rsc2_stop_0 node1" [ style = bold]
"rsc2_stop_0" -> "child_rsc3_stop_0 node1" [ style = bold]
"rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold]
"rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ]
"rsc2_stopped_0" -> "rsc1_stop_0 node1" [ style = bold]
"rsc2_stopped_0" -> "rsc2_start_0" [ style = bold]
"rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ]
"rsc3_monitor_0 node2" -> "rsc2_stop_0" [ style = bold]
"rsc3_monitor_0 node2" -> "rsc3_start_0 node2" [ style = bold]
"rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc3_stop_0 node1" -> "rsc2_stop_0" [ style = bold]
"rsc3_stop_0 node1" -> "rsc3_start_0 node2" [ style = bold]
"rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
}
diff --git a/cts/scheduler/group5.exp b/cts/scheduler/group5.exp
index d1ec4329ed..741088867b 100644
--- a/cts/scheduler/group5.exp
+++ b/cts/scheduler/group5.exp
@@ -1,299 +1,308 @@
+
+
+
+
+
+
+
+
+
diff --git a/cts/scheduler/group6.dot b/cts/scheduler/group6.dot
index a563e059a4..536f56b8aa 100644
--- a/cts/scheduler/group6.dot
+++ b/cts/scheduler/group6.dot
@@ -1,90 +1,96 @@
digraph "g" {
"child_rsc1_monitor_0 node2" -> "child_rsc1_start_0 node2" [ style = bold]
+"child_rsc1_monitor_0 node2" -> "child_rsc2_stop_0 node1" [ style = bold]
+"child_rsc1_monitor_0 node2" -> "child_rsc3_stop_0 node1" [ style = bold]
"child_rsc1_monitor_0 node2" -> "rsc1_stopped_0" [ style = bold]
"child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1_start_0 node2" -> "child_rsc2_start_0 node2" [ style = bold]
"child_rsc1_start_0 node2" -> "rsc1_running_0" [ style = bold]
"child_rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc1_stop_0 node1" -> "child_rsc1_start_0 node2" [ style = bold]
"child_rsc1_stop_0 node1" -> "rsc1_stopped_0" [ style = bold]
"child_rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc2_monitor_0 node2" -> "child_rsc1_stop_0 node1" [ style = bold]
"child_rsc2_monitor_0 node2" -> "child_rsc2_start_0 node2" [ style = bold]
+"child_rsc2_monitor_0 node2" -> "child_rsc3_stop_0 node1" [ style = bold]
"child_rsc2_monitor_0 node2" -> "rsc1_stopped_0" [ style = bold]
"child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc2_start_0 node2" -> "child_rsc3_start_0 node2" [ style = bold]
"child_rsc2_start_0 node2" -> "rsc1_running_0" [ style = bold]
"child_rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc2_stop_0 node1" -> "child_rsc1_stop_0 node1" [ style = bold]
"child_rsc2_stop_0 node1" -> "child_rsc2_start_0 node2" [ style = bold]
"child_rsc2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold]
"child_rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc3_monitor_0 node2" -> "child_rsc2_stop_0 node1" [ style = bold]
"child_rsc3_monitor_0 node2" -> "child_rsc3_start_0 node2" [ style = bold]
"child_rsc3_monitor_0 node2" -> "rsc1_stopped_0" [ style = bold]
"child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc3_start_0 node2" -> "rsc1_running_0" [ style = bold]
"child_rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc3_stop_0 node1" -> "child_rsc2_stop_0 node1" [ style = bold]
"child_rsc3_stop_0 node1" -> "child_rsc3_start_0 node2" [ style = bold]
"child_rsc3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold]
"child_rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc4_monitor_0 node2" -> "child_rsc4_start_0 node2" [ style = bold]
+"child_rsc4_monitor_0 node2" -> "child_rsc5_stop_0 node1" [ style = bold]
+"child_rsc4_monitor_0 node2" -> "child_rsc6_stop_0 node1" [ style = bold]
"child_rsc4_monitor_0 node2" -> "rsc2_stopped_0" [ style = bold]
"child_rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc4_start_0 node2" -> "child_rsc5_start_0 node2" [ style = bold]
"child_rsc4_start_0 node2" -> "rsc2_running_0" [ style = bold]
"child_rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc4_stop_0 node1" -> "child_rsc4_start_0 node2" [ style = bold]
"child_rsc4_stop_0 node1" -> "rsc2_stopped_0" [ style = bold]
"child_rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc5_monitor_0 node2" -> "child_rsc4_stop_0 node1" [ style = bold]
"child_rsc5_monitor_0 node2" -> "child_rsc5_start_0 node2" [ style = bold]
+"child_rsc5_monitor_0 node2" -> "child_rsc6_stop_0 node1" [ style = bold]
"child_rsc5_monitor_0 node2" -> "rsc2_stopped_0" [ style = bold]
"child_rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc5_start_0 node2" -> "child_rsc6_start_0 node2" [ style = bold]
"child_rsc5_start_0 node2" -> "rsc2_running_0" [ style = bold]
"child_rsc5_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc5_stop_0 node1" -> "child_rsc4_stop_0 node1" [ style = bold]
"child_rsc5_stop_0 node1" -> "child_rsc5_start_0 node2" [ style = bold]
"child_rsc5_stop_0 node1" -> "rsc2_stopped_0" [ style = bold]
"child_rsc5_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
"child_rsc6_monitor_0 node2" -> "child_rsc5_stop_0 node1" [ style = bold]
"child_rsc6_monitor_0 node2" -> "child_rsc6_start_0 node2" [ style = bold]
"child_rsc6_monitor_0 node2" -> "rsc2_stopped_0" [ style = bold]
"child_rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc6_start_0 node2" -> "rsc2_running_0" [ style = bold]
"child_rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"child_rsc6_stop_0 node1" -> "child_rsc5_stop_0 node1" [ style = bold]
"child_rsc6_stop_0 node1" -> "child_rsc6_start_0 node2" [ style = bold]
"child_rsc6_stop_0 node1" -> "rsc2_stopped_0" [ style = bold]
"child_rsc6_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc1_running_0" -> "rsc2_start_0" [ style = bold]
"rsc1_running_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_start_0" -> "child_rsc1_start_0 node2" [ style = bold]
"rsc1_start_0" -> "child_rsc2_start_0 node2" [ style = bold]
"rsc1_start_0" -> "child_rsc3_start_0 node2" [ style = bold]
"rsc1_start_0" -> "rsc1_running_0" [ style = bold]
"rsc1_start_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_stop_0" -> "child_rsc1_stop_0 node1" [ style = bold]
"rsc1_stop_0" -> "child_rsc2_stop_0 node1" [ style = bold]
"rsc1_stop_0" -> "child_rsc3_stop_0 node1" [ style = bold]
"rsc1_stop_0" -> "rsc1_stopped_0" [ style = bold]
"rsc1_stop_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_stopped_0" -> "rsc1_start_0" [ style = bold]
"rsc1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
"rsc2_running_0" [ style=bold color="green" fontcolor="orange" ]
"rsc2_start_0" -> "child_rsc4_start_0 node2" [ style = bold]
"rsc2_start_0" -> "child_rsc5_start_0 node2" [ style = bold]
"rsc2_start_0" -> "child_rsc6_start_0 node2" [ style = bold]
"rsc2_start_0" -> "rsc2_running_0" [ style = bold]
"rsc2_start_0" [ style=bold color="green" fontcolor="orange" ]
"rsc2_stop_0" -> "child_rsc4_stop_0 node1" [ style = bold]
"rsc2_stop_0" -> "child_rsc5_stop_0 node1" [ style = bold]
"rsc2_stop_0" -> "child_rsc6_stop_0 node1" [ style = bold]
"rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold]
"rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ]
"rsc2_stopped_0" -> "rsc1_stop_0" [ style = bold]
"rsc2_stopped_0" -> "rsc2_start_0" [ style = bold]
"rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ]
}
diff --git a/cts/scheduler/group6.exp b/cts/scheduler/group6.exp
index 08612626e1..58e950b71a 100644
--- a/cts/scheduler/group6.exp
+++ b/cts/scheduler/group6.exp
@@ -1,433 +1,451 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cts/scheduler/group9.dot b/cts/scheduler/group9.dot
index 610fe9351b..5a93a3183e 100644
--- a/cts/scheduler/group9.dot
+++ b/cts/scheduler/group9.dot
@@ -1,79 +1,85 @@
digraph "g" {
"bar_running_0" [ style=bold color="green" fontcolor="orange" ]
"bar_start_0" -> "bar_running_0" [ style = bold]
"bar_start_0" -> "rsc6_start_0 node2" [ style = bold]
"bar_start_0" -> "rsc7_start_0 node2" [ style = bold]
"bar_start_0" -> "rsc8_start_0 node2" [ style = bold]
"bar_start_0" [ style=bold color="green" fontcolor="orange" ]
"bar_stop_0" -> "bar_stopped_0" [ style = bold]
"bar_stop_0" -> "rsc6_stop_0 node1" [ style = bold]
"bar_stop_0" -> "rsc7_stop_0 node1" [ style = bold]
"bar_stop_0" -> "rsc8_stop_0 node1" [ style = bold]
"bar_stop_0" [ style=bold color="green" fontcolor="orange" ]
"bar_stopped_0" -> "bar_start_0" [ style = bold]
"bar_stopped_0" [ style=bold color="green" fontcolor="orange" ]
"foo_running_0" [ style=bold color="green" fontcolor="orange" ]
"foo_start_0" -> "foo_running_0" [ style = bold]
"foo_start_0" -> "rsc4_start_0 node1" [ style = bold]
"foo_start_0" -> "rsc5_start_0 node1" [ style = bold]
"foo_start_0" [ style=bold color="green" fontcolor="orange" ]
"foo_stop_0" -> "foo_stopped_0" [ style = bold]
"foo_stop_0" -> "rsc4_stop_0 node1" [ style = bold]
"foo_stop_0" -> "rsc5_stop_0 node1" [ style = bold]
"foo_stop_0" [ style=bold color="green" fontcolor="orange" ]
"foo_stopped_0" -> "foo_start_0" [ style = bold]
"foo_stopped_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc3_monitor_0 node2" -> "foo_stopped_0" [ style = bold]
+"rsc3_monitor_0 node2" -> "rsc4_stop_0 node1" [ style = bold]
+"rsc3_monitor_0 node2" -> "rsc5_stop_0 node1" [ style = bold]
"rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc4_monitor_0 node2" -> "foo_stopped_0" [ style = bold]
"rsc4_monitor_0 node2" -> "rsc4_start_0 node1" [ style = bold]
+"rsc4_monitor_0 node2" -> "rsc5_stop_0 node1" [ style = bold]
"rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc4_start_0 node1" -> "foo_running_0" [ style = bold]
"rsc4_start_0 node1" -> "rsc5_start_0 node1" [ style = bold]
"rsc4_start_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc4_stop_0 node1" -> "foo_stopped_0" [ style = bold]
"rsc4_stop_0 node1" -> "rsc4_start_0 node1" [ style = bold]
"rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc5_monitor_0 node2" -> "foo_stopped_0" [ style = bold]
"rsc5_monitor_0 node2" -> "rsc4_stop_0 node1" [ style = bold]
"rsc5_monitor_0 node2" -> "rsc5_start_0 node1" [ style = bold]
"rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc5_start_0 node1" -> "foo_running_0" [ style = bold]
"rsc5_start_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc5_stop_0 node1" -> "foo_stopped_0" [ style = bold]
"rsc5_stop_0 node1" -> "rsc4_stop_0 node1" [ style = bold]
"rsc5_stop_0 node1" -> "rsc5_start_0 node1" [ style = bold]
"rsc5_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc6_monitor_0 node2" -> "bar_stopped_0" [ style = bold]
"rsc6_monitor_0 node2" -> "rsc6_start_0 node2" [ style = bold]
+"rsc6_monitor_0 node2" -> "rsc7_stop_0 node1" [ style = bold]
+"rsc6_monitor_0 node2" -> "rsc8_stop_0 node1" [ style = bold]
"rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc6_start_0 node2" -> "bar_running_0" [ style = bold]
"rsc6_start_0 node2" -> "rsc7_start_0 node2" [ style = bold]
"rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc6_stop_0 node1" -> "bar_stopped_0" [ style = bold]
"rsc6_stop_0 node1" -> "rsc6_start_0 node2" [ style = bold]
"rsc6_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc7_monitor_0 node2" -> "bar_stopped_0" [ style = bold]
"rsc7_monitor_0 node2" -> "rsc6_stop_0 node1" [ style = bold]
"rsc7_monitor_0 node2" -> "rsc7_start_0 node2" [ style = bold]
+"rsc7_monitor_0 node2" -> "rsc8_stop_0 node1" [ style = bold]
"rsc7_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc7_start_0 node2" -> "bar_running_0" [ style = bold]
"rsc7_start_0 node2" -> "rsc8_start_0 node2" [ style = bold]
"rsc7_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc7_stop_0 node1" -> "bar_stopped_0" [ style = bold]
"rsc7_stop_0 node1" -> "rsc6_stop_0 node1" [ style = bold]
"rsc7_stop_0 node1" -> "rsc7_start_0 node2" [ style = bold]
"rsc7_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc8_monitor_0 node2" -> "bar_stopped_0" [ style = bold]
"rsc8_monitor_0 node2" -> "rsc7_stop_0 node1" [ style = bold]
"rsc8_monitor_0 node2" -> "rsc8_start_0 node2" [ style = bold]
"rsc8_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc8_start_0 node2" -> "bar_running_0" [ style = bold]
"rsc8_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc8_stop_0 node1" -> "bar_stopped_0" [ style = bold]
"rsc8_stop_0 node1" -> "rsc7_stop_0 node1" [ style = bold]
"rsc8_stop_0 node1" -> "rsc8_start_0 node2" [ style = bold]
"rsc8_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
}
diff --git a/cts/scheduler/group9.exp b/cts/scheduler/group9.exp
index 04bb5dc7b4..a38cad76ab 100644
--- a/cts/scheduler/group9.exp
+++ b/cts/scheduler/group9.exp
@@ -1,397 +1,415 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cts/scheduler/order6.dot b/cts/scheduler/order6.dot
index 74f1c5bf3e..0dfd73f39e 100644
--- a/cts/scheduler/order6.dot
+++ b/cts/scheduler/order6.dot
@@ -1,26 +1,28 @@
digraph "g" {
+"rsc1_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold]
"rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold]
"rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold]
"rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc4_monitor_0 node2" -> "rsc4_start_0 node2" [ style = bold]
"rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc4_stop_0 node1" -> "rsc4_start_0 node2" [ style = bold]
"rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
+"rsc5_monitor_0 node1" -> "rsc6_stop_0 node2" [ style = bold]
"rsc5_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc6_monitor_0 node1" -> "rsc6_start_0 node1" [ style = bold]
"rsc6_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc6_start_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc6_stop_0 node2" -> "rsc6_start_0 node1" [ style = bold]
"rsc6_stop_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc7_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc8_monitor_0 node1" -> "rsc8_start_0 node1" [ style = bold]
"rsc8_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc8_start_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc8_stop_0 node2" -> "rsc8_start_0 node1" [ style = bold]
"rsc8_stop_0 node2" [ style=bold color="green" fontcolor="black" ]
}
diff --git a/cts/scheduler/order6.exp b/cts/scheduler/order6.exp
index a1e866b9fc..8445584576 100644
--- a/cts/scheduler/order6.exp
+++ b/cts/scheduler/order6.exp
@@ -1,174 +1,182 @@
-
+
+
+
+
+
-
+
+
+
+
+
diff --git a/cts/scheduler/reload-becomes-restart.dot b/cts/scheduler/reload-becomes-restart.dot
index a6616f9fc6..36f8372b05 100644
--- a/cts/scheduler/reload-becomes-restart.dot
+++ b/cts/scheduler/reload-becomes-restart.dot
@@ -1,53 +1,54 @@
digraph "g" {
"Fencing_monitor_0 node1" -> "Fencing_start_0 node1" [ style = bold]
"Fencing_monitor_0 node1" [ style=bold color="green" fontcolor="black"]
"Fencing_monitor_0 node2" -> "Fencing_start_0 node1" [ style = bold]
"Fencing_monitor_0 node2" [ style=bold color="green" fontcolor="black"]
"Fencing_monitor_120000 node1" [ style=bold color="green" fontcolor="black"]
"Fencing_start_0 node1" -> "Fencing_monitor_120000 node1" [ style = bold]
"Fencing_start_0 node1" [ style=bold color="green" fontcolor="black"]
"cl-rsc1_running_0" -> "cl-rsc2_start_0" [ style = bold]
"cl-rsc1_running_0" [ style=bold color="green" fontcolor="orange"]
"cl-rsc1_start_0" -> "cl-rsc1_running_0" [ style = bold]
"cl-rsc1_start_0" -> "rsc1:0_start_0 node2" [ style = bold]
"cl-rsc1_start_0" -> "rsc1:1_start_0 node1" [ style = bold]
"cl-rsc1_start_0" [ style=bold color="green" fontcolor="orange"]
"cl-rsc2_running_0" [ style=bold color="green" fontcolor="orange"]
"cl-rsc2_start_0" -> "cl-rsc2_running_0" [ style = bold]
"cl-rsc2_start_0" -> "rsc2:1_start_0 node2" [ style = bold]
"cl-rsc2_start_0" -> "rsc2_start_0 node1" [ style = bold]
"cl-rsc2_start_0" [ style=bold color="green" fontcolor="orange"]
"cl-rsc2_stop_0" -> "cl-rsc2_stopped_0" [ style = bold]
"cl-rsc2_stop_0" -> "rsc2_stop_0 node1" [ style = bold]
"cl-rsc2_stop_0" [ style=bold color="green" fontcolor="orange"]
"cl-rsc2_stopped_0" -> "cl-rsc2_start_0" [ style = bold]
"cl-rsc2_stopped_0" [ style=bold color="green" fontcolor="orange"]
"rsc1:0_monitor_0 node2" -> "cl-rsc1_start_0" [ style = bold]
"rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black"]
"rsc1:0_monitor_120000 node2" [ style=bold color="green" fontcolor="black"]
"rsc1:0_start_0 node2" -> "cl-rsc1_running_0" [ style = bold]
"rsc1:0_start_0 node2" -> "rsc1:0_monitor_120000 node2" [ style = bold]
"rsc1:0_start_0 node2" -> "rsc2:1_start_0 node2" [ style = bold]
"rsc1:0_start_0 node2" [ style=bold color="green" fontcolor="black"]
"rsc1:1_monitor_0 node1" -> "cl-rsc1_start_0" [ style = bold]
+"rsc1:1_monitor_0 node1" -> "rsc2_stop_0 node1" [ style = bold]
"rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black"]
"rsc1:1_monitor_120000 node1" [ style=bold color="green" fontcolor="black"]
"rsc1:1_start_0 node1" -> "cl-rsc1_running_0" [ style = bold]
"rsc1:1_start_0 node1" -> "rsc1:1_monitor_120000 node1" [ style = bold]
"rsc1:1_start_0 node1" -> "rsc2_start_0 node1" [ style = bold]
"rsc1:1_start_0 node1" [ style=bold color="green" fontcolor="black"]
"rsc2:1_monitor_0 node2" -> "cl-rsc2_start_0" [ style = bold]
"rsc2:1_monitor_0 node2" -> "cl-rsc2_stopped_0" [ style = bold]
"rsc2:1_monitor_0 node2" [ style=bold color="green" fontcolor="black"]
"rsc2:1_monitor_200000 node2" [ style=bold color="green" fontcolor="black"]
"rsc2:1_start_0 node2" -> "cl-rsc2_running_0" [ style = bold]
"rsc2:1_start_0 node2" -> "rsc2:1_monitor_200000 node2" [ style = bold]
"rsc2:1_start_0 node2" [ style=bold color="green" fontcolor="black"]
"rsc2_monitor_200000 node1" [ style=bold color="green" fontcolor="black"]
"rsc2_start_0 node1" -> "cl-rsc2_running_0" [ style = bold]
"rsc2_start_0 node1" -> "rsc2_monitor_200000 node1" [ style = bold]
"rsc2_start_0 node1" [ style=bold color="green" fontcolor="black"]
"rsc2_stop_0 node1" -> "cl-rsc2_stopped_0" [ style = bold]
"rsc2_stop_0 node1" -> "rsc2_start_0 node1" [ style = bold]
"rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black"]
}
diff --git a/cts/scheduler/reload-becomes-restart.exp b/cts/scheduler/reload-becomes-restart.exp
index c3e372155b..224b8d2bcc 100644
--- a/cts/scheduler/reload-becomes-restart.exp
+++ b/cts/scheduler/reload-becomes-restart.exp
@@ -1,297 +1,300 @@
+
+
+