diff --git a/crm/pengine/testcases/594.dot b/crm/pengine/testcases/594.dot
new file mode 100644
index 0000000000..93d090af46
--- /dev/null
+++ b/crm/pengine/testcases/594.dot
@@ -0,0 +1,52 @@
+digraph "g" {
+ size = "30,30"
+"rsc_hadev3_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ color="blue" ]
+"DcIPaddr_monitor_5000" [ color="green" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ color="green" ]
+"rsc_hadev2_monitor_5000" [ color="green" ]
+"rsc_hadev1_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ color="blue" ]
+"DcIPaddr_stop_0" [ color="green" ]
+"DcIPaddr_start_0" [ color="green" ]
+"rsc_hadev3_stop_0" [ color="blue" ]
+"rsc_hadev3_start_0" [ color="blue" ]
+"rsc_hadev2_stop_0" [ color="green" ]
+"rsc_hadev2_start_0" [ color="green" ]
+"rsc_hadev1_stop_0" [ color="blue" ]
+"rsc_hadev1_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_stop_0" [ color="green" ]
+"DoFencing:child_DoFencing:0_start_0" [ color="green" ]
+"DoFencing:child_DoFencing:1_stop_0" [ color="green" ]
+"DoFencing:child_DoFencing:2_stop_0" [ color="green" ]
+"DoFencing_start_0" [ color="green" fontcolor="orange" ]
+"DoFencing_running_0" [ color="green" fontcolor="orange" ]
+"DoFencing_stop_0" [ color="green" fontcolor="orange" ]
+"DoFencing_stopped_0" [ color="green" fontcolor="orange" ]
+"do_shutdown" [ color="green" ]
+"rsc_hadev3_start_0" -> "rsc_hadev3_monitor_5000"
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
+"rsc_hadev2_start_0" -> "rsc_hadev2_monitor_5000"
+"rsc_hadev1_start_0" -> "rsc_hadev1_monitor_5000"
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
+"rsc_hadev3_stop_0" -> "rsc_hadev3_start_0"
+"rsc_hadev2_stop_0" -> "rsc_hadev2_start_0"
+"rsc_hadev2_stop_0" -> "rsc_hadev2_start_0"
+"rsc_hadev1_stop_0" -> "rsc_hadev1_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0"
+"DoFencing_stopped_0" -> "DoFencing_start_0"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0"
+"DcIPaddr_stop_0" -> "do_shutdown"
+"rsc_hadev2_stop_0" -> "do_shutdown"
+"DoFencing:child_DoFencing:0_stop_0" -> "do_shutdown"
+}
diff --git a/crm/pengine/testcases/594.exp b/crm/pengine/testcases/594.exp
index 25a5cbfa9b..15d06a74b8 100644
--- a/crm/pengine/testcases/594.exp
+++ b/crm/pengine/testcases/594.exp
@@ -1,247 +1,247 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/662.dot b/crm/pengine/testcases/662.dot
new file mode 100644
index 0000000000..f2ca51b911
--- /dev/null
+++ b/crm/pengine/testcases/662.dot
@@ -0,0 +1,71 @@
+digraph "g" {
+ size = "30,30"
+"rsc_c001n09_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ color="green" ]
+"DcIPaddr_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:3_monitor_5000" [ color="blue" ]
+"rsc_c001n02_monitor_5000" [ color="green" ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ color="green" ]
+"rsc_c001n04_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ color="green" ]
+"rsc_c001n03_monitor_5000" [ color="blue" ]
+"DcIPaddr_stop_0" [ color="blue" ]
+"DcIPaddr_start_0" [ color="blue" ]
+"rsc_c001n09_stop_0" [ color="blue" ]
+"rsc_c001n09_start_0" [ color="blue" ]
+"rsc_c001n02_stop_0" [ color="green" ]
+"rsc_c001n02_start_0" [ color="green" ]
+"rsc_c001n03_stop_0" [ color="blue" ]
+"rsc_c001n03_start_0" [ color="blue" ]
+"rsc_c001n04_stop_0" [ color="blue" ]
+"rsc_c001n04_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_stop_0" [ color="green" ]
+"DoFencing:child_DoFencing:0_start_0" [ color="green" ]
+"DoFencing:child_DoFencing:1_stop_0" [ color="green" ]
+"DoFencing:child_DoFencing:1_start_0" [ color="green" ]
+"DoFencing:child_DoFencing:2_stop_0" [ color="green" ]
+"DoFencing:child_DoFencing:2_start_0" [ color="green" ]
+"DoFencing:child_DoFencing:3_stop_0" [ color="green" ]
+"DoFencing_start_0" [ color="green" fontcolor="orange" ]
+"DoFencing_running_0" [ color="green" fontcolor="orange" ]
+"DoFencing_stop_0" [ color="green" fontcolor="orange" ]
+"DoFencing_stopped_0" [ color="green" fontcolor="orange" ]
+"do_shutdown" [ color="green" ]
+"rsc_c001n09_start_0" -> "rsc_c001n09_monitor_5000"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
+"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000"
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000"
+"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
+"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000"
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
+"rsc_c001n09_stop_0" -> "rsc_c001n09_start_0"
+"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
+"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
+"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0"
+"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0"
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0"
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0"
+"DoFencing_stopped_0" -> "DoFencing_start_0"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0"
+"rsc_c001n02_stop_0" -> "do_shutdown"
+"DoFencing:child_DoFencing:0_stop_0" -> "do_shutdown"
+}
diff --git a/crm/pengine/testcases/662.exp b/crm/pengine/testcases/662.exp
index 7e7f0c0a12..661942e924 100644
--- a/crm/pengine/testcases/662.exp
+++ b/crm/pengine/testcases/662.exp
@@ -1,305 +1,305 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/696.dot b/crm/pengine/testcases/696.dot
new file mode 100644
index 0000000000..d4edbcaf99
--- /dev/null
+++ b/crm/pengine/testcases/696.dot
@@ -0,0 +1,53 @@
+digraph "g" {
+ size = "30,30"
+"DoFencing:child_DoFencing:0_monitor_5000" [ color="green" ]
+"rsc_hadev2_start_0" [ color="green" ]
+"DcIPaddr_start_0" [ color="green" ]
+"rsc_hadev1_monitor_5000" [ color="green" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ color="green" ]
+"rsc_hadev3_monitor_5000" [ color="green" ]
+"DcIPaddr_stop_0" [ color="blue" ]
+"DcIPaddr_monitor_5000" [ color="green" ]
+"rsc_hadev1_stop_0" [ color="green" ]
+"rsc_hadev1_start_0" [ color="green" ]
+"rsc_hadev2_stop_0" [ color="blue" ]
+"rsc_hadev2_monitor_5000" [ color="green" ]
+"rsc_hadev3_stop_0" [ color="blue" ]
+"rsc_hadev3_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_stop_0" [ color="green" ]
+"DoFencing:child_DoFencing:0_start_0" [ color="green" ]
+"DoFencing:child_DoFencing:1_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:1_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:2_start_0" [ color="green" ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ color="green" ]
+"DoFencing_start_0" [ color="green" fontcolor="orange" ]
+"DoFencing_running_0" [ color="green" fontcolor="orange" ]
+"DoFencing_stop_0" [ color="green" fontcolor="orange" ]
+"DoFencing_stopped_0" [ color="green" fontcolor="orange" ]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
+"rsc_hadev2_stop_0" -> "rsc_hadev2_start_0"
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
+"rsc_hadev1_start_0" -> "rsc_hadev1_monitor_5000"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
+"rsc_hadev3_start_0" -> "rsc_hadev3_monitor_5000"
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
+"rsc_hadev1_stop_0" -> "rsc_hadev1_start_0"
+"rsc_hadev1_stop_0" -> "rsc_hadev1_start_0"
+"rsc_hadev2_start_0" -> "rsc_hadev2_monitor_5000"
+"rsc_hadev3_stop_0" -> "rsc_hadev3_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0"
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000"
+"DoFencing_stopped_0" -> "DoFencing_start_0"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
+}
diff --git a/crm/pengine/testcases/696.exp b/crm/pengine/testcases/696.exp
index 0c1ba3494d..c54525ae5f 100644
--- a/crm/pengine/testcases/696.exp
+++ b/crm/pengine/testcases/696.exp
@@ -1,269 +1,269 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/726.dot b/crm/pengine/testcases/726.dot
new file mode 100644
index 0000000000..05a9f176a6
--- /dev/null
+++ b/crm/pengine/testcases/726.dot
@@ -0,0 +1,59 @@
+digraph "g" {
+ size = "30,30"
+"rsc_ibm1_monitor_5000" [ color="green" ]
+"rsc_test03_monitor_5000" [ color="green" ]
+"DcIPaddr_monitor_5000" [ color="green" ]
+"DoFencing:child_DoFencing:1_start_0" [ color="green" ]
+"DoFencing:child_DoFencing:0_start_0" [ color="green" ]
+"DcIPaddr_stop_0" [ color="blue" ]
+"DcIPaddr_start_0" [ color="blue" ]
+"rsc_sgi2_start_0" [ color="green" ]
+"rsc_sgi2_monitor_5000" [ color="green" ]
+"rsc_ibm1_stop_0" [ color="green" ]
+"rsc_ibm1_start_0" [ color="green" ]
+"rsc_test02_start_0" [ color="green" ]
+"rsc_test02_monitor_5000" [ color="green" ]
+"rsc_test03_stop_0" [ color="blue" ]
+"rsc_test03_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ color="green" ]
+"DoFencing:child_DoFencing:1_stop_0" [ color="green" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ color="green" ]
+"DoFencing:child_DoFencing:2_start_0" [ color="green" ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ color="green" ]
+"DoFencing:child_DoFencing:3_start_0" [ color="green" ]
+"DoFencing:child_DoFencing:3_monitor_5000" [ color="green" ]
+"DoFencing_start_0" [ color="green" fontcolor="orange" ]
+"DoFencing_running_0" [ color="green" fontcolor="orange" ]
+"DoFencing_stop_0" [ color="green" fontcolor="orange" ]
+"DoFencing_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc_ibm1_start_0" -> "rsc_ibm1_monitor_5000"
+"rsc_test03_start_0" -> "rsc_test03_monitor_5000"
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
+"rsc_sgi2_start_0" -> "rsc_sgi2_monitor_5000"
+"rsc_ibm1_stop_0" -> "rsc_ibm1_start_0"
+"rsc_ibm1_stop_0" -> "rsc_ibm1_start_0"
+"rsc_test02_start_0" -> "rsc_test02_monitor_5000"
+"rsc_test03_stop_0" -> "rsc_test03_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0"
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0"
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000"
+"DoFencing_stopped_0" -> "DoFencing_start_0"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
+}
diff --git a/crm/pengine/testcases/726.exp b/crm/pengine/testcases/726.exp
index 2f7a785359..490e982b74 100644
--- a/crm/pengine/testcases/726.exp
+++ b/crm/pengine/testcases/726.exp
@@ -1,349 +1,349 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/735.dot b/crm/pengine/testcases/735.dot
new file mode 100644
index 0000000000..ac9a369882
--- /dev/null
+++ b/crm/pengine/testcases/735.dot
@@ -0,0 +1,38 @@
+digraph "g" {
+ size = "30,30"
+"DoFencing:child_DoFencing:0_monitor_5000" [ color="green" ]
+"rsc_hadev1_monitor_5000" [ color="green" ]
+"DoFencing:child_DoFencing:0_start_0" [ color="green" ]
+"rsc_hadev2_monitor_5000" [ color="blue" ]
+"rsc_hadev3_start_0" [ color="green" ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ color="blue" ]
+"DcIPaddr_monitor_5000" [ color="blue" ]
+"rsc_hadev1_start_0" [ color="green" ]
+"rsc_hadev3_monitor_5000" [ color="green" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ color="green" ]
+"DcIPaddr_stop_0" [ color="blue" ]
+"DcIPaddr_start_0" [ color="blue" ]
+"rsc_hadev1_stop_0" [ color="green" ]
+"rsc_hadev2_stop_0" [ color="blue" ]
+"rsc_hadev2_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:1_start_0" [ color="green" ]
+"DoFencing_start_0" [ color="green" fontcolor="orange" ]
+"DoFencing_running_0" [ color="green" fontcolor="orange" ]
+"DoFencing_stop_0" [ color="blue" ]
+"DoFencing_stopped_0" [ color="green" fontcolor="orange" ]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
+"rsc_hadev1_start_0" -> "rsc_hadev1_monitor_5000"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
+"rsc_hadev2_start_0" -> "rsc_hadev2_monitor_5000"
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
+"rsc_hadev1_stop_0" -> "rsc_hadev1_start_0"
+"rsc_hadev1_stop_0" -> "rsc_hadev1_start_0"
+"rsc_hadev3_start_0" -> "rsc_hadev3_monitor_5000"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
+"rsc_hadev2_stop_0" -> "rsc_hadev2_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_stopped_0" -> "DoFencing_start_0"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
+}
diff --git a/crm/pengine/testcases/735.exp b/crm/pengine/testcases/735.exp
index 1efc5027f9..ed64d41ca8 100644
--- a/crm/pengine/testcases/735.exp
+++ b/crm/pengine/testcases/735.exp
@@ -1,183 +1,183 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/764.dot b/crm/pengine/testcases/764.dot
new file mode 100644
index 0000000000..57ffc240e5
--- /dev/null
+++ b/crm/pengine/testcases/764.dot
@@ -0,0 +1,53 @@
+digraph "g" {
+ size = "30,30"
+"rsc_posic041_monitor_5000" [ color="blue" ]
+"rsc_posic043_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ color="blue" ]
+"DcIPaddr_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:3_monitor_5000" [ color="blue" ]
+"DcIPaddr_stop_0" [ color="green" ]
+"DcIPaddr_start_0" [ color="blue" ]
+"rsc_posic041_stop_0" [ color="green" ]
+"rsc_posic041_start_0" [ color="blue" ]
+"rsc_posic042_stop_0" [ color="green" ]
+"rsc_posic042_start_0" [ color="blue" ]
+"rsc_posic042_monitor_5000" [ fontcolor="red" ]
+"rsc_posic043_stop_0" [ color="green" ]
+"rsc_posic043_start_0" [ color="blue" ]
+"rsc_posic044_stop_0" [ color="green" ]
+"rsc_posic044_start_0" [ color="blue" ]
+"rsc_posic044_monitor_5000" [ fontcolor="red" ]
+"DoFencing:child_DoFencing:0_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ color="green" ]
+"DoFencing:child_DoFencing:1_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:1_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ color="green" ]
+"DoFencing_start_0" [ color="blue" ]
+"DoFencing_running_0" [ color="blue" ]
+"DoFencing_stop_0" [ color="blue" ]
+"DoFencing_stopped_0" [ color="blue" ]
+"rsc_posic041_start_0" -> "rsc_posic041_monitor_5000"
+"rsc_posic043_start_0" -> "rsc_posic043_monitor_5000"
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
+"rsc_posic041_stop_0" -> "rsc_posic041_start_0"
+"rsc_posic042_stop_0" -> "rsc_posic042_start_0"
+"rsc_posic042_start_0" -> "rsc_posic042_monitor_5000"
+"rsc_posic043_stop_0" -> "rsc_posic043_start_0"
+"rsc_posic044_stop_0" -> "rsc_posic044_start_0"
+"rsc_posic044_start_0" -> "rsc_posic044_monitor_5000"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
+"DoFencing_stopped_0" -> "DoFencing_start_0"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
+}
diff --git a/crm/pengine/testcases/764.exp b/crm/pengine/testcases/764.exp
index 203d922ecd..0f1de2e66d 100644
--- a/crm/pengine/testcases/764.exp
+++ b/crm/pengine/testcases/764.exp
@@ -1,88 +1,88 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/797.dot b/crm/pengine/testcases/797.dot
new file mode 100644
index 0000000000..c68232d28e
--- /dev/null
+++ b/crm/pengine/testcases/797.dot
@@ -0,0 +1,69 @@
+digraph "g" {
+ size = "30,30"
+"rsc_c001n08_monitor_5000" [ fontcolor="red" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ color="green" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ color="green" ]
+"rsc_c001n02_monitor_5000" [ fontcolor="red" ]
+"rsc_c001n01_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ color="blue" ]
+"rsc_c001n03_monitor_5000" [ color="blue" ]
+"DcIPaddr_monitor_5000" [ color="blue" ]
+"DcIPaddr_stop_0" [ color="green" ]
+"DcIPaddr_start_0" [ color="blue" ]
+"rsc_c001n08_stop_0" [ color="green" ]
+"rsc_c001n08_start_0" [ fontcolor="red" ]
+"rsc_c001n02_stop_0" [ color="green" ]
+"rsc_c001n02_start_0" [ fontcolor="red" ]
+"rsc_c001n03_stop_0" [ color="green" ]
+"rsc_c001n03_start_0" [ color="blue" ]
+"rsc_c001n01_stop_0" [ color="green" ]
+"rsc_c001n01_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_stop_0" [ color="green" ]
+"DoFencing:child_DoFencing:0_stop_0" [ color="green" ]
+"DoFencing:child_DoFencing:0_start_0" [ color="green" ]
+"DoFencing:child_DoFencing:1_stop_0" [ color="green" ]
+"DoFencing:child_DoFencing:1_start_0" [ color="green" ]
+"DoFencing:child_DoFencing:2_stop_0" [ color="green" ]
+"DoFencing:child_DoFencing:3_monitor_5000" [ fontcolor="red" ]
+"DoFencing_start_0" [ color="green" fontcolor="orange" ]
+"DoFencing_running_0" [ color="green" fontcolor="orange" ]
+"DoFencing_stop_0" [ color="green" fontcolor="orange" ]
+"DoFencing_stopped_0" [ color="green" fontcolor="orange" ]
+"do_shutdown" [ color="green" ]
+"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
+"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000"
+"rsc_c001n01_start_0" -> "rsc_c001n01_monitor_5000"
+"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000"
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
+"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0"
+"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0"
+"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
+"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
+"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0"
+"rsc_c001n01_stop_0" -> "rsc_c001n01_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0"
+"DoFencing_stopped_0" -> "DoFencing_start_0"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0"
+"rsc_c001n08_stop_0" -> "do_shutdown"
+"rsc_c001n02_stop_0" -> "do_shutdown"
+"DoFencing:child_DoFencing:1_stop_0" -> "do_shutdown"
+}
diff --git a/crm/pengine/testcases/797.exp b/crm/pengine/testcases/797.exp
index 61619e5462..8a344dfa0e 100644
--- a/crm/pengine/testcases/797.exp
+++ b/crm/pengine/testcases/797.exp
@@ -1,283 +1,283 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/attrs1.dot b/crm/pengine/testcases/attrs1.dot
new file mode 100644
index 0000000000..3bbf162d76
--- /dev/null
+++ b/crm/pengine/testcases/attrs1.dot
@@ -0,0 +1,4 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/attrs1.exp b/crm/pengine/testcases/attrs1.exp
index b2d06f7776..6a7e1b3a96 100644
--- a/crm/pengine/testcases/attrs1.exp
+++ b/crm/pengine/testcases/attrs1.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/attrs2.dot b/crm/pengine/testcases/attrs2.dot
new file mode 100644
index 0000000000..3bbf162d76
--- /dev/null
+++ b/crm/pengine/testcases/attrs2.dot
@@ -0,0 +1,4 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/attrs2.exp b/crm/pengine/testcases/attrs2.exp
index b2d06f7776..6a7e1b3a96 100644
--- a/crm/pengine/testcases/attrs2.exp
+++ b/crm/pengine/testcases/attrs2.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/attrs3.dot b/crm/pengine/testcases/attrs3.dot
new file mode 100644
index 0000000000..3bbf162d76
--- /dev/null
+++ b/crm/pengine/testcases/attrs3.dot
@@ -0,0 +1,4 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/attrs3.exp b/crm/pengine/testcases/attrs3.exp
index d1007bc401..6a7e1b3a96 100644
--- a/crm/pengine/testcases/attrs3.exp
+++ b/crm/pengine/testcases/attrs3.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/attrs4.dot b/crm/pengine/testcases/attrs4.dot
new file mode 100644
index 0000000000..3bbf162d76
--- /dev/null
+++ b/crm/pengine/testcases/attrs4.dot
@@ -0,0 +1,4 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/attrs4.exp b/crm/pengine/testcases/attrs4.exp
index 63e342abe5..a282545bc3 100644
--- a/crm/pengine/testcases/attrs4.exp
+++ b/crm/pengine/testcases/attrs4.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/attrs5.dot b/crm/pengine/testcases/attrs5.dot
new file mode 100644
index 0000000000..b30097fbc2
--- /dev/null
+++ b/crm/pengine/testcases/attrs5.dot
@@ -0,0 +1,3 @@
+digraph "g" {
+ size = "30,30"
+}
diff --git a/crm/pengine/testcases/attrs6.dot b/crm/pengine/testcases/attrs6.dot
new file mode 100644
index 0000000000..3bbf162d76
--- /dev/null
+++ b/crm/pengine/testcases/attrs6.dot
@@ -0,0 +1,4 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/attrs6.exp b/crm/pengine/testcases/attrs6.exp
index 63e342abe5..a282545bc3 100644
--- a/crm/pengine/testcases/attrs6.exp
+++ b/crm/pengine/testcases/attrs6.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/attrs7.dot b/crm/pengine/testcases/attrs7.dot
new file mode 100644
index 0000000000..3bbf162d76
--- /dev/null
+++ b/crm/pengine/testcases/attrs7.dot
@@ -0,0 +1,4 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/attrs7.exp b/crm/pengine/testcases/attrs7.exp
index b2d06f7776..6a7e1b3a96 100644
--- a/crm/pengine/testcases/attrs7.exp
+++ b/crm/pengine/testcases/attrs7.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/bad1.dot b/crm/pengine/testcases/bad1.dot
new file mode 100644
index 0000000000..8aa2dd1ba2
--- /dev/null
+++ b/crm/pengine/testcases/bad1.dot
@@ -0,0 +1,5 @@
+digraph "g" {
+ size = "30,30"
+"rsc2_start_0" [ color="green" ]
+"rsc1_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/bad1.exp b/crm/pengine/testcases/bad1.exp
index b2c8d2b397..a35ce09a12 100644
--- a/crm/pengine/testcases/bad1.exp
+++ b/crm/pengine/testcases/bad1.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/bad2.dot b/crm/pengine/testcases/bad2.dot
new file mode 100644
index 0000000000..8aa2dd1ba2
--- /dev/null
+++ b/crm/pengine/testcases/bad2.dot
@@ -0,0 +1,5 @@
+digraph "g" {
+ size = "30,30"
+"rsc2_start_0" [ color="green" ]
+"rsc1_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/bad2.exp b/crm/pengine/testcases/bad2.exp
index 07e79d4c56..3b6abfbb49 100644
--- a/crm/pengine/testcases/bad2.exp
+++ b/crm/pengine/testcases/bad2.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/bad3.dot b/crm/pengine/testcases/bad3.dot
new file mode 100644
index 0000000000..3bbf162d76
--- /dev/null
+++ b/crm/pengine/testcases/bad3.dot
@@ -0,0 +1,4 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/bad3.exp b/crm/pengine/testcases/bad3.exp
index c81497d7d1..24fdb5ffb4 100644
--- a/crm/pengine/testcases/bad3.exp
+++ b/crm/pengine/testcases/bad3.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/bad4.dot b/crm/pengine/testcases/bad4.dot
new file mode 100644
index 0000000000..3bbf162d76
--- /dev/null
+++ b/crm/pengine/testcases/bad4.dot
@@ -0,0 +1,4 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/bad4.exp b/crm/pengine/testcases/bad4.exp
index abab1dd54b..34249247dc 100644
--- a/crm/pengine/testcases/bad4.exp
+++ b/crm/pengine/testcases/bad4.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/bad5.dot b/crm/pengine/testcases/bad5.dot
new file mode 100644
index 0000000000..3bbf162d76
--- /dev/null
+++ b/crm/pengine/testcases/bad5.dot
@@ -0,0 +1,4 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/bad5.exp b/crm/pengine/testcases/bad5.exp
index 40dca645ef..3940c2d425 100644
--- a/crm/pengine/testcases/bad5.exp
+++ b/crm/pengine/testcases/bad5.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/bad6.dot b/crm/pengine/testcases/bad6.dot
new file mode 100644
index 0000000000..3bbf162d76
--- /dev/null
+++ b/crm/pengine/testcases/bad6.dot
@@ -0,0 +1,4 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/bad6.exp b/crm/pengine/testcases/bad6.exp
index 40dca645ef..3940c2d425 100644
--- a/crm/pengine/testcases/bad6.exp
+++ b/crm/pengine/testcases/bad6.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/group1.dot b/crm/pengine/testcases/group1.dot
new file mode 100644
index 0000000000..7cc1747289
--- /dev/null
+++ b/crm/pengine/testcases/group1.dot
@@ -0,0 +1,15 @@
+digraph "g" {
+ size = "30,30"
+"rsc1:child_rsc1_start_0" [ color="green" ]
+"rsc1:child_rsc2_start_0" [ color="green" ]
+"rsc1:child_rsc3_start_0" [ color="green" ]
+"rsc1_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_running_0" [ color="green" fontcolor="orange" ]
+"rsc1_stop_0" [ color="blue" ]
+"rsc1_stopped_0" [ color="blue" ]
+"rsc1_start_0" -> "rsc1:child_rsc1_start_0"
+"rsc1:child_rsc1_start_0" -> "rsc1:child_rsc2_start_0"
+"rsc1:child_rsc2_start_0" -> "rsc1:child_rsc3_start_0"
+"rsc1_stopped_0" -> "rsc1_start_0"
+"rsc1:child_rsc3_start_0" -> "rsc1_running_0"
+}
diff --git a/crm/pengine/testcases/group1.exp b/crm/pengine/testcases/group1.exp
index 7dc96ad7c4..2c619f22db 100644
--- a/crm/pengine/testcases/group1.exp
+++ b/crm/pengine/testcases/group1.exp
@@ -1,62 +1,62 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/group2.dot b/crm/pengine/testcases/group2.dot
new file mode 100644
index 0000000000..edb94dec77
--- /dev/null
+++ b/crm/pengine/testcases/group2.dot
@@ -0,0 +1,19 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+"rsc2:child_rsc1_start_0" [ color="green" ]
+"rsc2:child_rsc2_start_0" [ color="green" ]
+"rsc2:child_rsc3_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" fontcolor="orange" ]
+"rsc2_running_0" [ color="green" fontcolor="orange" ]
+"rsc2_stop_0" [ color="blue" ]
+"rsc2_stopped_0" [ color="blue" ]
+"rsc3_start_0" [ color="green" ]
+"rsc2_start_0" -> "rsc2:child_rsc1_start_0"
+"rsc2:child_rsc1_start_0" -> "rsc2:child_rsc2_start_0"
+"rsc2:child_rsc2_start_0" -> "rsc2:child_rsc3_start_0"
+"rsc1_start_0" -> "rsc2_start_0"
+"rsc2_stopped_0" -> "rsc2_start_0"
+"rsc2:child_rsc3_start_0" -> "rsc2_running_0"
+"rsc2_running_0" -> "rsc3_start_0"
+}
diff --git a/crm/pengine/testcases/group2.exp b/crm/pengine/testcases/group2.exp
index 025ef254fb..f5bf5cd501 100644
--- a/crm/pengine/testcases/group2.exp
+++ b/crm/pengine/testcases/group2.exp
@@ -1,88 +1,88 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/group3.dot b/crm/pengine/testcases/group3.dot
new file mode 100644
index 0000000000..7f033c02d0
--- /dev/null
+++ b/crm/pengine/testcases/group3.dot
@@ -0,0 +1,29 @@
+digraph "g" {
+ size = "30,30"
+"rsc1:child_rsc1_start_0" [ color="green" ]
+"rsc1:child_rsc2_start_0" [ color="green" ]
+"rsc1:child_rsc3_start_0" [ color="green" ]
+"rsc1_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_running_0" [ color="green" fontcolor="orange" ]
+"rsc1_stop_0" [ color="blue" ]
+"rsc1_stopped_0" [ color="blue" ]
+"rsc2:child_rsc4_start_0" [ color="green" ]
+"rsc2:child_rsc5_start_0" [ color="green" ]
+"rsc2:child_rsc6_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" fontcolor="orange" ]
+"rsc2_running_0" [ color="green" fontcolor="orange" ]
+"rsc2_stop_0" [ color="blue" ]
+"rsc2_stopped_0" [ color="blue" ]
+"rsc1_start_0" -> "rsc1:child_rsc1_start_0"
+"rsc1:child_rsc1_start_0" -> "rsc1:child_rsc2_start_0"
+"rsc1:child_rsc2_start_0" -> "rsc1:child_rsc3_start_0"
+"rsc1_stopped_0" -> "rsc1_start_0"
+"rsc1:child_rsc3_start_0" -> "rsc1_running_0"
+"rsc2_stopped_0" -> "rsc1_stop_0"
+"rsc2_start_0" -> "rsc2:child_rsc4_start_0"
+"rsc2:child_rsc4_start_0" -> "rsc2:child_rsc5_start_0"
+"rsc2:child_rsc5_start_0" -> "rsc2:child_rsc6_start_0"
+"rsc1_running_0" -> "rsc2_start_0"
+"rsc2_stopped_0" -> "rsc2_start_0"
+"rsc2:child_rsc6_start_0" -> "rsc2_running_0"
+}
diff --git a/crm/pengine/testcases/group3.exp b/crm/pengine/testcases/group3.exp
index cfa52999c0..734bc81bd7 100644
--- a/crm/pengine/testcases/group3.exp
+++ b/crm/pengine/testcases/group3.exp
@@ -1,125 +1,125 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/group4.dot b/crm/pengine/testcases/group4.dot
new file mode 100644
index 0000000000..3a366d3fd9
--- /dev/null
+++ b/crm/pengine/testcases/group4.dot
@@ -0,0 +1,35 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="blue" ]
+"rsc1_start_0" [ color="blue" ]
+"rsc2:child_rsc1_stop_0" [ color="blue" ]
+"rsc2:child_rsc1_start_0" [ color="blue" ]
+"rsc2:child_rsc2_stop_0" [ color="blue" ]
+"rsc2:child_rsc2_start_0" [ color="blue" ]
+"rsc2:child_rsc3_stop_0" [ color="blue" ]
+"rsc2:child_rsc3_start_0" [ color="blue" ]
+"rsc2_start_0" [ color="blue" ]
+"rsc2_running_0" [ color="blue" ]
+"rsc2_stop_0" [ color="blue" ]
+"rsc2_stopped_0" [ color="blue" ]
+"rsc3_stop_0" [ color="blue" ]
+"rsc3_start_0" [ color="blue" ]
+"rsc2_stopped_0" -> "rsc1_stop_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc2:child_rsc2_stop_0" -> "rsc2:child_rsc1_stop_0"
+"rsc2:child_rsc1_stop_0" -> "rsc2:child_rsc1_start_0"
+"rsc2_start_0" -> "rsc2:child_rsc1_start_0"
+"rsc2:child_rsc3_stop_0" -> "rsc2:child_rsc2_stop_0"
+"rsc2:child_rsc2_stop_0" -> "rsc2:child_rsc2_start_0"
+"rsc2:child_rsc1_start_0" -> "rsc2:child_rsc2_start_0"
+"rsc2_stop_0" -> "rsc2:child_rsc3_stop_0"
+"rsc2:child_rsc3_stop_0" -> "rsc2:child_rsc3_start_0"
+"rsc2:child_rsc2_start_0" -> "rsc2:child_rsc3_start_0"
+"rsc1_start_0" -> "rsc2_start_0"
+"rsc2_stopped_0" -> "rsc2_start_0"
+"rsc2:child_rsc3_start_0" -> "rsc2_running_0"
+"rsc3_stop_0" -> "rsc2_stop_0"
+"rsc2:child_rsc1_stop_0" -> "rsc2_stopped_0"
+"rsc2_running_0" -> "rsc3_start_0"
+"rsc3_stop_0" -> "rsc3_start_0"
+}
diff --git a/crm/pengine/testcases/group5.dot b/crm/pengine/testcases/group5.dot
new file mode 100644
index 0000000000..5e00a97946
--- /dev/null
+++ b/crm/pengine/testcases/group5.dot
@@ -0,0 +1,40 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="green" ]
+"rsc1_start_0" [ color="green" ]
+"rsc2:child_rsc1_stop_0" [ color="green" ]
+"rsc2:child_rsc1_start_0" [ color="green" ]
+"rsc2:child_rsc2_stop_0" [ color="green" ]
+"rsc2:child_rsc2_start_0" [ color="green" ]
+"rsc2:child_rsc3_stop_0" [ color="green" ]
+"rsc2:child_rsc3_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" fontcolor="orange" ]
+"rsc2_running_0" [ color="green" fontcolor="orange" ]
+"rsc2_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc3_stop_0" [ color="green" ]
+"rsc3_start_0" [ color="green" ]
+"rsc2_stopped_0" -> "rsc1_stop_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc2:child_rsc2_stop_0" -> "rsc2:child_rsc1_stop_0"
+"rsc2:child_rsc1_stop_0" -> "rsc2:child_rsc1_start_0"
+"rsc2:child_rsc1_stop_0" -> "rsc2:child_rsc1_start_0"
+"rsc2_start_0" -> "rsc2:child_rsc1_start_0"
+"rsc2:child_rsc3_stop_0" -> "rsc2:child_rsc2_stop_0"
+"rsc2:child_rsc1_start_0" -> "rsc2:child_rsc2_start_0"
+"rsc2:child_rsc2_stop_0" -> "rsc2:child_rsc2_start_0"
+"rsc2:child_rsc2_stop_0" -> "rsc2:child_rsc2_start_0"
+"rsc2_stop_0" -> "rsc2:child_rsc3_stop_0"
+"rsc2:child_rsc2_start_0" -> "rsc2:child_rsc3_start_0"
+"rsc2:child_rsc3_stop_0" -> "rsc2:child_rsc3_start_0"
+"rsc2:child_rsc3_stop_0" -> "rsc2:child_rsc3_start_0"
+"rsc1_start_0" -> "rsc2_start_0"
+"rsc2_stopped_0" -> "rsc2_start_0"
+"rsc2:child_rsc3_start_0" -> "rsc2_running_0"
+"rsc3_stop_0" -> "rsc2_stop_0"
+"rsc2:child_rsc1_stop_0" -> "rsc2_stopped_0"
+"rsc2_running_0" -> "rsc3_start_0"
+"rsc3_stop_0" -> "rsc3_start_0"
+"rsc3_stop_0" -> "rsc3_start_0"
+}
diff --git a/crm/pengine/testcases/group5.exp b/crm/pengine/testcases/group5.exp
index 0721d8c3b5..7a3547a9d0 100644
--- a/crm/pengine/testcases/group5.exp
+++ b/crm/pengine/testcases/group5.exp
@@ -1,192 +1,192 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/group6.dot b/crm/pengine/testcases/group6.dot
new file mode 100644
index 0000000000..0dd2aa4c3c
--- /dev/null
+++ b/crm/pengine/testcases/group6.dot
@@ -0,0 +1,55 @@
+digraph "g" {
+ size = "30,30"
+"rsc1:child_rsc1_stop_0" [ color="green" ]
+"rsc1:child_rsc1_start_0" [ color="green" ]
+"rsc1:child_rsc2_stop_0" [ color="green" ]
+"rsc1:child_rsc2_start_0" [ color="green" ]
+"rsc1:child_rsc3_stop_0" [ color="green" ]
+"rsc1:child_rsc3_start_0" [ color="green" ]
+"rsc1_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_running_0" [ color="green" fontcolor="orange" ]
+"rsc1_stop_0" [ color="green" fontcolor="orange" ]
+"rsc1_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc2:child_rsc4_stop_0" [ color="green" ]
+"rsc2:child_rsc4_start_0" [ color="green" ]
+"rsc2:child_rsc5_stop_0" [ color="green" ]
+"rsc2:child_rsc5_start_0" [ color="green" ]
+"rsc2:child_rsc6_stop_0" [ color="green" ]
+"rsc2:child_rsc6_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" fontcolor="orange" ]
+"rsc2_running_0" [ color="green" fontcolor="orange" ]
+"rsc2_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc1:child_rsc2_stop_0" -> "rsc1:child_rsc1_stop_0"
+"rsc1:child_rsc1_stop_0" -> "rsc1:child_rsc1_start_0"
+"rsc1:child_rsc1_stop_0" -> "rsc1:child_rsc1_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1_start_0"
+"rsc1:child_rsc3_stop_0" -> "rsc1:child_rsc2_stop_0"
+"rsc1:child_rsc1_start_0" -> "rsc1:child_rsc2_start_0"
+"rsc1:child_rsc2_stop_0" -> "rsc1:child_rsc2_start_0"
+"rsc1:child_rsc2_stop_0" -> "rsc1:child_rsc2_start_0"
+"rsc1_stop_0" -> "rsc1:child_rsc3_stop_0"
+"rsc1:child_rsc2_start_0" -> "rsc1:child_rsc3_start_0"
+"rsc1:child_rsc3_stop_0" -> "rsc1:child_rsc3_start_0"
+"rsc1:child_rsc3_stop_0" -> "rsc1:child_rsc3_start_0"
+"rsc1_stopped_0" -> "rsc1_start_0"
+"rsc1:child_rsc3_start_0" -> "rsc1_running_0"
+"rsc2_stopped_0" -> "rsc1_stop_0"
+"rsc1:child_rsc1_stop_0" -> "rsc1_stopped_0"
+"rsc2:child_rsc5_stop_0" -> "rsc2:child_rsc4_stop_0"
+"rsc2:child_rsc4_stop_0" -> "rsc2:child_rsc4_start_0"
+"rsc2:child_rsc4_stop_0" -> "rsc2:child_rsc4_start_0"
+"rsc2_start_0" -> "rsc2:child_rsc4_start_0"
+"rsc2:child_rsc6_stop_0" -> "rsc2:child_rsc5_stop_0"
+"rsc2:child_rsc4_start_0" -> "rsc2:child_rsc5_start_0"
+"rsc2:child_rsc5_stop_0" -> "rsc2:child_rsc5_start_0"
+"rsc2:child_rsc5_stop_0" -> "rsc2:child_rsc5_start_0"
+"rsc2_stop_0" -> "rsc2:child_rsc6_stop_0"
+"rsc2:child_rsc5_start_0" -> "rsc2:child_rsc6_start_0"
+"rsc2:child_rsc6_stop_0" -> "rsc2:child_rsc6_start_0"
+"rsc2:child_rsc6_stop_0" -> "rsc2:child_rsc6_start_0"
+"rsc1_running_0" -> "rsc2_start_0"
+"rsc2_stopped_0" -> "rsc2_start_0"
+"rsc2:child_rsc6_start_0" -> "rsc2_running_0"
+"rsc2:child_rsc4_stop_0" -> "rsc2_stopped_0"
+}
diff --git a/crm/pengine/testcases/group6.exp b/crm/pengine/testcases/group6.exp
index 302286b4c4..a97bff4a62 100644
--- a/crm/pengine/testcases/group6.exp
+++ b/crm/pengine/testcases/group6.exp
@@ -1,272 +1,272 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/inc0.dot b/crm/pengine/testcases/inc0.dot
new file mode 100644
index 0000000000..78854337f3
--- /dev/null
+++ b/crm/pengine/testcases/inc0.dot
@@ -0,0 +1,20 @@
+digraph "g" {
+ size = "30,30"
+"rsc1:child_rsc1:0_start_0" [ color="green" ]
+"rsc1:child_rsc1:1_start_0" [ color="green" ]
+"rsc1:child_rsc1:2_start_0" [ color="green" ]
+"rsc1:child_rsc1:3_start_0" [ color="green" ]
+"rsc1_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_running_0" [ color="green" fontcolor="orange" ]
+"rsc1_stop_0" [ color="blue" ]
+"rsc1_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:2_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:3_start_0"
+"rsc1_stopped_0" -> "rsc1_start_0"
+"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0"
+"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0"
+"rsc1:child_rsc1:2_start_0" -> "rsc1_running_0"
+"rsc1:child_rsc1:3_start_0" -> "rsc1_running_0"
+}
diff --git a/crm/pengine/testcases/inc0.exp b/crm/pengine/testcases/inc0.exp
index 3f2313241b..84360d043d 100644
--- a/crm/pengine/testcases/inc0.exp
+++ b/crm/pengine/testcases/inc0.exp
@@ -1,108 +1,108 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/inc1.dot b/crm/pengine/testcases/inc1.dot
new file mode 100644
index 0000000000..3d60eb3d32
--- /dev/null
+++ b/crm/pengine/testcases/inc1.dot
@@ -0,0 +1,24 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+"rsc2:child_rsc2:0_start_0" [ color="green" ]
+"rsc2:child_rsc2:1_start_0" [ color="green" ]
+"rsc2:child_rsc2:2_start_0" [ color="green" ]
+"rsc2:child_rsc2:3_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" fontcolor="orange" ]
+"rsc2_running_0" [ color="green" fontcolor="orange" ]
+"rsc2_stop_0" [ color="blue" ]
+"rsc2_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc3_start_0" [ color="green" ]
+"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0"
+"rsc2_start_0" -> "rsc2:child_rsc2:1_start_0"
+"rsc2_start_0" -> "rsc2:child_rsc2:2_start_0"
+"rsc2_start_0" -> "rsc2:child_rsc2:3_start_0"
+"rsc1_start_0" -> "rsc2_start_0"
+"rsc2_stopped_0" -> "rsc2_start_0"
+"rsc2:child_rsc2:0_start_0" -> "rsc2_running_0"
+"rsc2:child_rsc2:1_start_0" -> "rsc2_running_0"
+"rsc2:child_rsc2:2_start_0" -> "rsc2_running_0"
+"rsc2:child_rsc2:3_start_0" -> "rsc2_running_0"
+"rsc2_running_0" -> "rsc3_start_0"
+}
diff --git a/crm/pengine/testcases/inc1.exp b/crm/pengine/testcases/inc1.exp
index 8b10969e85..579f0eafeb 100644
--- a/crm/pengine/testcases/inc1.exp
+++ b/crm/pengine/testcases/inc1.exp
@@ -1,133 +1,133 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/inc2.dot b/crm/pengine/testcases/inc2.dot
new file mode 100644
index 0000000000..ab1dc902ea
--- /dev/null
+++ b/crm/pengine/testcases/inc2.dot
@@ -0,0 +1,41 @@
+digraph "g" {
+ size = "30,30"
+"rsc1:child_rsc1:0_stop_0" [ color="blue" ]
+"rsc1:child_rsc1:0_start_0" [ color="blue" ]
+"rsc1:child_rsc1:1_stop_0" [ color="green" ]
+"rsc1:child_rsc1:1_start_0" [ color="green" ]
+"rsc1:child_rsc1:2_stop_0" [ color="blue" ]
+"rsc1:child_rsc1:2_start_0" [ color="blue" ]
+"rsc1:child_rsc1:3_stop_0" [ color="green" ]
+"rsc1:child_rsc1:3_start_0" [ color="green" ]
+"rsc1:child_rsc1:4_stop_0" [ color="green" ]
+"rsc1_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_running_0" [ color="green" fontcolor="orange" ]
+"rsc1_stop_0" [ color="green" fontcolor="orange" ]
+"rsc1_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0"
+"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0"
+"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1_stop_0" -> "rsc1:child_rsc1:2_stop_0"
+"rsc1:child_rsc1:2_stop_0" -> "rsc1:child_rsc1:2_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:2_start_0"
+"rsc1_stop_0" -> "rsc1:child_rsc1:3_stop_0"
+"rsc1:child_rsc1:3_stop_0" -> "rsc1:child_rsc1:3_start_0"
+"rsc1:child_rsc1:3_stop_0" -> "rsc1:child_rsc1:3_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:3_start_0"
+"rsc1_stop_0" -> "rsc1:child_rsc1:4_stop_0"
+"rsc1_stopped_0" -> "rsc1_start_0"
+"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0"
+"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0"
+"rsc1:child_rsc1:2_start_0" -> "rsc1_running_0"
+"rsc1:child_rsc1:3_start_0" -> "rsc1_running_0"
+"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0"
+"rsc1:child_rsc1:1_stop_0" -> "rsc1_stopped_0"
+"rsc1:child_rsc1:2_stop_0" -> "rsc1_stopped_0"
+"rsc1:child_rsc1:3_stop_0" -> "rsc1_stopped_0"
+"rsc1:child_rsc1:4_stop_0" -> "rsc1_stopped_0"
+}
diff --git a/crm/pengine/testcases/inc2.exp b/crm/pengine/testcases/inc2.exp
index 8c49551b50..87372df4e9 100644
--- a/crm/pengine/testcases/inc2.exp
+++ b/crm/pengine/testcases/inc2.exp
@@ -1,142 +1,142 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/inc3.dot b/crm/pengine/testcases/inc3.dot
new file mode 100644
index 0000000000..192cb40bc1
--- /dev/null
+++ b/crm/pengine/testcases/inc3.dot
@@ -0,0 +1,86 @@
+digraph "g" {
+ size = "30,30"
+"rsc1:child_rsc1:0_stop_0" [ color="blue" ]
+"rsc1:child_rsc1:0_start_0" [ color="blue" ]
+"rsc1:child_rsc1:1_stop_0" [ color="green" ]
+"rsc1:child_rsc1:1_start_0" [ color="green" ]
+"rsc1:child_rsc1:2_stop_0" [ color="blue" ]
+"rsc1:child_rsc1:2_start_0" [ color="blue" ]
+"rsc1:child_rsc1:3_stop_0" [ color="green" ]
+"rsc1:child_rsc1:3_start_0" [ color="green" ]
+"rsc1:child_rsc1:4_stop_0" [ color="green" ]
+"rsc1_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_running_0" [ color="green" fontcolor="orange" ]
+"rsc1_stop_0" [ color="green" fontcolor="orange" ]
+"rsc1_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc2:child_rsc2:0_stop_0" [ color="green" ]
+"rsc2:child_rsc2:0_start_0" [ color="green" ]
+"rsc2:child_rsc2:1_stop_0" [ color="blue" ]
+"rsc2:child_rsc2:1_start_0" [ color="blue" ]
+"rsc2:child_rsc2:2_stop_0" [ color="green" ]
+"rsc2:child_rsc2:2_start_0" [ color="green" ]
+"rsc2:child_rsc2:3_stop_0" [ color="blue" ]
+"rsc2:child_rsc2:3_start_0" [ color="blue" ]
+"rsc2:child_rsc2:4_stop_0" [ color="green" ]
+"rsc2:child_rsc2:4_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" fontcolor="orange" ]
+"rsc2_running_0" [ color="green" fontcolor="orange" ]
+"rsc2_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0"
+"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0"
+"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1_stop_0" -> "rsc1:child_rsc1:2_stop_0"
+"rsc1:child_rsc1:2_stop_0" -> "rsc1:child_rsc1:2_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:2_start_0"
+"rsc1_stop_0" -> "rsc1:child_rsc1:3_stop_0"
+"rsc1:child_rsc1:3_stop_0" -> "rsc1:child_rsc1:3_start_0"
+"rsc1:child_rsc1:3_stop_0" -> "rsc1:child_rsc1:3_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:3_start_0"
+"rsc1_stop_0" -> "rsc1:child_rsc1:4_stop_0"
+"rsc1_stopped_0" -> "rsc1_start_0"
+"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0"
+"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0"
+"rsc1:child_rsc1:2_start_0" -> "rsc1_running_0"
+"rsc1:child_rsc1:3_start_0" -> "rsc1_running_0"
+"rsc2_stopped_0" -> "rsc1_stop_0"
+"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0"
+"rsc1:child_rsc1:1_stop_0" -> "rsc1_stopped_0"
+"rsc1:child_rsc1:2_stop_0" -> "rsc1_stopped_0"
+"rsc1:child_rsc1:3_stop_0" -> "rsc1_stopped_0"
+"rsc1:child_rsc1:4_stop_0" -> "rsc1_stopped_0"
+"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0"
+"rsc2:child_rsc2:0_stop_0" -> "rsc2:child_rsc2:0_start_0"
+"rsc2:child_rsc2:0_stop_0" -> "rsc2:child_rsc2:0_start_0"
+"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0"
+"rsc2_stop_0" -> "rsc2:child_rsc2:1_stop_0"
+"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:1_start_0"
+"rsc2_start_0" -> "rsc2:child_rsc2:1_start_0"
+"rsc2_stop_0" -> "rsc2:child_rsc2:2_stop_0"
+"rsc2:child_rsc2:2_stop_0" -> "rsc2:child_rsc2:2_start_0"
+"rsc2:child_rsc2:2_stop_0" -> "rsc2:child_rsc2:2_start_0"
+"rsc2_start_0" -> "rsc2:child_rsc2:2_start_0"
+"rsc2_stop_0" -> "rsc2:child_rsc2:3_stop_0"
+"rsc2:child_rsc2:3_stop_0" -> "rsc2:child_rsc2:3_start_0"
+"rsc2_start_0" -> "rsc2:child_rsc2:3_start_0"
+"rsc2_stop_0" -> "rsc2:child_rsc2:4_stop_0"
+"rsc2:child_rsc2:4_stop_0" -> "rsc2:child_rsc2:4_start_0"
+"rsc2:child_rsc2:4_stop_0" -> "rsc2:child_rsc2:4_start_0"
+"rsc2_start_0" -> "rsc2:child_rsc2:4_start_0"
+"rsc1_running_0" -> "rsc2_start_0"
+"rsc2_stopped_0" -> "rsc2_start_0"
+"rsc2:child_rsc2:0_start_0" -> "rsc2_running_0"
+"rsc2:child_rsc2:1_start_0" -> "rsc2_running_0"
+"rsc2:child_rsc2:2_start_0" -> "rsc2_running_0"
+"rsc2:child_rsc2:3_start_0" -> "rsc2_running_0"
+"rsc2:child_rsc2:4_start_0" -> "rsc2_running_0"
+"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0"
+"rsc2:child_rsc2:1_stop_0" -> "rsc2_stopped_0"
+"rsc2:child_rsc2:2_stop_0" -> "rsc2_stopped_0"
+"rsc2:child_rsc2:3_stop_0" -> "rsc2_stopped_0"
+"rsc2:child_rsc2:4_stop_0" -> "rsc2_stopped_0"
+}
diff --git a/crm/pengine/testcases/inc3.exp b/crm/pengine/testcases/inc3.exp
index 88661fe326..b00d80483f 100644
--- a/crm/pengine/testcases/inc3.exp
+++ b/crm/pengine/testcases/inc3.exp
@@ -1,310 +1,310 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/inc4.dot b/crm/pengine/testcases/inc4.dot
new file mode 100644
index 0000000000..adab37e537
--- /dev/null
+++ b/crm/pengine/testcases/inc4.dot
@@ -0,0 +1,71 @@
+digraph "g" {
+ size = "30,30"
+"rsc1:child_rsc1:0_stop_0" [ color="green" ]
+"rsc1:child_rsc1:0_start_0" [ color="green" ]
+"rsc1:child_rsc1:1_stop_0" [ color="green" ]
+"rsc1:child_rsc1:1_start_0" [ color="green" ]
+"rsc1:child_rsc1:2_stop_0" [ color="green" ]
+"rsc1:child_rsc1:2_start_0" [ color="green" ]
+"rsc1:child_rsc1:3_stop_0" [ color="green" ]
+"rsc1:child_rsc1:3_start_0" [ color="green" ]
+"rsc1:child_rsc1:4_stop_0" [ color="green" ]
+"rsc1_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_running_0" [ color="green" fontcolor="orange" ]
+"rsc1_stop_0" [ color="green" fontcolor="orange" ]
+"rsc1_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc2:child_rsc2:0_stop_0" [ color="green" ]
+"rsc2:child_rsc2:0_start_0" [ color="green" ]
+"rsc2:child_rsc2:1_stop_0" [ color="green" ]
+"rsc2:child_rsc2:1_start_0" [ color="green" ]
+"rsc2:child_rsc2:2_stop_0" [ color="green" ]
+"rsc2:child_rsc2:2_start_0" [ color="green" ]
+"rsc2:child_rsc2:3_stop_0" [ color="green" ]
+"rsc2:child_rsc2:3_start_0" [ color="green" ]
+"rsc2:child_rsc2:4_stop_0" [ color="green" ]
+"rsc2:child_rsc2:4_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" fontcolor="orange" ]
+"rsc2_running_0" [ color="green" fontcolor="orange" ]
+"rsc2_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:0_stop_0"
+"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1:child_rsc1:2_stop_0" -> "rsc1:child_rsc1:1_stop_0"
+"rsc1:child_rsc1:0_start_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1:child_rsc1:3_stop_0" -> "rsc1:child_rsc1:2_stop_0"
+"rsc1:child_rsc1:1_start_0" -> "rsc1:child_rsc1:2_start_0"
+"rsc1:child_rsc1:2_stop_0" -> "rsc1:child_rsc1:2_start_0"
+"rsc1:child_rsc1:4_stop_0" -> "rsc1:child_rsc1:3_stop_0"
+"rsc1:child_rsc1:2_start_0" -> "rsc1:child_rsc1:3_start_0"
+"rsc1:child_rsc1:3_stop_0" -> "rsc1:child_rsc1:3_start_0"
+"rsc1:child_rsc1:3_stop_0" -> "rsc1:child_rsc1:3_start_0"
+"rsc1_stop_0" -> "rsc1:child_rsc1:4_stop_0"
+"rsc1_stopped_0" -> "rsc1_start_0"
+"rsc1:child_rsc1:3_start_0" -> "rsc1_running_0"
+"rsc2_stopped_0" -> "rsc1_stop_0"
+"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0"
+"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:0_stop_0"
+"rsc2:child_rsc2:0_stop_0" -> "rsc2:child_rsc2:0_start_0"
+"rsc2:child_rsc2:0_stop_0" -> "rsc2:child_rsc2:0_start_0"
+"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0"
+"rsc2:child_rsc2:2_stop_0" -> "rsc2:child_rsc2:1_stop_0"
+"rsc2:child_rsc2:0_start_0" -> "rsc2:child_rsc2:1_start_0"
+"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:1_start_0"
+"rsc2:child_rsc2:3_stop_0" -> "rsc2:child_rsc2:2_stop_0"
+"rsc2:child_rsc2:1_start_0" -> "rsc2:child_rsc2:2_start_0"
+"rsc2:child_rsc2:2_stop_0" -> "rsc2:child_rsc2:2_start_0"
+"rsc2:child_rsc2:2_stop_0" -> "rsc2:child_rsc2:2_start_0"
+"rsc2:child_rsc2:4_stop_0" -> "rsc2:child_rsc2:3_stop_0"
+"rsc2:child_rsc2:2_start_0" -> "rsc2:child_rsc2:3_start_0"
+"rsc2:child_rsc2:3_stop_0" -> "rsc2:child_rsc2:3_start_0"
+"rsc2_stop_0" -> "rsc2:child_rsc2:4_stop_0"
+"rsc2:child_rsc2:3_start_0" -> "rsc2:child_rsc2:4_start_0"
+"rsc2:child_rsc2:4_stop_0" -> "rsc2:child_rsc2:4_start_0"
+"rsc2:child_rsc2:4_stop_0" -> "rsc2:child_rsc2:4_start_0"
+"rsc1_running_0" -> "rsc2_start_0"
+"rsc2_stopped_0" -> "rsc2_start_0"
+"rsc2:child_rsc2:4_start_0" -> "rsc2_running_0"
+"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0"
+}
diff --git a/crm/pengine/testcases/inc4.exp b/crm/pengine/testcases/inc4.exp
index 3652399761..eaa329b171 100644
--- a/crm/pengine/testcases/inc4.exp
+++ b/crm/pengine/testcases/inc4.exp
@@ -1,429 +1,429 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/inc5.dot b/crm/pengine/testcases/inc5.dot
new file mode 100644
index 0000000000..5c0e9a730e
--- /dev/null
+++ b/crm/pengine/testcases/inc5.dot
@@ -0,0 +1,167 @@
+digraph "g" {
+ size = "30,30"
+"rsc1:child_rsc1:0_stop_0" [ color="blue" ]
+"rsc1:child_rsc1:0_start_0" [ color="blue" ]
+"rsc1:child_rsc1:1_stop_0" [ color="blue" ]
+"rsc1:child_rsc1:1_start_0" [ color="blue" ]
+"rsc1_start_0" [ color="blue" ]
+"rsc1_running_0" [ color="blue" ]
+"rsc1_stop_0" [ color="blue" ]
+"rsc1_stopped_0" [ color="blue" ]
+"rsc2:child_rsc2:0_stop_0" [ color="blue" ]
+"rsc2:child_rsc2:0_start_0" [ color="blue" ]
+"rsc2:child_rsc2:1_stop_0" [ color="green" ]
+"rsc2:child_rsc2:1_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" fontcolor="orange" ]
+"rsc2_running_0" [ color="green" fontcolor="orange" ]
+"rsc2_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc3:child_rsc3:0_stop_0" [ color="blue" ]
+"rsc3:child_rsc3:0_start_0" [ color="blue" ]
+"rsc3:child_rsc3:1_stop_0" [ color="blue" ]
+"rsc3:child_rsc3:1_start_0" [ color="blue" ]
+"rsc3_start_0" [ color="blue" ]
+"rsc3_running_0" [ color="blue" ]
+"rsc3_stop_0" [ color="blue" ]
+"rsc3_stopped_0" [ color="blue" ]
+"rsc4:child_rsc4:0_stop_0" [ color="blue" ]
+"rsc4:child_rsc4:0_start_0" [ color="blue" ]
+"rsc4:child_rsc4:1_stop_0" [ color="green" ]
+"rsc4:child_rsc4:1_start_0" [ color="green" ]
+"rsc4_start_0" [ color="green" fontcolor="orange" ]
+"rsc4_running_0" [ color="green" fontcolor="orange" ]
+"rsc4_stop_0" [ color="green" fontcolor="orange" ]
+"rsc4_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc5:child_rsc5:0_stop_0" [ color="green" ]
+"rsc5:child_rsc5:0_start_0" [ color="green" ]
+"rsc5:child_rsc5:1_stop_0" [ color="blue" ]
+"rsc5:child_rsc5:1_start_0" [ color="blue" ]
+"rsc5_start_0" [ color="green" fontcolor="orange" ]
+"rsc5_running_0" [ color="green" fontcolor="orange" ]
+"rsc5_stop_0" [ color="green" fontcolor="orange" ]
+"rsc5_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc6:child_rsc6:0_stop_0" [ color="blue" ]
+"rsc6:child_rsc6:0_start_0" [ color="blue" ]
+"rsc6:child_rsc6:1_stop_0" [ color="blue" ]
+"rsc6:child_rsc6:1_start_0" [ color="blue" ]
+"rsc6_start_0" [ color="blue" ]
+"rsc6_running_0" [ color="blue" ]
+"rsc6_stop_0" [ color="blue" ]
+"rsc6_stopped_0" [ color="blue" ]
+"rsc7:child_rsc7:0_stop_0" [ color="green" ]
+"rsc7:child_rsc7:0_start_0" [ color="green" ]
+"rsc7:child_rsc7:1_stop_0" [ color="blue" ]
+"rsc7:child_rsc7:1_start_0" [ color="blue" ]
+"rsc7_start_0" [ color="green" fontcolor="orange" ]
+"rsc7_running_0" [ color="green" fontcolor="orange" ]
+"rsc7_stop_0" [ color="green" fontcolor="orange" ]
+"rsc7_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc8:child_rsc8:0_stop_0" [ color="blue" ]
+"rsc8:child_rsc8:0_start_0" [ color="blue" ]
+"rsc8:child_rsc8:1_stop_0" [ color="blue" ]
+"rsc8:child_rsc8:1_start_0" [ color="blue" ]
+"rsc8_start_0" [ color="blue" ]
+"rsc8_running_0" [ color="blue" ]
+"rsc8_stop_0" [ color="blue" ]
+"rsc8_stopped_0" [ color="blue" ]
+"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0"
+"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0"
+"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1_stopped_0" -> "rsc1_start_0"
+"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0"
+"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0"
+"rsc2_stopped_0" -> "rsc1_stop_0"
+"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0"
+"rsc1:child_rsc1:1_stop_0" -> "rsc1_stopped_0"
+"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0"
+"rsc2:child_rsc2:0_stop_0" -> "rsc2:child_rsc2:0_start_0"
+"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0"
+"rsc2_stop_0" -> "rsc2:child_rsc2:1_stop_0"
+"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:1_start_0"
+"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:1_start_0"
+"rsc2_start_0" -> "rsc2:child_rsc2:1_start_0"
+"rsc1_running_0" -> "rsc2_start_0"
+"rsc2_stopped_0" -> "rsc2_start_0"
+"rsc2:child_rsc2:0_start_0" -> "rsc2_running_0"
+"rsc2:child_rsc2:1_start_0" -> "rsc2_running_0"
+"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0"
+"rsc2:child_rsc2:1_stop_0" -> "rsc2_stopped_0"
+"rsc3_stop_0" -> "rsc3:child_rsc3:0_stop_0"
+"rsc3:child_rsc3:0_stop_0" -> "rsc3:child_rsc3:0_start_0"
+"rsc3_start_0" -> "rsc3:child_rsc3:0_start_0"
+"rsc3_stop_0" -> "rsc3:child_rsc3:1_stop_0"
+"rsc3:child_rsc3:1_stop_0" -> "rsc3:child_rsc3:1_start_0"
+"rsc3_start_0" -> "rsc3:child_rsc3:1_start_0"
+"rsc3_stopped_0" -> "rsc3_start_0"
+"rsc3:child_rsc3:0_start_0" -> "rsc3_running_0"
+"rsc3:child_rsc3:1_start_0" -> "rsc3_running_0"
+"rsc4_stopped_0" -> "rsc3_stop_0"
+"rsc3:child_rsc3:0_stop_0" -> "rsc3_stopped_0"
+"rsc3:child_rsc3:1_stop_0" -> "rsc3_stopped_0"
+"rsc4_stop_0" -> "rsc4:child_rsc4:0_stop_0"
+"rsc4:child_rsc4:0_stop_0" -> "rsc4:child_rsc4:0_start_0"
+"rsc4_start_0" -> "rsc4:child_rsc4:0_start_0"
+"rsc4_stop_0" -> "rsc4:child_rsc4:1_stop_0"
+"rsc4:child_rsc4:1_stop_0" -> "rsc4:child_rsc4:1_start_0"
+"rsc4:child_rsc4:1_stop_0" -> "rsc4:child_rsc4:1_start_0"
+"rsc4_start_0" -> "rsc4:child_rsc4:1_start_0"
+"rsc3_running_0" -> "rsc4_start_0"
+"rsc4_stopped_0" -> "rsc4_start_0"
+"rsc4:child_rsc4:0_start_0" -> "rsc4_running_0"
+"rsc4:child_rsc4:1_start_0" -> "rsc4_running_0"
+"rsc4:child_rsc4:0_stop_0" -> "rsc4_stopped_0"
+"rsc4:child_rsc4:1_stop_0" -> "rsc4_stopped_0"
+"rsc5_stop_0" -> "rsc5:child_rsc5:0_stop_0"
+"rsc5:child_rsc5:0_stop_0" -> "rsc5:child_rsc5:0_start_0"
+"rsc5:child_rsc5:0_stop_0" -> "rsc5:child_rsc5:0_start_0"
+"rsc5_start_0" -> "rsc5:child_rsc5:0_start_0"
+"rsc5_stop_0" -> "rsc5:child_rsc5:1_stop_0"
+"rsc5:child_rsc5:1_stop_0" -> "rsc5:child_rsc5:1_start_0"
+"rsc5_start_0" -> "rsc5:child_rsc5:1_start_0"
+"rsc5_stopped_0" -> "rsc5_start_0"
+"rsc5:child_rsc5:0_start_0" -> "rsc5_running_0"
+"rsc5:child_rsc5:1_start_0" -> "rsc5_running_0"
+"rsc6_stopped_0" -> "rsc5_stop_0"
+"rsc5:child_rsc5:0_stop_0" -> "rsc5_stopped_0"
+"rsc5:child_rsc5:1_stop_0" -> "rsc5_stopped_0"
+"rsc6_stop_0" -> "rsc6:child_rsc6:0_stop_0"
+"rsc6:child_rsc6:0_stop_0" -> "rsc6:child_rsc6:0_start_0"
+"rsc6_start_0" -> "rsc6:child_rsc6:0_start_0"
+"rsc6_stop_0" -> "rsc6:child_rsc6:1_stop_0"
+"rsc6:child_rsc6:1_stop_0" -> "rsc6:child_rsc6:1_start_0"
+"rsc6_start_0" -> "rsc6:child_rsc6:1_start_0"
+"rsc5_running_0" -> "rsc6_start_0"
+"rsc6_stopped_0" -> "rsc6_start_0"
+"rsc6:child_rsc6:0_start_0" -> "rsc6_running_0"
+"rsc6:child_rsc6:1_start_0" -> "rsc6_running_0"
+"rsc6:child_rsc6:0_stop_0" -> "rsc6_stopped_0"
+"rsc6:child_rsc6:1_stop_0" -> "rsc6_stopped_0"
+"rsc7_stop_0" -> "rsc7:child_rsc7:0_stop_0"
+"rsc7:child_rsc7:0_stop_0" -> "rsc7:child_rsc7:0_start_0"
+"rsc7:child_rsc7:0_stop_0" -> "rsc7:child_rsc7:0_start_0"
+"rsc7_start_0" -> "rsc7:child_rsc7:0_start_0"
+"rsc7_stop_0" -> "rsc7:child_rsc7:1_stop_0"
+"rsc7:child_rsc7:1_stop_0" -> "rsc7:child_rsc7:1_start_0"
+"rsc7_start_0" -> "rsc7:child_rsc7:1_start_0"
+"rsc7_stopped_0" -> "rsc7_start_0"
+"rsc7:child_rsc7:0_start_0" -> "rsc7_running_0"
+"rsc7:child_rsc7:1_start_0" -> "rsc7_running_0"
+"rsc8_stopped_0" -> "rsc7_stop_0"
+"rsc7:child_rsc7:0_stop_0" -> "rsc7_stopped_0"
+"rsc7:child_rsc7:1_stop_0" -> "rsc7_stopped_0"
+"rsc8_stop_0" -> "rsc8:child_rsc8:0_stop_0"
+"rsc8:child_rsc8:0_stop_0" -> "rsc8:child_rsc8:0_start_0"
+"rsc8_start_0" -> "rsc8:child_rsc8:0_start_0"
+"rsc8_stop_0" -> "rsc8:child_rsc8:1_stop_0"
+"rsc8:child_rsc8:1_stop_0" -> "rsc8:child_rsc8:1_start_0"
+"rsc8_start_0" -> "rsc8:child_rsc8:1_start_0"
+"rsc7_running_0" -> "rsc8_start_0"
+"rsc8_stopped_0" -> "rsc8_start_0"
+"rsc8:child_rsc8:0_start_0" -> "rsc8_running_0"
+"rsc8:child_rsc8:1_start_0" -> "rsc8_running_0"
+"rsc8:child_rsc8:0_stop_0" -> "rsc8_stopped_0"
+"rsc8:child_rsc8:1_stop_0" -> "rsc8_stopped_0"
+}
diff --git a/crm/pengine/testcases/inc5.exp b/crm/pengine/testcases/inc5.exp
index b29ef95b49..079e8af25b 100644
--- a/crm/pengine/testcases/inc5.exp
+++ b/crm/pengine/testcases/inc5.exp
@@ -1,319 +1,319 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/inc6.dot b/crm/pengine/testcases/inc6.dot
new file mode 100644
index 0000000000..795b001bfd
--- /dev/null
+++ b/crm/pengine/testcases/inc6.dot
@@ -0,0 +1,167 @@
+digraph "g" {
+ size = "30,30"
+"rsc1:child_rsc1:0_stop_0" [ color="blue" ]
+"rsc1:child_rsc1:0_start_0" [ color="blue" ]
+"rsc1:child_rsc1:1_stop_0" [ color="blue" ]
+"rsc1:child_rsc1:1_start_0" [ color="blue" ]
+"rsc1_start_0" [ color="blue" ]
+"rsc1_running_0" [ color="blue" ]
+"rsc1_stop_0" [ color="blue" ]
+"rsc1_stopped_0" [ color="blue" ]
+"rsc2:child_rsc2:0_stop_0" [ color="green" ]
+"rsc2:child_rsc2:0_start_0" [ color="green" ]
+"rsc2:child_rsc2:1_stop_0" [ color="green" ]
+"rsc2:child_rsc2:1_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" fontcolor="orange" ]
+"rsc2_running_0" [ color="green" fontcolor="orange" ]
+"rsc2_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc3:child_rsc3:0_stop_0" [ color="blue" ]
+"rsc3:child_rsc3:0_start_0" [ color="blue" ]
+"rsc3:child_rsc3:1_stop_0" [ color="blue" ]
+"rsc3:child_rsc3:1_start_0" [ color="blue" ]
+"rsc3_start_0" [ color="blue" ]
+"rsc3_running_0" [ color="blue" ]
+"rsc3_stop_0" [ color="blue" ]
+"rsc3_stopped_0" [ color="blue" ]
+"rsc4:child_rsc4:0_stop_0" [ color="blue" ]
+"rsc4:child_rsc4:0_start_0" [ color="blue" ]
+"rsc4:child_rsc4:1_stop_0" [ color="green" ]
+"rsc4:child_rsc4:1_start_0" [ color="green" ]
+"rsc4_start_0" [ color="green" fontcolor="orange" ]
+"rsc4_running_0" [ color="green" fontcolor="orange" ]
+"rsc4_stop_0" [ color="green" fontcolor="orange" ]
+"rsc4_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc5:child_rsc5:0_stop_0" [ color="green" ]
+"rsc5:child_rsc5:0_start_0" [ color="green" ]
+"rsc5:child_rsc5:1_stop_0" [ color="blue" ]
+"rsc5:child_rsc5:1_start_0" [ color="blue" ]
+"rsc5_start_0" [ color="green" fontcolor="orange" ]
+"rsc5_running_0" [ color="green" fontcolor="orange" ]
+"rsc5_stop_0" [ color="green" fontcolor="orange" ]
+"rsc5_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc6:child_rsc6:0_stop_0" [ color="green" ]
+"rsc6:child_rsc6:0_start_0" [ color="blue" ]
+"rsc6:child_rsc6:1_stop_0" [ color="green" ]
+"rsc6:child_rsc6:1_start_0" [ color="blue" ]
+"rsc6_start_0" [ color="green" fontcolor="orange" ]
+"rsc6_running_0" [ color="blue" ]
+"rsc6_stop_0" [ color="green" fontcolor="orange" ]
+"rsc6_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc7:child_rsc7:0_stop_0" [ color="green" ]
+"rsc7:child_rsc7:0_start_0" [ color="green" ]
+"rsc7:child_rsc7:1_stop_0" [ color="green" ]
+"rsc7:child_rsc7:1_start_0" [ color="green" ]
+"rsc7_start_0" [ color="green" fontcolor="orange" ]
+"rsc7_running_0" [ color="green" fontcolor="orange" ]
+"rsc7_stop_0" [ color="green" fontcolor="orange" ]
+"rsc7_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc8:child_rsc8:0_stop_0" [ color="blue" ]
+"rsc8:child_rsc8:0_start_0" [ color="blue" ]
+"rsc8:child_rsc8:1_stop_0" [ color="blue" ]
+"rsc8:child_rsc8:1_start_0" [ color="blue" ]
+"rsc8_start_0" [ color="blue" ]
+"rsc8_running_0" [ color="blue" ]
+"rsc8_stop_0" [ color="blue" ]
+"rsc8_stopped_0" [ color="blue" ]
+"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0"
+"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0"
+"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1_stopped_0" -> "rsc1_start_0"
+"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0"
+"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0"
+"rsc2_stopped_0" -> "rsc1_stop_0"
+"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0"
+"rsc1:child_rsc1:1_stop_0" -> "rsc1_stopped_0"
+"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0"
+"rsc2:child_rsc2:0_stop_0" -> "rsc2:child_rsc2:0_start_0"
+"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0"
+"rsc2_stop_0" -> "rsc2:child_rsc2:1_stop_0"
+"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:1_start_0"
+"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:1_start_0"
+"rsc2_start_0" -> "rsc2:child_rsc2:1_start_0"
+"rsc1_running_0" -> "rsc2_start_0"
+"rsc2_stopped_0" -> "rsc2_start_0"
+"rsc2:child_rsc2:0_start_0" -> "rsc2_running_0"
+"rsc2:child_rsc2:1_start_0" -> "rsc2_running_0"
+"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0"
+"rsc2:child_rsc2:1_stop_0" -> "rsc2_stopped_0"
+"rsc3_stop_0" -> "rsc3:child_rsc3:0_stop_0"
+"rsc3:child_rsc3:0_stop_0" -> "rsc3:child_rsc3:0_start_0"
+"rsc3_start_0" -> "rsc3:child_rsc3:0_start_0"
+"rsc3_stop_0" -> "rsc3:child_rsc3:1_stop_0"
+"rsc3:child_rsc3:1_stop_0" -> "rsc3:child_rsc3:1_start_0"
+"rsc3_start_0" -> "rsc3:child_rsc3:1_start_0"
+"rsc3_stopped_0" -> "rsc3_start_0"
+"rsc3:child_rsc3:0_start_0" -> "rsc3_running_0"
+"rsc3:child_rsc3:1_start_0" -> "rsc3_running_0"
+"rsc4_stopped_0" -> "rsc3_stop_0"
+"rsc3:child_rsc3:0_stop_0" -> "rsc3_stopped_0"
+"rsc3:child_rsc3:1_stop_0" -> "rsc3_stopped_0"
+"rsc4_stop_0" -> "rsc4:child_rsc4:0_stop_0"
+"rsc4:child_rsc4:0_stop_0" -> "rsc4:child_rsc4:0_start_0"
+"rsc4_start_0" -> "rsc4:child_rsc4:0_start_0"
+"rsc4_stop_0" -> "rsc4:child_rsc4:1_stop_0"
+"rsc4:child_rsc4:1_stop_0" -> "rsc4:child_rsc4:1_start_0"
+"rsc4:child_rsc4:1_stop_0" -> "rsc4:child_rsc4:1_start_0"
+"rsc4_start_0" -> "rsc4:child_rsc4:1_start_0"
+"rsc3_running_0" -> "rsc4_start_0"
+"rsc4_stopped_0" -> "rsc4_start_0"
+"rsc4:child_rsc4:0_start_0" -> "rsc4_running_0"
+"rsc4:child_rsc4:1_start_0" -> "rsc4_running_0"
+"rsc4:child_rsc4:0_stop_0" -> "rsc4_stopped_0"
+"rsc4:child_rsc4:1_stop_0" -> "rsc4_stopped_0"
+"rsc5_stop_0" -> "rsc5:child_rsc5:0_stop_0"
+"rsc5:child_rsc5:0_stop_0" -> "rsc5:child_rsc5:0_start_0"
+"rsc5:child_rsc5:0_stop_0" -> "rsc5:child_rsc5:0_start_0"
+"rsc5_start_0" -> "rsc5:child_rsc5:0_start_0"
+"rsc5_stop_0" -> "rsc5:child_rsc5:1_stop_0"
+"rsc5:child_rsc5:1_stop_0" -> "rsc5:child_rsc5:1_start_0"
+"rsc5_start_0" -> "rsc5:child_rsc5:1_start_0"
+"rsc5_stopped_0" -> "rsc5_start_0"
+"rsc5:child_rsc5:0_start_0" -> "rsc5_running_0"
+"rsc5:child_rsc5:1_start_0" -> "rsc5_running_0"
+"rsc6_stopped_0" -> "rsc5_stop_0"
+"rsc5:child_rsc5:0_stop_0" -> "rsc5_stopped_0"
+"rsc5:child_rsc5:1_stop_0" -> "rsc5_stopped_0"
+"rsc6_stop_0" -> "rsc6:child_rsc6:0_stop_0"
+"rsc6:child_rsc6:0_stop_0" -> "rsc6:child_rsc6:0_start_0"
+"rsc6_start_0" -> "rsc6:child_rsc6:0_start_0"
+"rsc6_stop_0" -> "rsc6:child_rsc6:1_stop_0"
+"rsc6:child_rsc6:1_stop_0" -> "rsc6:child_rsc6:1_start_0"
+"rsc6_start_0" -> "rsc6:child_rsc6:1_start_0"
+"rsc5_running_0" -> "rsc6_start_0"
+"rsc6_stopped_0" -> "rsc6_start_0"
+"rsc6:child_rsc6:0_start_0" -> "rsc6_running_0"
+"rsc6:child_rsc6:1_start_0" -> "rsc6_running_0"
+"rsc6:child_rsc6:0_stop_0" -> "rsc6_stopped_0"
+"rsc6:child_rsc6:1_stop_0" -> "rsc6_stopped_0"
+"rsc7_stop_0" -> "rsc7:child_rsc7:0_stop_0"
+"rsc7:child_rsc7:0_stop_0" -> "rsc7:child_rsc7:0_start_0"
+"rsc7:child_rsc7:0_stop_0" -> "rsc7:child_rsc7:0_start_0"
+"rsc7_start_0" -> "rsc7:child_rsc7:0_start_0"
+"rsc7_stop_0" -> "rsc7:child_rsc7:1_stop_0"
+"rsc7:child_rsc7:1_stop_0" -> "rsc7:child_rsc7:1_start_0"
+"rsc7_start_0" -> "rsc7:child_rsc7:1_start_0"
+"rsc7_stopped_0" -> "rsc7_start_0"
+"rsc7:child_rsc7:0_start_0" -> "rsc7_running_0"
+"rsc7:child_rsc7:1_start_0" -> "rsc7_running_0"
+"rsc8_stopped_0" -> "rsc7_stop_0"
+"rsc7:child_rsc7:0_stop_0" -> "rsc7_stopped_0"
+"rsc7:child_rsc7:1_stop_0" -> "rsc7_stopped_0"
+"rsc8_stop_0" -> "rsc8:child_rsc8:0_stop_0"
+"rsc8:child_rsc8:0_stop_0" -> "rsc8:child_rsc8:0_start_0"
+"rsc8_start_0" -> "rsc8:child_rsc8:0_start_0"
+"rsc8_stop_0" -> "rsc8:child_rsc8:1_stop_0"
+"rsc8:child_rsc8:1_stop_0" -> "rsc8:child_rsc8:1_start_0"
+"rsc8_start_0" -> "rsc8:child_rsc8:1_start_0"
+"rsc7_running_0" -> "rsc8_start_0"
+"rsc8_stopped_0" -> "rsc8_start_0"
+"rsc8:child_rsc8:0_start_0" -> "rsc8_running_0"
+"rsc8:child_rsc8:1_start_0" -> "rsc8_running_0"
+"rsc8:child_rsc8:0_stop_0" -> "rsc8_stopped_0"
+"rsc8:child_rsc8:1_stop_0" -> "rsc8_stopped_0"
+}
diff --git a/crm/pengine/testcases/interleave-0.dot b/crm/pengine/testcases/interleave-0.dot
new file mode 100644
index 0000000000..e5b56058dc
--- /dev/null
+++ b/crm/pengine/testcases/interleave-0.dot
@@ -0,0 +1,166 @@
+digraph "g" {
+ size = "30,30"
+"DoFencing:child_DoFencing:5_monitor_5000" [ color="blue" ]
+"DcIPaddr_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:7_monitor_5000" [ color="blue" ]
+"rsc_c001n08_monitor_5000" [ color="blue" ]
+"rsc_c001n02_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:6_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ color="blue" ]
+"rsc_c001n03_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ color="blue" ]
+"rsc_c001n04_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ color="blue" ]
+"rsc_c001n05_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:3_monitor_5000" [ color="blue" ]
+"rsc_c001n06_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:4_monitor_5000" [ color="blue" ]
+"rsc_c001n07_monitor_5000" [ color="blue" ]
+"DcIPaddr_stop_0" [ color="blue" ]
+"DcIPaddr_start_0" [ color="blue" ]
+"rsc_c001n09_monitor_5000" [ fontcolor="red" ]
+"rsc_c001n02_stop_0" [ color="blue" ]
+"rsc_c001n02_start_0" [ color="blue" ]
+"rsc_c001n03_stop_0" [ color="blue" ]
+"rsc_c001n03_start_0" [ color="blue" ]
+"rsc_c001n04_stop_0" [ color="blue" ]
+"rsc_c001n04_start_0" [ color="blue" ]
+"rsc_c001n05_stop_0" [ color="blue" ]
+"rsc_c001n05_start_0" [ color="blue" ]
+"rsc_c001n06_stop_0" [ color="blue" ]
+"rsc_c001n06_start_0" [ color="blue" ]
+"rsc_c001n07_stop_0" [ color="blue" ]
+"rsc_c001n07_start_0" [ color="blue" ]
+"rsc_c001n08_stop_0" [ color="blue" ]
+"rsc_c001n08_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:1_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:1_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:2_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:2_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:3_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:3_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:4_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:4_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:5_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:5_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:6_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:6_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:7_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:7_start_0" [ color="blue" ]
+"DoFencing_start_0" [ color="blue" ]
+"DoFencing_running_0" [ color="blue" ]
+"DoFencing_stop_0" [ color="blue" ]
+"DoFencing_stopped_0" [ color="blue" ]
+"CloneSet:child_CloneSet:0_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:0_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:1_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:1_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:2_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:2_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:3_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:3_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:4_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:4_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:5_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:5_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:6_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:6_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:7_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:7_monitor_5000" [ color="green" ]
+"CloneSet_start_0" [ color="green" fontcolor="orange" ]
+"CloneSet_running_0" [ color="green" fontcolor="orange" ]
+"CloneSet_stop_0" [ color="blue" ]
+"CloneSet_stopped_0" [ color="green" fontcolor="orange" ]
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing:child_DoFencing:5_monitor_5000"
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing:child_DoFencing:7_monitor_5000"
+"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000"
+"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000"
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing:child_DoFencing:6_monitor_5000"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
+"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
+"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000"
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000"
+"rsc_c001n05_start_0" -> "rsc_c001n05_monitor_5000"
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000"
+"rsc_c001n06_start_0" -> "rsc_c001n06_monitor_5000"
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing:child_DoFencing:4_monitor_5000"
+"rsc_c001n07_start_0" -> "rsc_c001n07_monitor_5000"
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
+"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
+"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0"
+"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0"
+"rsc_c001n05_stop_0" -> "rsc_c001n05_start_0"
+"rsc_c001n06_stop_0" -> "rsc_c001n06_start_0"
+"rsc_c001n07_stop_0" -> "rsc_c001n07_start_0"
+"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0"
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0"
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing:child_DoFencing:3_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0"
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing:child_DoFencing:4_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0"
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing:child_DoFencing:5_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0"
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing:child_DoFencing:6_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0"
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing:child_DoFencing:7_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0"
+"DoFencing_stopped_0" -> "DoFencing_start_0"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing_stopped_0"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:0_start_0"
+"CloneSet:child_CloneSet:0_start_0" -> "CloneSet:child_CloneSet:0_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:1_start_0"
+"CloneSet:child_CloneSet:1_start_0" -> "CloneSet:child_CloneSet:1_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:2_start_0"
+"CloneSet:child_CloneSet:2_start_0" -> "CloneSet:child_CloneSet:2_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:3_start_0"
+"CloneSet:child_CloneSet:3_start_0" -> "CloneSet:child_CloneSet:3_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:4_start_0"
+"CloneSet:child_CloneSet:4_start_0" -> "CloneSet:child_CloneSet:4_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:5_start_0"
+"CloneSet:child_CloneSet:5_start_0" -> "CloneSet:child_CloneSet:5_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:6_start_0"
+"CloneSet:child_CloneSet:6_start_0" -> "CloneSet:child_CloneSet:6_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:7_start_0"
+"CloneSet:child_CloneSet:7_start_0" -> "CloneSet:child_CloneSet:7_monitor_5000"
+"CloneSet_stopped_0" -> "CloneSet_start_0"
+"CloneSet:child_CloneSet:0_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:1_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:2_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:3_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:4_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:5_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:6_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:7_start_0" -> "CloneSet_running_0"
+}
diff --git a/crm/pengine/testcases/interleave-0.exp b/crm/pengine/testcases/interleave-0.exp
index bb88ebc4c3..aa24af401c 100644
--- a/crm/pengine/testcases/interleave-0.exp
+++ b/crm/pengine/testcases/interleave-0.exp
@@ -1,344 +1,344 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/interleave-1.dot b/crm/pengine/testcases/interleave-1.dot
new file mode 100644
index 0000000000..e5b56058dc
--- /dev/null
+++ b/crm/pengine/testcases/interleave-1.dot
@@ -0,0 +1,166 @@
+digraph "g" {
+ size = "30,30"
+"DoFencing:child_DoFencing:5_monitor_5000" [ color="blue" ]
+"DcIPaddr_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:7_monitor_5000" [ color="blue" ]
+"rsc_c001n08_monitor_5000" [ color="blue" ]
+"rsc_c001n02_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:6_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ color="blue" ]
+"rsc_c001n03_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ color="blue" ]
+"rsc_c001n04_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ color="blue" ]
+"rsc_c001n05_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:3_monitor_5000" [ color="blue" ]
+"rsc_c001n06_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:4_monitor_5000" [ color="blue" ]
+"rsc_c001n07_monitor_5000" [ color="blue" ]
+"DcIPaddr_stop_0" [ color="blue" ]
+"DcIPaddr_start_0" [ color="blue" ]
+"rsc_c001n09_monitor_5000" [ fontcolor="red" ]
+"rsc_c001n02_stop_0" [ color="blue" ]
+"rsc_c001n02_start_0" [ color="blue" ]
+"rsc_c001n03_stop_0" [ color="blue" ]
+"rsc_c001n03_start_0" [ color="blue" ]
+"rsc_c001n04_stop_0" [ color="blue" ]
+"rsc_c001n04_start_0" [ color="blue" ]
+"rsc_c001n05_stop_0" [ color="blue" ]
+"rsc_c001n05_start_0" [ color="blue" ]
+"rsc_c001n06_stop_0" [ color="blue" ]
+"rsc_c001n06_start_0" [ color="blue" ]
+"rsc_c001n07_stop_0" [ color="blue" ]
+"rsc_c001n07_start_0" [ color="blue" ]
+"rsc_c001n08_stop_0" [ color="blue" ]
+"rsc_c001n08_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:1_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:1_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:2_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:2_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:3_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:3_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:4_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:4_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:5_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:5_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:6_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:6_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:7_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:7_start_0" [ color="blue" ]
+"DoFencing_start_0" [ color="blue" ]
+"DoFencing_running_0" [ color="blue" ]
+"DoFencing_stop_0" [ color="blue" ]
+"DoFencing_stopped_0" [ color="blue" ]
+"CloneSet:child_CloneSet:0_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:0_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:1_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:1_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:2_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:2_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:3_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:3_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:4_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:4_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:5_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:5_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:6_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:6_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:7_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:7_monitor_5000" [ color="green" ]
+"CloneSet_start_0" [ color="green" fontcolor="orange" ]
+"CloneSet_running_0" [ color="green" fontcolor="orange" ]
+"CloneSet_stop_0" [ color="blue" ]
+"CloneSet_stopped_0" [ color="green" fontcolor="orange" ]
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing:child_DoFencing:5_monitor_5000"
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing:child_DoFencing:7_monitor_5000"
+"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000"
+"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000"
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing:child_DoFencing:6_monitor_5000"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
+"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
+"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000"
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000"
+"rsc_c001n05_start_0" -> "rsc_c001n05_monitor_5000"
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000"
+"rsc_c001n06_start_0" -> "rsc_c001n06_monitor_5000"
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing:child_DoFencing:4_monitor_5000"
+"rsc_c001n07_start_0" -> "rsc_c001n07_monitor_5000"
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
+"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
+"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0"
+"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0"
+"rsc_c001n05_stop_0" -> "rsc_c001n05_start_0"
+"rsc_c001n06_stop_0" -> "rsc_c001n06_start_0"
+"rsc_c001n07_stop_0" -> "rsc_c001n07_start_0"
+"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0"
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0"
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing:child_DoFencing:3_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0"
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing:child_DoFencing:4_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0"
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing:child_DoFencing:5_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0"
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing:child_DoFencing:6_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0"
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing:child_DoFencing:7_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0"
+"DoFencing_stopped_0" -> "DoFencing_start_0"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing_stopped_0"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:0_start_0"
+"CloneSet:child_CloneSet:0_start_0" -> "CloneSet:child_CloneSet:0_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:1_start_0"
+"CloneSet:child_CloneSet:1_start_0" -> "CloneSet:child_CloneSet:1_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:2_start_0"
+"CloneSet:child_CloneSet:2_start_0" -> "CloneSet:child_CloneSet:2_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:3_start_0"
+"CloneSet:child_CloneSet:3_start_0" -> "CloneSet:child_CloneSet:3_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:4_start_0"
+"CloneSet:child_CloneSet:4_start_0" -> "CloneSet:child_CloneSet:4_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:5_start_0"
+"CloneSet:child_CloneSet:5_start_0" -> "CloneSet:child_CloneSet:5_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:6_start_0"
+"CloneSet:child_CloneSet:6_start_0" -> "CloneSet:child_CloneSet:6_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:7_start_0"
+"CloneSet:child_CloneSet:7_start_0" -> "CloneSet:child_CloneSet:7_monitor_5000"
+"CloneSet_stopped_0" -> "CloneSet_start_0"
+"CloneSet:child_CloneSet:0_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:1_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:2_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:3_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:4_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:5_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:6_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:7_start_0" -> "CloneSet_running_0"
+}
diff --git a/crm/pengine/testcases/interleave-1.exp b/crm/pengine/testcases/interleave-1.exp
index bb88ebc4c3..aa24af401c 100644
--- a/crm/pengine/testcases/interleave-1.exp
+++ b/crm/pengine/testcases/interleave-1.exp
@@ -1,344 +1,344 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/interleave-2.dot b/crm/pengine/testcases/interleave-2.dot
new file mode 100644
index 0000000000..e5b56058dc
--- /dev/null
+++ b/crm/pengine/testcases/interleave-2.dot
@@ -0,0 +1,166 @@
+digraph "g" {
+ size = "30,30"
+"DoFencing:child_DoFencing:5_monitor_5000" [ color="blue" ]
+"DcIPaddr_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:7_monitor_5000" [ color="blue" ]
+"rsc_c001n08_monitor_5000" [ color="blue" ]
+"rsc_c001n02_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:6_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ color="blue" ]
+"rsc_c001n03_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ color="blue" ]
+"rsc_c001n04_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ color="blue" ]
+"rsc_c001n05_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:3_monitor_5000" [ color="blue" ]
+"rsc_c001n06_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:4_monitor_5000" [ color="blue" ]
+"rsc_c001n07_monitor_5000" [ color="blue" ]
+"DcIPaddr_stop_0" [ color="blue" ]
+"DcIPaddr_start_0" [ color="blue" ]
+"rsc_c001n09_monitor_5000" [ fontcolor="red" ]
+"rsc_c001n02_stop_0" [ color="blue" ]
+"rsc_c001n02_start_0" [ color="blue" ]
+"rsc_c001n03_stop_0" [ color="blue" ]
+"rsc_c001n03_start_0" [ color="blue" ]
+"rsc_c001n04_stop_0" [ color="blue" ]
+"rsc_c001n04_start_0" [ color="blue" ]
+"rsc_c001n05_stop_0" [ color="blue" ]
+"rsc_c001n05_start_0" [ color="blue" ]
+"rsc_c001n06_stop_0" [ color="blue" ]
+"rsc_c001n06_start_0" [ color="blue" ]
+"rsc_c001n07_stop_0" [ color="blue" ]
+"rsc_c001n07_start_0" [ color="blue" ]
+"rsc_c001n08_stop_0" [ color="blue" ]
+"rsc_c001n08_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:1_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:1_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:2_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:2_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:3_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:3_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:4_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:4_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:5_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:5_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:6_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:6_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:7_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:7_start_0" [ color="blue" ]
+"DoFencing_start_0" [ color="blue" ]
+"DoFencing_running_0" [ color="blue" ]
+"DoFencing_stop_0" [ color="blue" ]
+"DoFencing_stopped_0" [ color="blue" ]
+"CloneSet:child_CloneSet:0_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:0_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:1_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:1_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:2_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:2_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:3_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:3_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:4_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:4_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:5_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:5_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:6_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:6_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:7_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:7_monitor_5000" [ color="green" ]
+"CloneSet_start_0" [ color="green" fontcolor="orange" ]
+"CloneSet_running_0" [ color="green" fontcolor="orange" ]
+"CloneSet_stop_0" [ color="blue" ]
+"CloneSet_stopped_0" [ color="green" fontcolor="orange" ]
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing:child_DoFencing:5_monitor_5000"
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing:child_DoFencing:7_monitor_5000"
+"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000"
+"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000"
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing:child_DoFencing:6_monitor_5000"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
+"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
+"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000"
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000"
+"rsc_c001n05_start_0" -> "rsc_c001n05_monitor_5000"
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000"
+"rsc_c001n06_start_0" -> "rsc_c001n06_monitor_5000"
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing:child_DoFencing:4_monitor_5000"
+"rsc_c001n07_start_0" -> "rsc_c001n07_monitor_5000"
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
+"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
+"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0"
+"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0"
+"rsc_c001n05_stop_0" -> "rsc_c001n05_start_0"
+"rsc_c001n06_stop_0" -> "rsc_c001n06_start_0"
+"rsc_c001n07_stop_0" -> "rsc_c001n07_start_0"
+"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0"
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0"
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing:child_DoFencing:3_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0"
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing:child_DoFencing:4_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0"
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing:child_DoFencing:5_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0"
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing:child_DoFencing:6_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0"
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing:child_DoFencing:7_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0"
+"DoFencing_stopped_0" -> "DoFencing_start_0"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing_stopped_0"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:0_start_0"
+"CloneSet:child_CloneSet:0_start_0" -> "CloneSet:child_CloneSet:0_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:1_start_0"
+"CloneSet:child_CloneSet:1_start_0" -> "CloneSet:child_CloneSet:1_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:2_start_0"
+"CloneSet:child_CloneSet:2_start_0" -> "CloneSet:child_CloneSet:2_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:3_start_0"
+"CloneSet:child_CloneSet:3_start_0" -> "CloneSet:child_CloneSet:3_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:4_start_0"
+"CloneSet:child_CloneSet:4_start_0" -> "CloneSet:child_CloneSet:4_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:5_start_0"
+"CloneSet:child_CloneSet:5_start_0" -> "CloneSet:child_CloneSet:5_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:6_start_0"
+"CloneSet:child_CloneSet:6_start_0" -> "CloneSet:child_CloneSet:6_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:7_start_0"
+"CloneSet:child_CloneSet:7_start_0" -> "CloneSet:child_CloneSet:7_monitor_5000"
+"CloneSet_stopped_0" -> "CloneSet_start_0"
+"CloneSet:child_CloneSet:0_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:1_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:2_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:3_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:4_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:5_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:6_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:7_start_0" -> "CloneSet_running_0"
+}
diff --git a/crm/pengine/testcases/interleave-2.exp b/crm/pengine/testcases/interleave-2.exp
index 7b0bd6f7a9..e19b465560 100644
--- a/crm/pengine/testcases/interleave-2.exp
+++ b/crm/pengine/testcases/interleave-2.exp
@@ -1,344 +1,344 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/interleave-3.dot b/crm/pengine/testcases/interleave-3.dot
new file mode 100644
index 0000000000..e5b56058dc
--- /dev/null
+++ b/crm/pengine/testcases/interleave-3.dot
@@ -0,0 +1,166 @@
+digraph "g" {
+ size = "30,30"
+"DoFencing:child_DoFencing:5_monitor_5000" [ color="blue" ]
+"DcIPaddr_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:7_monitor_5000" [ color="blue" ]
+"rsc_c001n08_monitor_5000" [ color="blue" ]
+"rsc_c001n02_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:6_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ color="blue" ]
+"rsc_c001n03_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ color="blue" ]
+"rsc_c001n04_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ color="blue" ]
+"rsc_c001n05_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:3_monitor_5000" [ color="blue" ]
+"rsc_c001n06_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:4_monitor_5000" [ color="blue" ]
+"rsc_c001n07_monitor_5000" [ color="blue" ]
+"DcIPaddr_stop_0" [ color="blue" ]
+"DcIPaddr_start_0" [ color="blue" ]
+"rsc_c001n09_monitor_5000" [ fontcolor="red" ]
+"rsc_c001n02_stop_0" [ color="blue" ]
+"rsc_c001n02_start_0" [ color="blue" ]
+"rsc_c001n03_stop_0" [ color="blue" ]
+"rsc_c001n03_start_0" [ color="blue" ]
+"rsc_c001n04_stop_0" [ color="blue" ]
+"rsc_c001n04_start_0" [ color="blue" ]
+"rsc_c001n05_stop_0" [ color="blue" ]
+"rsc_c001n05_start_0" [ color="blue" ]
+"rsc_c001n06_stop_0" [ color="blue" ]
+"rsc_c001n06_start_0" [ color="blue" ]
+"rsc_c001n07_stop_0" [ color="blue" ]
+"rsc_c001n07_start_0" [ color="blue" ]
+"rsc_c001n08_stop_0" [ color="blue" ]
+"rsc_c001n08_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:1_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:1_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:2_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:2_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:3_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:3_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:4_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:4_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:5_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:5_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:6_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:6_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:7_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:7_start_0" [ color="blue" ]
+"DoFencing_start_0" [ color="blue" ]
+"DoFencing_running_0" [ color="blue" ]
+"DoFencing_stop_0" [ color="blue" ]
+"DoFencing_stopped_0" [ color="blue" ]
+"CloneSet:child_CloneSet:0_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:0_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:1_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:1_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:2_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:2_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:3_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:3_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:4_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:4_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:5_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:5_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:6_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:6_monitor_5000" [ color="green" ]
+"CloneSet:child_CloneSet:7_start_0" [ color="green" ]
+"CloneSet:child_CloneSet:7_monitor_5000" [ color="green" ]
+"CloneSet_start_0" [ color="green" fontcolor="orange" ]
+"CloneSet_running_0" [ color="green" fontcolor="orange" ]
+"CloneSet_stop_0" [ color="blue" ]
+"CloneSet_stopped_0" [ color="green" fontcolor="orange" ]
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing:child_DoFencing:5_monitor_5000"
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing:child_DoFencing:7_monitor_5000"
+"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000"
+"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000"
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing:child_DoFencing:6_monitor_5000"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
+"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
+"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000"
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000"
+"rsc_c001n05_start_0" -> "rsc_c001n05_monitor_5000"
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000"
+"rsc_c001n06_start_0" -> "rsc_c001n06_monitor_5000"
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing:child_DoFencing:4_monitor_5000"
+"rsc_c001n07_start_0" -> "rsc_c001n07_monitor_5000"
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
+"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
+"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0"
+"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0"
+"rsc_c001n05_stop_0" -> "rsc_c001n05_start_0"
+"rsc_c001n06_stop_0" -> "rsc_c001n06_start_0"
+"rsc_c001n07_stop_0" -> "rsc_c001n07_start_0"
+"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0"
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0"
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing:child_DoFencing:3_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0"
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing:child_DoFencing:4_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0"
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing:child_DoFencing:5_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0"
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing:child_DoFencing:6_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0"
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing:child_DoFencing:7_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0"
+"DoFencing_stopped_0" -> "DoFencing_start_0"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing_stopped_0"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:0_start_0"
+"CloneSet:child_CloneSet:0_start_0" -> "CloneSet:child_CloneSet:0_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:1_start_0"
+"CloneSet:child_CloneSet:1_start_0" -> "CloneSet:child_CloneSet:1_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:2_start_0"
+"CloneSet:child_CloneSet:2_start_0" -> "CloneSet:child_CloneSet:2_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:3_start_0"
+"CloneSet:child_CloneSet:3_start_0" -> "CloneSet:child_CloneSet:3_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:4_start_0"
+"CloneSet:child_CloneSet:4_start_0" -> "CloneSet:child_CloneSet:4_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:5_start_0"
+"CloneSet:child_CloneSet:5_start_0" -> "CloneSet:child_CloneSet:5_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:6_start_0"
+"CloneSet:child_CloneSet:6_start_0" -> "CloneSet:child_CloneSet:6_monitor_5000"
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:7_start_0"
+"CloneSet:child_CloneSet:7_start_0" -> "CloneSet:child_CloneSet:7_monitor_5000"
+"CloneSet_stopped_0" -> "CloneSet_start_0"
+"CloneSet:child_CloneSet:0_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:1_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:2_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:3_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:4_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:5_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:6_start_0" -> "CloneSet_running_0"
+"CloneSet:child_CloneSet:7_start_0" -> "CloneSet_running_0"
+}
diff --git a/crm/pengine/testcases/interleave-3.exp b/crm/pengine/testcases/interleave-3.exp
index 7b0bd6f7a9..e19b465560 100644
--- a/crm/pengine/testcases/interleave-3.exp
+++ b/crm/pengine/testcases/interleave-3.exp
@@ -1,344 +1,344 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/managed-0.dot b/crm/pengine/testcases/managed-0.dot
new file mode 100644
index 0000000000..a71547f00f
--- /dev/null
+++ b/crm/pengine/testcases/managed-0.dot
@@ -0,0 +1,125 @@
+digraph "g" {
+ size = "30,30"
+"rsc_c001n09_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:5_monitor_5000" [ color="blue" ]
+"DcIPaddr_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:7_monitor_5000" [ color="blue" ]
+"rsc_c001n08_monitor_5000" [ color="blue" ]
+"rsc_c001n02_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:6_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ color="blue" ]
+"rsc_c001n03_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ color="blue" ]
+"rsc_c001n04_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ color="blue" ]
+"rsc_c001n05_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:3_monitor_5000" [ color="blue" ]
+"rsc_c001n06_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:4_monitor_5000" [ color="blue" ]
+"rsc_c001n07_monitor_5000" [ color="blue" ]
+"DcIPaddr_stop_0" [ color="blue" ]
+"DcIPaddr_start_0" [ color="blue" ]
+"rsc_c001n09_stop_0" [ color="blue" ]
+"rsc_c001n09_start_0" [ color="blue" ]
+"rsc_c001n02_stop_0" [ color="blue" ]
+"rsc_c001n02_start_0" [ color="blue" ]
+"rsc_c001n03_stop_0" [ color="blue" ]
+"rsc_c001n03_start_0" [ color="blue" ]
+"rsc_c001n04_stop_0" [ color="blue" ]
+"rsc_c001n04_start_0" [ color="blue" ]
+"rsc_c001n05_stop_0" [ color="blue" ]
+"rsc_c001n05_start_0" [ color="blue" ]
+"rsc_c001n06_stop_0" [ color="blue" ]
+"rsc_c001n06_start_0" [ color="blue" ]
+"rsc_c001n07_stop_0" [ color="blue" ]
+"rsc_c001n07_start_0" [ color="blue" ]
+"rsc_c001n08_stop_0" [ color="blue" ]
+"rsc_c001n08_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:1_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:1_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:2_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:2_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:3_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:3_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:4_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:4_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:5_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:5_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:6_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:6_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:7_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:7_start_0" [ color="blue" ]
+"DoFencing_start_0" [ color="blue" ]
+"DoFencing_running_0" [ color="blue" ]
+"DoFencing_stop_0" [ color="blue" ]
+"DoFencing_stopped_0" [ color="blue" ]
+"rsc_c001n09_start_0" -> "rsc_c001n09_monitor_5000"
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing:child_DoFencing:5_monitor_5000"
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing:child_DoFencing:7_monitor_5000"
+"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000"
+"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000"
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing:child_DoFencing:6_monitor_5000"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
+"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
+"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000"
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000"
+"rsc_c001n05_start_0" -> "rsc_c001n05_monitor_5000"
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000"
+"rsc_c001n06_start_0" -> "rsc_c001n06_monitor_5000"
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing:child_DoFencing:4_monitor_5000"
+"rsc_c001n07_start_0" -> "rsc_c001n07_monitor_5000"
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
+"rsc_c001n09_stop_0" -> "rsc_c001n09_start_0"
+"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
+"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0"
+"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0"
+"rsc_c001n05_stop_0" -> "rsc_c001n05_start_0"
+"rsc_c001n06_stop_0" -> "rsc_c001n06_start_0"
+"rsc_c001n07_stop_0" -> "rsc_c001n07_start_0"
+"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0"
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0"
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing:child_DoFencing:3_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0"
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing:child_DoFencing:4_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0"
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing:child_DoFencing:5_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0"
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing:child_DoFencing:6_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0"
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing:child_DoFencing:7_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0"
+"DoFencing_stopped_0" -> "DoFencing_start_0"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing_stopped_0"
+}
diff --git a/crm/pengine/testcases/managed-1.dot b/crm/pengine/testcases/managed-1.dot
new file mode 100644
index 0000000000..a71547f00f
--- /dev/null
+++ b/crm/pengine/testcases/managed-1.dot
@@ -0,0 +1,125 @@
+digraph "g" {
+ size = "30,30"
+"rsc_c001n09_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:5_monitor_5000" [ color="blue" ]
+"DcIPaddr_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:7_monitor_5000" [ color="blue" ]
+"rsc_c001n08_monitor_5000" [ color="blue" ]
+"rsc_c001n02_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:6_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ color="blue" ]
+"rsc_c001n03_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ color="blue" ]
+"rsc_c001n04_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ color="blue" ]
+"rsc_c001n05_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:3_monitor_5000" [ color="blue" ]
+"rsc_c001n06_monitor_5000" [ color="blue" ]
+"DoFencing:child_DoFencing:4_monitor_5000" [ color="blue" ]
+"rsc_c001n07_monitor_5000" [ color="blue" ]
+"DcIPaddr_stop_0" [ color="blue" ]
+"DcIPaddr_start_0" [ color="blue" ]
+"rsc_c001n09_stop_0" [ color="blue" ]
+"rsc_c001n09_start_0" [ color="blue" ]
+"rsc_c001n02_stop_0" [ color="blue" ]
+"rsc_c001n02_start_0" [ color="blue" ]
+"rsc_c001n03_stop_0" [ color="blue" ]
+"rsc_c001n03_start_0" [ color="blue" ]
+"rsc_c001n04_stop_0" [ color="blue" ]
+"rsc_c001n04_start_0" [ color="blue" ]
+"rsc_c001n05_stop_0" [ color="blue" ]
+"rsc_c001n05_start_0" [ color="blue" ]
+"rsc_c001n06_stop_0" [ color="blue" ]
+"rsc_c001n06_start_0" [ color="blue" ]
+"rsc_c001n07_stop_0" [ color="blue" ]
+"rsc_c001n07_start_0" [ color="blue" ]
+"rsc_c001n08_stop_0" [ color="blue" ]
+"rsc_c001n08_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:0_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:1_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:1_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:2_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:2_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:3_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:3_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:4_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:4_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:5_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:5_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:6_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:6_start_0" [ color="blue" ]
+"DoFencing:child_DoFencing:7_stop_0" [ color="blue" ]
+"DoFencing:child_DoFencing:7_start_0" [ color="blue" ]
+"DoFencing_start_0" [ color="blue" ]
+"DoFencing_running_0" [ color="blue" ]
+"DoFencing_stop_0" [ color="blue" ]
+"DoFencing_stopped_0" [ color="blue" ]
+"rsc_c001n09_start_0" -> "rsc_c001n09_monitor_5000"
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing:child_DoFencing:5_monitor_5000"
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing:child_DoFencing:7_monitor_5000"
+"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000"
+"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000"
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing:child_DoFencing:6_monitor_5000"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
+"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
+"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000"
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000"
+"rsc_c001n05_start_0" -> "rsc_c001n05_monitor_5000"
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000"
+"rsc_c001n06_start_0" -> "rsc_c001n06_monitor_5000"
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing:child_DoFencing:4_monitor_5000"
+"rsc_c001n07_start_0" -> "rsc_c001n07_monitor_5000"
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
+"rsc_c001n09_stop_0" -> "rsc_c001n09_start_0"
+"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
+"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0"
+"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0"
+"rsc_c001n05_stop_0" -> "rsc_c001n05_start_0"
+"rsc_c001n06_stop_0" -> "rsc_c001n06_start_0"
+"rsc_c001n07_stop_0" -> "rsc_c001n07_start_0"
+"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0"
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0"
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing:child_DoFencing:3_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0"
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing:child_DoFencing:4_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0"
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing:child_DoFencing:5_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0"
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing:child_DoFencing:6_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0"
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0"
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing:child_DoFencing:7_start_0"
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0"
+"DoFencing_stopped_0" -> "DoFencing_start_0"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing_running_0"
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing_stopped_0"
+}
diff --git a/crm/pengine/testcases/managed-2.dot b/crm/pengine/testcases/managed-2.dot
new file mode 100644
index 0000000000..f8956c7260
--- /dev/null
+++ b/crm/pengine/testcases/managed-2.dot
@@ -0,0 +1,37 @@
+digraph "g" {
+ size = "30,30"
+"rsc_c001n09_monitor_5000" [ color="blue" ]
+"DcIPaddr_monitor_5000" [ color="blue" ]
+"rsc_c001n08_monitor_5000" [ color="blue" ]
+"rsc_c001n02_monitor_5000" [ color="blue" ]
+"rsc_c001n03_monitor_5000" [ color="blue" ]
+"rsc_c001n04_monitor_5000" [ color="blue" ]
+"rsc_c001n05_monitor_5000" [ color="blue" ]
+"rsc_c001n06_monitor_5000" [ color="blue" ]
+"rsc_c001n07_monitor_5000" [ color="blue" ]
+"DcIPaddr_stop_0" [ color="blue" ]
+"DcIPaddr_start_0" [ color="blue" ]
+"rsc_c001n09_stop_0" [ color="green" ]
+"rsc_c001n02_stop_0" [ color="green" ]
+"rsc_c001n03_stop_0" [ color="green" ]
+"rsc_c001n04_stop_0" [ color="green" ]
+"rsc_c001n05_stop_0" [ color="green" ]
+"rsc_c001n06_stop_0" [ color="green" ]
+"rsc_c001n07_stop_0" [ color="green" ]
+"rsc_c001n08_stop_0" [ color="green" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ fontcolor="red" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ fontcolor="red" ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ fontcolor="red" ]
+"DoFencing:child_DoFencing:3_monitor_5000" [ fontcolor="red" ]
+"DoFencing:child_DoFencing:4_monitor_5000" [ fontcolor="red" ]
+"DoFencing:child_DoFencing:5_monitor_5000" [ fontcolor="red" ]
+"DoFencing:child_DoFencing:6_monitor_5000" [ fontcolor="red" ]
+"DoFencing:child_DoFencing:7_monitor_5000" [ fontcolor="red" ]
+"DoFencing_start_0" [ color="blue" ]
+"DoFencing_running_0" [ color="blue" ]
+"DoFencing_stop_0" [ color="blue" ]
+"DoFencing_stopped_0" [ color="blue" ]
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
+"DoFencing_stopped_0" -> "DoFencing_start_0"
+}
diff --git a/crm/pengine/testcases/managed-2.exp b/crm/pengine/testcases/managed-2.exp
index bd314abcab..72fdacd066 100644
--- a/crm/pengine/testcases/managed-2.exp
+++ b/crm/pengine/testcases/managed-2.exp
@@ -1,91 +1,91 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/mon-rsc-1.dot b/crm/pengine/testcases/mon-rsc-1.dot
new file mode 100644
index 0000000000..e189417459
--- /dev/null
+++ b/crm/pengine/testcases/mon-rsc-1.dot
@@ -0,0 +1,6 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+"rsc1_monitor_5000" [ color="green" ]
+"rsc1_start_0" -> "rsc1_monitor_5000"
+}
diff --git a/crm/pengine/testcases/mon-rsc-1.exp b/crm/pengine/testcases/mon-rsc-1.exp
index 9e469c4fea..846452d728 100644
--- a/crm/pengine/testcases/mon-rsc-1.exp
+++ b/crm/pengine/testcases/mon-rsc-1.exp
@@ -1,28 +1,28 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/mon-rsc-2.dot b/crm/pengine/testcases/mon-rsc-2.dot
new file mode 100644
index 0000000000..9cb7ae96b7
--- /dev/null
+++ b/crm/pengine/testcases/mon-rsc-2.dot
@@ -0,0 +1,9 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="green" ]
+"rsc1_start_0" [ color="green" ]
+"rsc1_monitor_5000" [ color="green" ]
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_start_0" -> "rsc1_monitor_5000"
+}
diff --git a/crm/pengine/testcases/mon-rsc-2.exp b/crm/pengine/testcases/mon-rsc-2.exp
index c18b64dd45..9ae10f208d 100644
--- a/crm/pengine/testcases/mon-rsc-2.exp
+++ b/crm/pengine/testcases/mon-rsc-2.exp
@@ -1,41 +1,41 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/mon-rsc-3.dot b/crm/pengine/testcases/mon-rsc-3.dot
new file mode 100644
index 0000000000..d1a55d4f24
--- /dev/null
+++ b/crm/pengine/testcases/mon-rsc-3.dot
@@ -0,0 +1,8 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+"rsc1_stop_0" [ color="blue" ]
+"rsc1_monitor_5000" [ color="green" ]
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_start_0" -> "rsc1_monitor_5000"
+}
diff --git a/crm/pengine/testcases/mon-rsc-3.exp b/crm/pengine/testcases/mon-rsc-3.exp
index 7552d202c9..de4abccfea 100644
--- a/crm/pengine/testcases/mon-rsc-3.exp
+++ b/crm/pengine/testcases/mon-rsc-3.exp
@@ -1,28 +1,28 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/mon-rsc-4.dot b/crm/pengine/testcases/mon-rsc-4.dot
new file mode 100644
index 0000000000..dda9515f33
--- /dev/null
+++ b/crm/pengine/testcases/mon-rsc-4.dot
@@ -0,0 +1,9 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+"rsc1_stop_0" [ color="green" ]
+"rsc1_monitor_5000" [ color="green" ]
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_start_0" -> "rsc1_monitor_5000"
+}
diff --git a/crm/pengine/testcases/mon-rsc-4.exp b/crm/pengine/testcases/mon-rsc-4.exp
index 3d895d7b0b..595b77d4a9 100644
--- a/crm/pengine/testcases/mon-rsc-4.exp
+++ b/crm/pengine/testcases/mon-rsc-4.exp
@@ -1,41 +1,41 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/multi1.dot b/crm/pengine/testcases/multi1.dot
new file mode 100644
index 0000000000..d6a9de9f71
--- /dev/null
+++ b/crm/pengine/testcases/multi1.dot
@@ -0,0 +1,10 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="green" ]
+"rsc1_stop_0" [ color="green" ]
+"rsc1_start_0" [ color="green" ]
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+}
diff --git a/crm/pengine/testcases/multi1.exp b/crm/pengine/testcases/multi1.exp
index e90ed74d22..6d847a453c 100644
--- a/crm/pengine/testcases/multi1.exp
+++ b/crm/pengine/testcases/multi1.exp
@@ -1,37 +1,37 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/notify-0.dot b/crm/pengine/testcases/notify-0.dot
new file mode 100644
index 0000000000..fab3783e04
--- /dev/null
+++ b/crm/pengine/testcases/notify-0.dot
@@ -0,0 +1,26 @@
+digraph "g" {
+ size = "30,30"
+"rsc1:child_rsc1:0_stop_0" [ color="blue" ]
+"rsc1:child_rsc1:0_start_0" [ color="blue" ]
+"rsc1:child_rsc1:1_start_0" [ color="green" ]
+"rsc1_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_running_0" [ color="green" fontcolor="orange" ]
+"rsc1_stop_0" [ color="blue" ]
+"rsc1_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc2:child_rsc2:0_stop_0" [ color="green" ]
+"rsc2_start_0" [ color="blue" ]
+"rsc2_running_0" [ color="blue" ]
+"rsc2_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0"
+"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1_stopped_0" -> "rsc1_start_0"
+"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0"
+"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0"
+"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0"
+"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0"
+"rsc2_stopped_0" -> "rsc2_start_0"
+"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0"
+}
diff --git a/crm/pengine/testcases/notify-0.exp b/crm/pengine/testcases/notify-0.exp
index 191182fd1d..4a0f35ce7f 100644
--- a/crm/pengine/testcases/notify-0.exp
+++ b/crm/pengine/testcases/notify-0.exp
@@ -1,87 +1,87 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/notify-1.dot b/crm/pengine/testcases/notify-1.dot
new file mode 100644
index 0000000000..e6fe8eebfb
--- /dev/null
+++ b/crm/pengine/testcases/notify-1.dot
@@ -0,0 +1,72 @@
+digraph "g" {
+ size = "30,30"
+"rsc1:child_rsc1:0_stop_0" [ color="blue" ]
+"rsc1:child_rsc1:0_start_0" [ color="blue" ]
+"rsc1:child_rsc1:1_start_0" [ color="green" ]
+"rsc1_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_running_0" [ color="green" fontcolor="orange" ]
+"rsc1_pre_notify_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_confirmed-pre_notify_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_post_notify_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_confirmed-post_notify_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_stop_0" [ color="blue" ]
+"rsc1_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc1_pre_notify_stop_0" [ color="blue" ]
+"rsc1_confirmed-pre_notify_stop_0" [ color="blue" ]
+"rsc1_post_notify_stop_0" [ color="blue" ]
+"rsc1_confirmed-post_notify_stop_0" [ color="blue" ]
+"rsc2:child_rsc2:0_stop_0" [ color="green" ]
+"rsc2_start_0" [ color="blue" ]
+"rsc2_running_0" [ color="blue" ]
+"rsc2_pre_notify_start_0" [ color="blue" ]
+"rsc2_confirmed-pre_notify_start_0" [ color="blue" ]
+"rsc2_post_notify_start_0" [ color="blue" ]
+"rsc2_confirmed-post_notify_start_0" [ color="blue" ]
+"rsc2_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc2_pre_notify_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_confirmed-pre_notify_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_post_notify_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_confirmed-post_notify_stop_0" [ color="green" fontcolor="orange" ]
+"rsc1:child_rsc1:0_pre_notify_start_0" [ color="green" ]
+"rsc1:child_rsc1:0_post_notify_start_0" [ color="green" ]
+"rsc1:child_rsc1:0_pre_notify_stop_0" [ color="blue" ]
+"rsc1:child_rsc1:0_post_notify_stop_0" [ color="blue" ]
+"rsc1:child_rsc1:1_post_notify_start_0" [ color="green" ]
+"rsc2:child_rsc2:0_pre_notify_stop_0" [ color="green" ]
+"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0"
+"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0"
+"rsc1_stopped_0" -> "rsc1_start_0"
+"rsc1_confirmed-post_notify_stop_0" -> "rsc1_start_0"
+"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0"
+"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0"
+"rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0"
+"rsc1_running_0" -> "rsc1_post_notify_start_0"
+"rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0"
+"rsc1_confirmed-pre_notify_stop_0" -> "rsc1_stop_0"
+"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0"
+"rsc1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0"
+"rsc1_stopped_0" -> "rsc1_post_notify_stop_0"
+"rsc1_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0"
+"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0"
+"rsc2_confirmed-pre_notify_start_0" -> "rsc2_start_0"
+"rsc2_confirmed-post_notify_stop_0" -> "rsc2_start_0"
+"rsc2_stopped_0" -> "rsc2_start_0"
+"rsc2_pre_notify_start_0" -> "rsc2_confirmed-pre_notify_start_0"
+"rsc2_running_0" -> "rsc2_post_notify_start_0"
+"rsc2_post_notify_start_0" -> "rsc2_confirmed-post_notify_start_0"
+"rsc2_confirmed-pre_notify_stop_0" -> "rsc2_stop_0"
+"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0"
+"rsc2_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0"
+"rsc2_stopped_0" -> "rsc2_post_notify_stop_0"
+"rsc2_post_notify_stop_0" -> "rsc2_confirmed-post_notify_stop_0"
+"rsc1_pre_notify_start_0" -> "rsc1:child_rsc1:0_pre_notify_start_0"
+"rsc1_post_notify_start_0" -> "rsc1:child_rsc1:0_post_notify_start_0"
+"rsc1_pre_notify_stop_0" -> "rsc1:child_rsc1:0_pre_notify_stop_0"
+"rsc1_post_notify_stop_0" -> "rsc1:child_rsc1:0_post_notify_stop_0"
+"rsc1_post_notify_start_0" -> "rsc1:child_rsc1:1_post_notify_start_0"
+"rsc2_pre_notify_stop_0" -> "rsc2:child_rsc2:0_pre_notify_stop_0"
+}
diff --git a/crm/pengine/testcases/notify-1.exp b/crm/pengine/testcases/notify-1.exp
index 9b9b8b1581..aa057b7002 100644
--- a/crm/pengine/testcases/notify-1.exp
+++ b/crm/pengine/testcases/notify-1.exp
@@ -1,162 +1,315 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/crm/pengine/testcases/notify-2.dot b/crm/pengine/testcases/notify-2.dot
new file mode 100644
index 0000000000..55100acf83
--- /dev/null
+++ b/crm/pengine/testcases/notify-2.dot
@@ -0,0 +1,78 @@
+digraph "g" {
+ size = "30,30"
+"rsc1:child_rsc1:0_stop_0" [ color="blue" ]
+"rsc1:child_rsc1:0_start_0" [ color="blue" ]
+"rsc1:child_rsc1:1_start_0" [ color="green" ]
+"rsc1_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_running_0" [ color="green" fontcolor="orange" ]
+"rsc1_pre_notify_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_confirmed-pre_notify_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_post_notify_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_confirmed-post_notify_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_stop_0" [ color="blue" ]
+"rsc1_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc1_pre_notify_stop_0" [ color="blue" ]
+"rsc1_confirmed-pre_notify_stop_0" [ color="blue" ]
+"rsc1_post_notify_stop_0" [ color="blue" ]
+"rsc1_confirmed-post_notify_stop_0" [ color="blue" ]
+"rsc2:child_rsc2:0_stop_0" [ color="green" ]
+"rsc2_start_0" [ color="blue" ]
+"rsc2_running_0" [ color="blue" ]
+"rsc2_pre_notify_start_0" [ color="blue" ]
+"rsc2_confirmed-pre_notify_start_0" [ color="blue" ]
+"rsc2_post_notify_start_0" [ color="blue" ]
+"rsc2_confirmed-post_notify_start_0" [ color="blue" ]
+"rsc2_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc2_pre_notify_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_confirmed-pre_notify_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_post_notify_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_confirmed-post_notify_stop_0" [ color="green" fontcolor="orange" ]
+"rsc1:child_rsc1:0_pre_notify_start_0" [ color="green" ]
+"rsc1:child_rsc1:0_post_notify_start_0" [ color="green" ]
+"rsc1:child_rsc1:0_pre_notify_stop_0" [ color="blue" ]
+"rsc1:child_rsc1:0_post_notify_stop_0" [ color="blue" ]
+"rsc1:child_rsc1:1_post_notify_start_0" [ color="green" ]
+"rsc2:child_rsc2:0_pre_notify_stop_0" [ color="green" ]
+"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0"
+"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0"
+"rsc1_stopped_0" -> "rsc1_start_0"
+"rsc1_confirmed-post_notify_stop_0" -> "rsc1_start_0"
+"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0"
+"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0"
+"rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0"
+"rsc1:child_rsc1:0_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0"
+"rsc1_running_0" -> "rsc1_post_notify_start_0"
+"rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0"
+"rsc1:child_rsc1:0_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0"
+"rsc1:child_rsc1:1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0"
+"rsc1_confirmed-pre_notify_stop_0" -> "rsc1_stop_0"
+"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0"
+"rsc1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0"
+"rsc1:child_rsc1:0_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0"
+"rsc1_stopped_0" -> "rsc1_post_notify_stop_0"
+"rsc1_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0"
+"rsc1:child_rsc1:0_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0"
+"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0"
+"rsc2_confirmed-pre_notify_start_0" -> "rsc2_start_0"
+"rsc2_confirmed-post_notify_stop_0" -> "rsc2_start_0"
+"rsc2_stopped_0" -> "rsc2_start_0"
+"rsc2_pre_notify_start_0" -> "rsc2_confirmed-pre_notify_start_0"
+"rsc2_running_0" -> "rsc2_post_notify_start_0"
+"rsc2_post_notify_start_0" -> "rsc2_confirmed-post_notify_start_0"
+"rsc2_confirmed-pre_notify_stop_0" -> "rsc2_stop_0"
+"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0"
+"rsc2_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0"
+"rsc2:child_rsc2:0_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0"
+"rsc2_stopped_0" -> "rsc2_post_notify_stop_0"
+"rsc2_post_notify_stop_0" -> "rsc2_confirmed-post_notify_stop_0"
+"rsc1_pre_notify_start_0" -> "rsc1:child_rsc1:0_pre_notify_start_0"
+"rsc1_post_notify_start_0" -> "rsc1:child_rsc1:0_post_notify_start_0"
+"rsc1_pre_notify_stop_0" -> "rsc1:child_rsc1:0_pre_notify_stop_0"
+"rsc1_post_notify_stop_0" -> "rsc1:child_rsc1:0_post_notify_stop_0"
+"rsc1_post_notify_start_0" -> "rsc1:child_rsc1:1_post_notify_start_0"
+"rsc2_pre_notify_stop_0" -> "rsc2:child_rsc2:0_pre_notify_stop_0"
+}
diff --git a/crm/pengine/testcases/notify-3.dot b/crm/pengine/testcases/notify-3.dot
new file mode 100644
index 0000000000..e1574bb6ea
--- /dev/null
+++ b/crm/pengine/testcases/notify-3.dot
@@ -0,0 +1,86 @@
+digraph "g" {
+ size = "30,30"
+"rsc1:child_rsc1:0_stop_0" [ color="blue" ]
+"rsc1:child_rsc1:0_start_0" [ color="blue" ]
+"rsc1:child_rsc1:1_stop_0" [ color="green" ]
+"rsc1:child_rsc1:1_start_0" [ color="green" ]
+"rsc1_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_running_0" [ color="green" fontcolor="orange" ]
+"rsc1_pre_notify_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_confirmed-pre_notify_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_post_notify_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_confirmed-post_notify_start_0" [ color="green" fontcolor="orange" ]
+"rsc1_stop_0" [ color="green" fontcolor="orange" ]
+"rsc1_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc1_pre_notify_stop_0" [ color="green" fontcolor="orange" ]
+"rsc1_confirmed-pre_notify_stop_0" [ color="green" fontcolor="orange" ]
+"rsc1_post_notify_stop_0" [ color="green" fontcolor="orange" ]
+"rsc1_confirmed-post_notify_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2:child_rsc2:0_stop_0" [ color="green" ]
+"rsc2_start_0" [ color="blue" ]
+"rsc2_running_0" [ color="blue" ]
+"rsc2_pre_notify_start_0" [ color="blue" ]
+"rsc2_confirmed-pre_notify_start_0" [ color="blue" ]
+"rsc2_post_notify_start_0" [ color="blue" ]
+"rsc2_confirmed-post_notify_start_0" [ color="blue" ]
+"rsc2_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ color="green" fontcolor="orange" ]
+"rsc2_pre_notify_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_confirmed-pre_notify_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_post_notify_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_confirmed-post_notify_stop_0" [ color="green" fontcolor="orange" ]
+"rsc1:child_rsc1:0_pre_notify_start_0" [ color="green" ]
+"rsc1:child_rsc1:0_post_notify_start_0" [ color="green" ]
+"rsc1:child_rsc1:0_pre_notify_stop_0" [ color="green" ]
+"rsc1:child_rsc1:0_post_notify_stop_0" [ color="green" ]
+"rsc1:child_rsc1:1_post_notify_start_0" [ color="green" ]
+"rsc1:child_rsc1:1_pre_notify_stop_0" [ color="green" ]
+"rsc2:child_rsc2:0_pre_notify_stop_0" [ color="green" ]
+"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0"
+"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
+"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0"
+"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0"
+"rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0"
+"rsc1_stopped_0" -> "rsc1_start_0"
+"rsc1_confirmed-post_notify_stop_0" -> "rsc1_start_0"
+"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0"
+"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0"
+"rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0"
+"rsc1:child_rsc1:0_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0"
+"rsc1_running_0" -> "rsc1_post_notify_start_0"
+"rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0"
+"rsc1:child_rsc1:0_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0"
+"rsc1:child_rsc1:1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0"
+"rsc1_confirmed-pre_notify_stop_0" -> "rsc1_stop_0"
+"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0"
+"rsc1:child_rsc1:1_stop_0" -> "rsc1_stopped_0"
+"rsc1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0"
+"rsc1:child_rsc1:0_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0"
+"rsc1:child_rsc1:1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0"
+"rsc1_stopped_0" -> "rsc1_post_notify_stop_0"
+"rsc1_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0"
+"rsc1:child_rsc1:0_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0"
+"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0"
+"rsc2_confirmed-pre_notify_start_0" -> "rsc2_start_0"
+"rsc2_confirmed-post_notify_stop_0" -> "rsc2_start_0"
+"rsc2_stopped_0" -> "rsc2_start_0"
+"rsc2_pre_notify_start_0" -> "rsc2_confirmed-pre_notify_start_0"
+"rsc2_running_0" -> "rsc2_post_notify_start_0"
+"rsc2_post_notify_start_0" -> "rsc2_confirmed-post_notify_start_0"
+"rsc2_confirmed-pre_notify_stop_0" -> "rsc2_stop_0"
+"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0"
+"rsc2_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0"
+"rsc2:child_rsc2:0_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0"
+"rsc2_stopped_0" -> "rsc2_post_notify_stop_0"
+"rsc2_post_notify_stop_0" -> "rsc2_confirmed-post_notify_stop_0"
+"rsc1_pre_notify_start_0" -> "rsc1:child_rsc1:0_pre_notify_start_0"
+"rsc1_post_notify_start_0" -> "rsc1:child_rsc1:0_post_notify_start_0"
+"rsc1_pre_notify_stop_0" -> "rsc1:child_rsc1:0_pre_notify_stop_0"
+"rsc1_post_notify_stop_0" -> "rsc1:child_rsc1:0_post_notify_stop_0"
+"rsc1_post_notify_start_0" -> "rsc1:child_rsc1:1_post_notify_start_0"
+"rsc1_pre_notify_stop_0" -> "rsc1:child_rsc1:1_pre_notify_stop_0"
+"rsc2_pre_notify_stop_0" -> "rsc2:child_rsc2:0_pre_notify_stop_0"
+}
diff --git a/crm/pengine/testcases/order1.dot b/crm/pengine/testcases/order1.dot
new file mode 100644
index 0000000000..1f95dabb5b
--- /dev/null
+++ b/crm/pengine/testcases/order1.dot
@@ -0,0 +1,8 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" ]
+"rsc3_start_0" [ color="green" ]
+"rsc1_start_0" -> "rsc2_start_0"
+"rsc2_start_0" -> "rsc3_start_0"
+}
diff --git a/crm/pengine/testcases/order1.exp b/crm/pengine/testcases/order1.exp
index abcfbf50cf..c05012cb3f 100644
--- a/crm/pengine/testcases/order1.exp
+++ b/crm/pengine/testcases/order1.exp
@@ -1,38 +1,38 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/order2.dot b/crm/pengine/testcases/order2.dot
new file mode 100644
index 0000000000..b4971bb0f2
--- /dev/null
+++ b/crm/pengine/testcases/order2.dot
@@ -0,0 +1,10 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" ]
+"rsc3_start_0" [ color="green" ]
+"rsc4_start_0" [ color="green" ]
+"rsc1_start_0" -> "rsc2_start_0"
+"rsc4_start_0" -> "rsc2_start_0"
+"rsc2_start_0" -> "rsc3_start_0"
+}
diff --git a/crm/pengine/testcases/order2.exp b/crm/pengine/testcases/order2.exp
index a033197051..4692ab3a9f 100644
--- a/crm/pengine/testcases/order2.exp
+++ b/crm/pengine/testcases/order2.exp
@@ -1,50 +1,50 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/order3.dot b/crm/pengine/testcases/order3.dot
new file mode 100644
index 0000000000..a5afee1245
--- /dev/null
+++ b/crm/pengine/testcases/order3.dot
@@ -0,0 +1,25 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="green" ]
+"rsc1_start_0" [ color="green" ]
+"rsc2_stop_0" [ color="green" ]
+"rsc2_start_0" [ color="green" ]
+"rsc3_stop_0" [ color="green" ]
+"rsc3_start_0" [ color="green" ]
+"rsc4_stop_0" [ color="green" ]
+"rsc4_start_0" [ color="green" ]
+"rsc2_stop_0" -> "rsc1_stop_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc3_stop_0" -> "rsc2_stop_0"
+"rsc1_start_0" -> "rsc2_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+"rsc4_start_0" -> "rsc2_start_0"
+"rsc2_start_0" -> "rsc3_start_0"
+"rsc3_stop_0" -> "rsc3_start_0"
+"rsc3_stop_0" -> "rsc3_start_0"
+"rsc2_stop_0" -> "rsc4_stop_0"
+"rsc4_stop_0" -> "rsc4_start_0"
+"rsc4_stop_0" -> "rsc4_start_0"
+}
diff --git a/crm/pengine/testcases/order3.exp b/crm/pengine/testcases/order3.exp
index e185d792cc..00b1fc1902 100644
--- a/crm/pengine/testcases/order3.exp
+++ b/crm/pengine/testcases/order3.exp
@@ -1,112 +1,112 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/order4.dot b/crm/pengine/testcases/order4.dot
new file mode 100644
index 0000000000..c2d847adb4
--- /dev/null
+++ b/crm/pengine/testcases/order4.dot
@@ -0,0 +1,10 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" ]
+"rsc3_start_0" [ color="green" ]
+"rsc1_start_0" -> "rsc2_start_0"
+"rsc1_start_0" -> "rsc2_start_0"
+"rsc2_start_0" -> "rsc3_start_0"
+"rsc2_start_0" -> "rsc3_start_0"
+}
diff --git a/crm/pengine/testcases/order4.exp b/crm/pengine/testcases/order4.exp
index 5ffa277fd2..328e49cddf 100644
--- a/crm/pengine/testcases/order4.exp
+++ b/crm/pengine/testcases/order4.exp
@@ -1,38 +1,38 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/order5.dot b/crm/pengine/testcases/order5.dot
new file mode 100644
index 0000000000..a4c6b6d45d
--- /dev/null
+++ b/crm/pengine/testcases/order5.dot
@@ -0,0 +1,39 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="blue" ]
+"rsc1_start_0" [ color="blue" ]
+"rsc2_stop_0" [ color="green" ]
+"rsc2_start_0" [ color="green" ]
+"rsc3_stop_0" [ color="blue" ]
+"rsc3_start_0" [ color="blue" ]
+"rsc4_stop_0" [ color="green" ]
+"rsc4_start_0" [ color="green" ]
+"rsc5_stop_0" [ color="green" ]
+"rsc5_start_0" [ color="green" ]
+"rsc6_stop_0" [ color="blue" ]
+"rsc6_start_0" [ color="blue" ]
+"rsc7_stop_0" [ color="green" ]
+"rsc7_start_0" [ color="green" ]
+"rsc8_stop_0" [ color="blue" ]
+"rsc8_start_0" [ color="blue" ]
+"rsc2_stop_0" -> "rsc1_stop_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_start_0" -> "rsc2_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+"rsc4_stop_0" -> "rsc3_stop_0"
+"rsc3_stop_0" -> "rsc3_start_0"
+"rsc3_start_0" -> "rsc4_start_0"
+"rsc4_stop_0" -> "rsc4_start_0"
+"rsc4_stop_0" -> "rsc4_start_0"
+"rsc6_stop_0" -> "rsc5_stop_0"
+"rsc5_stop_0" -> "rsc5_start_0"
+"rsc5_stop_0" -> "rsc5_start_0"
+"rsc5_start_0" -> "rsc6_start_0"
+"rsc6_stop_0" -> "rsc6_start_0"
+"rsc8_stop_0" -> "rsc7_stop_0"
+"rsc7_stop_0" -> "rsc7_start_0"
+"rsc7_stop_0" -> "rsc7_start_0"
+"rsc7_start_0" -> "rsc8_start_0"
+"rsc8_stop_0" -> "rsc8_start_0"
+}
diff --git a/crm/pengine/testcases/order5.exp b/crm/pengine/testcases/order5.exp
index 8e745b4f08..cd09e349d8 100644
--- a/crm/pengine/testcases/order5.exp
+++ b/crm/pengine/testcases/order5.exp
@@ -1,91 +1,91 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/order6.dot b/crm/pengine/testcases/order6.dot
new file mode 100644
index 0000000000..ed933422d4
--- /dev/null
+++ b/crm/pengine/testcases/order6.dot
@@ -0,0 +1,39 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="blue" ]
+"rsc1_start_0" [ color="blue" ]
+"rsc2_stop_0" [ color="green" ]
+"rsc2_start_0" [ color="green" ]
+"rsc3_stop_0" [ color="blue" ]
+"rsc3_start_0" [ color="blue" ]
+"rsc4_stop_0" [ color="green" ]
+"rsc4_start_0" [ color="green" ]
+"rsc5_stop_0" [ color="green" ]
+"rsc5_start_0" [ color="green" ]
+"rsc6_stop_0" [ color="green" ]
+"rsc6_start_0" [ color="green" ]
+"rsc7_stop_0" [ color="green" ]
+"rsc7_start_0" [ color="green" ]
+"rsc8_stop_0" [ color="blue" ]
+"rsc8_start_0" [ color="blue" ]
+"rsc2_stop_0" -> "rsc1_stop_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_start_0" -> "rsc2_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+"rsc4_stop_0" -> "rsc3_stop_0"
+"rsc3_stop_0" -> "rsc3_start_0"
+"rsc3_start_0" -> "rsc4_start_0"
+"rsc4_stop_0" -> "rsc4_start_0"
+"rsc4_stop_0" -> "rsc4_start_0"
+"rsc6_stop_0" -> "rsc5_stop_0"
+"rsc5_stop_0" -> "rsc5_start_0"
+"rsc5_stop_0" -> "rsc5_start_0"
+"rsc5_start_0" -> "rsc6_start_0"
+"rsc6_stop_0" -> "rsc6_start_0"
+"rsc8_stop_0" -> "rsc7_stop_0"
+"rsc7_stop_0" -> "rsc7_start_0"
+"rsc7_stop_0" -> "rsc7_start_0"
+"rsc7_start_0" -> "rsc8_start_0"
+"rsc8_stop_0" -> "rsc8_start_0"
+}
diff --git a/crm/pengine/testcases/order6.exp b/crm/pengine/testcases/order6.exp
index 0597e7df4b..48b84762f1 100644
--- a/crm/pengine/testcases/order6.exp
+++ b/crm/pengine/testcases/order6.exp
@@ -1,120 +1,120 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/quorum-1.dot b/crm/pengine/testcases/quorum-1.dot
new file mode 100644
index 0000000000..29c6a20c84
--- /dev/null
+++ b/crm/pengine/testcases/quorum-1.dot
@@ -0,0 +1,11 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="blue" ]
+"rsc1_start_0" [ color="blue" ]
+"rsc2_stop_0" [ color="green" ]
+"rsc2_start_0" [ color="green" ]
+"rsc3_start_0" [ color="green" ]
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+}
diff --git a/crm/pengine/testcases/quorum-1.exp b/crm/pengine/testcases/quorum-1.exp
index 704e877d39..d8cc7ec177 100644
--- a/crm/pengine/testcases/quorum-1.exp
+++ b/crm/pengine/testcases/quorum-1.exp
@@ -1,34 +1,34 @@
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/quorum-2.dot b/crm/pengine/testcases/quorum-2.dot
new file mode 100644
index 0000000000..bb3e4f234b
--- /dev/null
+++ b/crm/pengine/testcases/quorum-2.dot
@@ -0,0 +1,11 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="blue" ]
+"rsc1_start_0" [ color="blue" ]
+"rsc2_stop_0" [ color="green" ]
+"rsc2_start_0" [ color="green" ]
+"rsc3_start_0" [ color="blue" ]
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+}
diff --git a/crm/pengine/testcases/quorum-2.exp b/crm/pengine/testcases/quorum-2.exp
index 18a79d1906..06a4de42ee 100644
--- a/crm/pengine/testcases/quorum-2.exp
+++ b/crm/pengine/testcases/quorum-2.exp
@@ -1,25 +1,25 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/quorum-3.dot b/crm/pengine/testcases/quorum-3.dot
new file mode 100644
index 0000000000..875c0af513
--- /dev/null
+++ b/crm/pengine/testcases/quorum-3.dot
@@ -0,0 +1,11 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="green" ]
+"rsc1_start_0" [ color="blue" ]
+"rsc2_stop_0" [ color="green" ]
+"rsc2_start_0" [ fontcolor="red" ]
+"rsc3_start_0" [ color="blue" ]
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+}
diff --git a/crm/pengine/testcases/quorum-3.exp b/crm/pengine/testcases/quorum-3.exp
index 8b60add6c2..46b9266799 100644
--- a/crm/pengine/testcases/quorum-3.exp
+++ b/crm/pengine/testcases/quorum-3.exp
@@ -1,21 +1,21 @@
-
+
-
+
diff --git a/crm/pengine/testcases/quorum-4.dot b/crm/pengine/testcases/quorum-4.dot
new file mode 100644
index 0000000000..3e5979d5dd
--- /dev/null
+++ b/crm/pengine/testcases/quorum-4.dot
@@ -0,0 +1,6 @@
+digraph "g" {
+ size = "30,30"
+"child_DoFencing_start_0" [ color="green" ]
+"child_DoFencing_monitor_5000" [ color="green" ]
+"child_DoFencing_start_0" -> "child_DoFencing_monitor_5000"
+}
diff --git a/crm/pengine/testcases/quorum-4.exp b/crm/pengine/testcases/quorum-4.exp
index 6e99a521dd..7c3c16dbd0 100644
--- a/crm/pengine/testcases/quorum-4.exp
+++ b/crm/pengine/testcases/quorum-4.exp
@@ -1,32 +1,32 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/quorum-5.dot b/crm/pengine/testcases/quorum-5.dot
new file mode 100644
index 0000000000..a8fd940488
--- /dev/null
+++ b/crm/pengine/testcases/quorum-5.dot
@@ -0,0 +1,17 @@
+digraph "g" {
+ size = "30,30"
+"group1:child_DoFencing_1_start_0" [ color="green" ]
+"group1:child_DoFencing_1_monitor_5000" [ color="green" ]
+"group1:child_DoFencing_2_start_0" [ color="green" ]
+"group1:child_DoFencing_2_monitor_5000" [ color="green" ]
+"group1_start_0" [ color="green" fontcolor="orange" ]
+"group1_running_0" [ color="green" fontcolor="orange" ]
+"group1_stop_0" [ color="blue" ]
+"group1_stopped_0" [ color="blue" ]
+"group1_start_0" -> "group1:child_DoFencing_1_start_0"
+"group1:child_DoFencing_1_start_0" -> "group1:child_DoFencing_1_monitor_5000"
+"group1:child_DoFencing_1_start_0" -> "group1:child_DoFencing_2_start_0"
+"group1:child_DoFencing_2_start_0" -> "group1:child_DoFencing_2_monitor_5000"
+"group1_stopped_0" -> "group1_start_0"
+"group1:child_DoFencing_2_start_0" -> "group1_running_0"
+}
diff --git a/crm/pengine/testcases/quorum-5.exp b/crm/pengine/testcases/quorum-5.exp
index 0472db47a0..bb53d74b8d 100644
--- a/crm/pengine/testcases/quorum-5.exp
+++ b/crm/pengine/testcases/quorum-5.exp
@@ -1,87 +1,87 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/quorum-6.dot b/crm/pengine/testcases/quorum-6.dot
new file mode 100644
index 0000000000..0c11c4cf23
--- /dev/null
+++ b/crm/pengine/testcases/quorum-6.dot
@@ -0,0 +1,20 @@
+digraph "g" {
+ size = "30,30"
+"DoFencing:child_DoFencing:0_start_0" [ color="green" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ color="green" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ fontcolor="red" ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ fontcolor="red" ]
+"DoFencing:child_DoFencing:3_monitor_5000" [ fontcolor="red" ]
+"DoFencing:child_DoFencing:4_monitor_5000" [ fontcolor="red" ]
+"DoFencing:child_DoFencing:5_monitor_5000" [ fontcolor="red" ]
+"DoFencing:child_DoFencing:6_monitor_5000" [ fontcolor="red" ]
+"DoFencing:child_DoFencing:7_monitor_5000" [ fontcolor="red" ]
+"DoFencing_start_0" [ color="green" fontcolor="orange" ]
+"DoFencing_running_0" [ color="green" fontcolor="orange" ]
+"DoFencing_stop_0" [ color="blue" ]
+"DoFencing_stopped_0" [ color="green" fontcolor="orange" ]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
+"DoFencing_stopped_0" -> "DoFencing_start_0"
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
+}
diff --git a/crm/pengine/testcases/quorum-6.exp b/crm/pengine/testcases/quorum-6.exp
index b4ca1a8f60..df59c5deb9 100644
--- a/crm/pengine/testcases/quorum-6.exp
+++ b/crm/pengine/testcases/quorum-6.exp
@@ -1,72 +1,72 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/rec-node-1.dot b/crm/pengine/testcases/rec-node-1.dot
new file mode 100644
index 0000000000..0bc70a17b3
--- /dev/null
+++ b/crm/pengine/testcases/rec-node-1.dot
@@ -0,0 +1,5 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/rec-node-1.exp b/crm/pengine/testcases/rec-node-1.exp
index e503c8065b..744d59a604 100644
--- a/crm/pengine/testcases/rec-node-1.exp
+++ b/crm/pengine/testcases/rec-node-1.exp
@@ -1,21 +1,21 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rec-node-10.dot b/crm/pengine/testcases/rec-node-10.dot
new file mode 100644
index 0000000000..ef71fbed23
--- /dev/null
+++ b/crm/pengine/testcases/rec-node-10.dot
@@ -0,0 +1,11 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ fontcolor="red" ]
+"rsc1_start_0" [ fontcolor="red" ]
+"rsc2_stop_0" [ fontcolor="red" ]
+"rsc2_start_0" [ fontcolor="red" ]
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+}
diff --git a/crm/pengine/testcases/rec-node-2.dot b/crm/pengine/testcases/rec-node-2.dot
new file mode 100644
index 0000000000..c1f826890d
--- /dev/null
+++ b/crm/pengine/testcases/rec-node-2.dot
@@ -0,0 +1,7 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" ]
+"stonith" [ color="green" ]
+"stonith" -> "rsc2_start_0"
+}
diff --git a/crm/pengine/testcases/rec-node-2.exp b/crm/pengine/testcases/rec-node-2.exp
index 720c272b0d..54ac60b84d 100644
--- a/crm/pengine/testcases/rec-node-2.exp
+++ b/crm/pengine/testcases/rec-node-2.exp
@@ -1,36 +1,36 @@
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/rec-node-3.dot b/crm/pengine/testcases/rec-node-3.dot
new file mode 100644
index 0000000000..0bc70a17b3
--- /dev/null
+++ b/crm/pengine/testcases/rec-node-3.dot
@@ -0,0 +1,5 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/rec-node-3.exp b/crm/pengine/testcases/rec-node-3.exp
index e503c8065b..744d59a604 100644
--- a/crm/pengine/testcases/rec-node-3.exp
+++ b/crm/pengine/testcases/rec-node-3.exp
@@ -1,21 +1,21 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rec-node-4.dot b/crm/pengine/testcases/rec-node-4.dot
new file mode 100644
index 0000000000..020acea0b8
--- /dev/null
+++ b/crm/pengine/testcases/rec-node-4.dot
@@ -0,0 +1,14 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="green" fontcolor="orange" ]
+"rsc1_start_0" [ color="green" ]
+"rsc2_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_start_0" [ color="green" ]
+"stonith" [ color="green" ]
+"stonith" -> "rsc1_stop_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"stonith" -> "rsc2_stop_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+}
diff --git a/crm/pengine/testcases/rec-node-4.exp b/crm/pengine/testcases/rec-node-4.exp
index 3332877225..22821e3b87 100644
--- a/crm/pengine/testcases/rec-node-4.exp
+++ b/crm/pengine/testcases/rec-node-4.exp
@@ -1,64 +1,64 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/rec-node-5.dot b/crm/pengine/testcases/rec-node-5.dot
new file mode 100644
index 0000000000..0bc70a17b3
--- /dev/null
+++ b/crm/pengine/testcases/rec-node-5.dot
@@ -0,0 +1,5 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/rec-node-5.exp b/crm/pengine/testcases/rec-node-5.exp
index e503c8065b..744d59a604 100644
--- a/crm/pengine/testcases/rec-node-5.exp
+++ b/crm/pengine/testcases/rec-node-5.exp
@@ -1,21 +1,21 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rec-node-6.dot b/crm/pengine/testcases/rec-node-6.dot
new file mode 100644
index 0000000000..020acea0b8
--- /dev/null
+++ b/crm/pengine/testcases/rec-node-6.dot
@@ -0,0 +1,14 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="green" fontcolor="orange" ]
+"rsc1_start_0" [ color="green" ]
+"rsc2_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_start_0" [ color="green" ]
+"stonith" [ color="green" ]
+"stonith" -> "rsc1_stop_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"stonith" -> "rsc2_stop_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+}
diff --git a/crm/pengine/testcases/rec-node-6.exp b/crm/pengine/testcases/rec-node-6.exp
index 3332877225..22821e3b87 100644
--- a/crm/pengine/testcases/rec-node-6.exp
+++ b/crm/pengine/testcases/rec-node-6.exp
@@ -1,64 +1,64 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/rec-node-7.dot b/crm/pengine/testcases/rec-node-7.dot
new file mode 100644
index 0000000000..020acea0b8
--- /dev/null
+++ b/crm/pengine/testcases/rec-node-7.dot
@@ -0,0 +1,14 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="green" fontcolor="orange" ]
+"rsc1_start_0" [ color="green" ]
+"rsc2_stop_0" [ color="green" fontcolor="orange" ]
+"rsc2_start_0" [ color="green" ]
+"stonith" [ color="green" ]
+"stonith" -> "rsc1_stop_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"stonith" -> "rsc2_stop_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+}
diff --git a/crm/pengine/testcases/rec-node-7.exp b/crm/pengine/testcases/rec-node-7.exp
index 3332877225..22821e3b87 100644
--- a/crm/pengine/testcases/rec-node-7.exp
+++ b/crm/pengine/testcases/rec-node-7.exp
@@ -1,64 +1,64 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/rec-node-8.dot b/crm/pengine/testcases/rec-node-8.dot
new file mode 100644
index 0000000000..7dab60f3bc
--- /dev/null
+++ b/crm/pengine/testcases/rec-node-8.dot
@@ -0,0 +1,12 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ fontcolor="red" ]
+"rsc1_start_0" [ fontcolor="red" ]
+"rsc2_stop_0" [ fontcolor="red" ]
+"rsc2_start_0" [ fontcolor="red" ]
+"rsc3_start_0" [ color="blue" ]
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+}
diff --git a/crm/pengine/testcases/rec-node-9.dot b/crm/pengine/testcases/rec-node-9.dot
new file mode 100644
index 0000000000..f2e8fe37e5
--- /dev/null
+++ b/crm/pengine/testcases/rec-node-9.dot
@@ -0,0 +1,5 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="blue" ]
+"rsc2_start_0" [ color="blue" ]
+}
diff --git a/crm/pengine/testcases/rec-rsc-0.dot b/crm/pengine/testcases/rec-rsc-0.dot
new file mode 100644
index 0000000000..6be0e27355
--- /dev/null
+++ b/crm/pengine/testcases/rec-rsc-0.dot
@@ -0,0 +1,8 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="blue" ]
+"rsc1_stop_0" [ color="green" ]
+"rsc1_stop_0" [ color="green" ]
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+}
diff --git a/crm/pengine/testcases/rec-rsc-0.exp b/crm/pengine/testcases/rec-rsc-0.exp
index 1f01e66138..abdcc7c3b5 100644
--- a/crm/pengine/testcases/rec-rsc-0.exp
+++ b/crm/pengine/testcases/rec-rsc-0.exp
@@ -1,21 +1,21 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rec-rsc-1.dot b/crm/pengine/testcases/rec-rsc-1.dot
new file mode 100644
index 0000000000..99d84951ff
--- /dev/null
+++ b/crm/pengine/testcases/rec-rsc-1.dot
@@ -0,0 +1,7 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+"rsc1_stop_0" [ color="green" ]
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+}
diff --git a/crm/pengine/testcases/rec-rsc-1.exp b/crm/pengine/testcases/rec-rsc-1.exp
index 40db92d450..baec33a90a 100644
--- a/crm/pengine/testcases/rec-rsc-1.exp
+++ b/crm/pengine/testcases/rec-rsc-1.exp
@@ -1,25 +1,25 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/rec-rsc-2.dot b/crm/pengine/testcases/rec-rsc-2.dot
new file mode 100644
index 0000000000..cbca5d5eb4
--- /dev/null
+++ b/crm/pengine/testcases/rec-rsc-2.dot
@@ -0,0 +1,7 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_monitor_1" [ color="blue" ]
+"rsc1_stop_0" [ color="green" ]
+"rsc1_start_0" [ color="green" ]
+"rsc1_stop_0" -> "rsc1_start_0"
+}
diff --git a/crm/pengine/testcases/rec-rsc-2.exp b/crm/pengine/testcases/rec-rsc-2.exp
index bc228883f6..d2d5fb4f08 100644
--- a/crm/pengine/testcases/rec-rsc-2.exp
+++ b/crm/pengine/testcases/rec-rsc-2.exp
@@ -1,25 +1,25 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/rec-rsc-3.dot b/crm/pengine/testcases/rec-rsc-3.dot
new file mode 100644
index 0000000000..0354b15bb2
--- /dev/null
+++ b/crm/pengine/testcases/rec-rsc-3.dot
@@ -0,0 +1,6 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="blue" ]
+"rsc1_start_0" [ color="green" ]
+"rsc1_stop_0" -> "rsc1_start_0"
+}
diff --git a/crm/pengine/testcases/rec-rsc-3.exp b/crm/pengine/testcases/rec-rsc-3.exp
index 652d472923..f92c9ed700 100644
--- a/crm/pengine/testcases/rec-rsc-3.exp
+++ b/crm/pengine/testcases/rec-rsc-3.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/rec-rsc-4.dot b/crm/pengine/testcases/rec-rsc-4.dot
new file mode 100644
index 0000000000..97674458c5
--- /dev/null
+++ b/crm/pengine/testcases/rec-rsc-4.dot
@@ -0,0 +1,7 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="green" ]
+"rsc1_start_0" [ color="green" ]
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+}
diff --git a/crm/pengine/testcases/rec-rsc-4.exp b/crm/pengine/testcases/rec-rsc-4.exp
index 43f91bede5..f81717dbac 100644
--- a/crm/pengine/testcases/rec-rsc-4.exp
+++ b/crm/pengine/testcases/rec-rsc-4.exp
@@ -1,25 +1,25 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/rec-rsc-5.dot b/crm/pengine/testcases/rec-rsc-5.dot
new file mode 100644
index 0000000000..2085adf017
--- /dev/null
+++ b/crm/pengine/testcases/rec-rsc-5.dot
@@ -0,0 +1,14 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="green" fontcolor="orange" ]
+"rsc1_start_0" [ color="green" ]
+"rsc2_stop_0" [ color="green" ]
+"rsc2_start_0" [ color="green" ]
+"stonith" [ color="green" ]
+"stonith" -> "rsc1_stop_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+"rsc2_stop_0" -> "rsc2_start_0"
+"rsc2_stop_0" -> "stonith"
+}
diff --git a/crm/pengine/testcases/rec-rsc-5.exp b/crm/pengine/testcases/rec-rsc-5.exp
index 9cb7077796..f790b933f4 100644
--- a/crm/pengine/testcases/rec-rsc-5.exp
+++ b/crm/pengine/testcases/rec-rsc-5.exp
@@ -1,65 +1,65 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/rec-rsc-6.dot b/crm/pengine/testcases/rec-rsc-6.dot
new file mode 100644
index 0000000000..d6a9de9f71
--- /dev/null
+++ b/crm/pengine/testcases/rec-rsc-6.dot
@@ -0,0 +1,10 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="green" ]
+"rsc1_stop_0" [ color="green" ]
+"rsc1_start_0" [ color="green" ]
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+}
diff --git a/crm/pengine/testcases/rec-rsc-6.exp b/crm/pengine/testcases/rec-rsc-6.exp
index 76753e6a75..31bc996e00 100644
--- a/crm/pengine/testcases/rec-rsc-6.exp
+++ b/crm/pengine/testcases/rec-rsc-6.exp
@@ -1,37 +1,37 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/rec-rsc-7.dot b/crm/pengine/testcases/rec-rsc-7.dot
new file mode 100644
index 0000000000..3181ca81b1
--- /dev/null
+++ b/crm/pengine/testcases/rec-rsc-7.dot
@@ -0,0 +1,5 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="green" ]
+"rsc1_stop_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/rec-rsc-7.exp b/crm/pengine/testcases/rec-rsc-7.exp
index 0e51abc3f1..b1d1d0423b 100644
--- a/crm/pengine/testcases/rec-rsc-7.exp
+++ b/crm/pengine/testcases/rec-rsc-7.exp
@@ -1,21 +1,21 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rec-rsc-8.dot b/crm/pengine/testcases/rec-rsc-8.dot
new file mode 100644
index 0000000000..b30097fbc2
--- /dev/null
+++ b/crm/pengine/testcases/rec-rsc-8.dot
@@ -0,0 +1,3 @@
+digraph "g" {
+ size = "30,30"
+}
diff --git a/crm/pengine/testcases/rsc_dep1.dot b/crm/pengine/testcases/rsc_dep1.dot
new file mode 100644
index 0000000000..8aa2dd1ba2
--- /dev/null
+++ b/crm/pengine/testcases/rsc_dep1.dot
@@ -0,0 +1,5 @@
+digraph "g" {
+ size = "30,30"
+"rsc2_start_0" [ color="green" ]
+"rsc1_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/rsc_dep1.exp b/crm/pengine/testcases/rsc_dep1.exp
index 906048f4e3..3b6abfbb49 100644
--- a/crm/pengine/testcases/rsc_dep1.exp
+++ b/crm/pengine/testcases/rsc_dep1.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep10.dot b/crm/pengine/testcases/rsc_dep10.dot
new file mode 100644
index 0000000000..b30097fbc2
--- /dev/null
+++ b/crm/pengine/testcases/rsc_dep10.dot
@@ -0,0 +1,3 @@
+digraph "g" {
+ size = "30,30"
+}
diff --git a/crm/pengine/testcases/rsc_dep2.dot b/crm/pengine/testcases/rsc_dep2.dot
new file mode 100644
index 0000000000..a53f58a464
--- /dev/null
+++ b/crm/pengine/testcases/rsc_dep2.dot
@@ -0,0 +1,11 @@
+digraph "g" {
+ size = "30,30"
+"rsc2_start_0" [ color="green" ]
+"rsc4_stop_0" [ color="blue" ]
+"rsc4_start_0" [ color="blue" ]
+"rsc1_stop_0" [ color="blue" ]
+"rsc1_start_0" [ color="blue" ]
+"rsc3_start_0" [ color="green" ]
+"rsc4_stop_0" -> "rsc4_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+}
diff --git a/crm/pengine/testcases/rsc_dep2.exp b/crm/pengine/testcases/rsc_dep2.exp
index 82b80e7fa7..6ecc87aebd 100644
--- a/crm/pengine/testcases/rsc_dep2.exp
+++ b/crm/pengine/testcases/rsc_dep2.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep3.dot b/crm/pengine/testcases/rsc_dep3.dot
new file mode 100644
index 0000000000..8aa2dd1ba2
--- /dev/null
+++ b/crm/pengine/testcases/rsc_dep3.dot
@@ -0,0 +1,5 @@
+digraph "g" {
+ size = "30,30"
+"rsc2_start_0" [ color="green" ]
+"rsc1_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/rsc_dep3.exp b/crm/pengine/testcases/rsc_dep3.exp
index 8341fb735a..dfe0bafb3e 100644
--- a/crm/pengine/testcases/rsc_dep3.exp
+++ b/crm/pengine/testcases/rsc_dep3.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep4.dot b/crm/pengine/testcases/rsc_dep4.dot
new file mode 100644
index 0000000000..637aac06ad
--- /dev/null
+++ b/crm/pengine/testcases/rsc_dep4.dot
@@ -0,0 +1,12 @@
+digraph "g" {
+ size = "30,30"
+"rsc2_start_0" [ color="green" ]
+"rsc4_stop_0" [ color="green" ]
+"rsc4_start_0" [ color="green" ]
+"rsc1_stop_0" [ color="blue" ]
+"rsc1_start_0" [ color="blue" ]
+"rsc3_start_0" [ color="green" ]
+"rsc4_stop_0" -> "rsc4_start_0"
+"rsc4_stop_0" -> "rsc4_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+}
diff --git a/crm/pengine/testcases/rsc_dep4.exp b/crm/pengine/testcases/rsc_dep4.exp
index f2b05bea4e..9fb35bd27e 100644
--- a/crm/pengine/testcases/rsc_dep4.exp
+++ b/crm/pengine/testcases/rsc_dep4.exp
@@ -1,51 +1,51 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep5.dot b/crm/pengine/testcases/rsc_dep5.dot
new file mode 100644
index 0000000000..dbe43b2ac3
--- /dev/null
+++ b/crm/pengine/testcases/rsc_dep5.dot
@@ -0,0 +1,5 @@
+digraph "g" {
+ size = "30,30"
+"rsc3_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/rsc_dep5.exp b/crm/pengine/testcases/rsc_dep5.exp
index f72389561c..ce178442e8 100644
--- a/crm/pengine/testcases/rsc_dep5.exp
+++ b/crm/pengine/testcases/rsc_dep5.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep7.dot b/crm/pengine/testcases/rsc_dep7.dot
new file mode 100644
index 0000000000..5a42ab441c
--- /dev/null
+++ b/crm/pengine/testcases/rsc_dep7.dot
@@ -0,0 +1,6 @@
+digraph "g" {
+ size = "30,30"
+"rsc3_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" ]
+"rsc1_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/rsc_dep7.exp b/crm/pengine/testcases/rsc_dep7.exp
index 40b0c3867f..26d88fb3bb 100644
--- a/crm/pengine/testcases/rsc_dep7.exp
+++ b/crm/pengine/testcases/rsc_dep7.exp
@@ -1,36 +1,36 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep8.dot b/crm/pengine/testcases/rsc_dep8.dot
new file mode 100644
index 0000000000..a53f58a464
--- /dev/null
+++ b/crm/pengine/testcases/rsc_dep8.dot
@@ -0,0 +1,11 @@
+digraph "g" {
+ size = "30,30"
+"rsc2_start_0" [ color="green" ]
+"rsc4_stop_0" [ color="blue" ]
+"rsc4_start_0" [ color="blue" ]
+"rsc1_stop_0" [ color="blue" ]
+"rsc1_start_0" [ color="blue" ]
+"rsc3_start_0" [ color="green" ]
+"rsc4_stop_0" -> "rsc4_start_0"
+"rsc1_stop_0" -> "rsc1_start_0"
+}
diff --git a/crm/pengine/testcases/rsc_dep8.exp b/crm/pengine/testcases/rsc_dep8.exp
index 82b80e7fa7..6ecc87aebd 100644
--- a/crm/pengine/testcases/rsc_dep8.exp
+++ b/crm/pengine/testcases/rsc_dep8.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/simple1.dot b/crm/pengine/testcases/simple1.dot
new file mode 100644
index 0000000000..b30097fbc2
--- /dev/null
+++ b/crm/pengine/testcases/simple1.dot
@@ -0,0 +1,3 @@
+digraph "g" {
+ size = "30,30"
+}
diff --git a/crm/pengine/testcases/simple11.dot b/crm/pengine/testcases/simple11.dot
new file mode 100644
index 0000000000..0bc70a17b3
--- /dev/null
+++ b/crm/pengine/testcases/simple11.dot
@@ -0,0 +1,5 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/simple11.exp b/crm/pengine/testcases/simple11.exp
index 1b52805c49..d4af2bd14c 100644
--- a/crm/pengine/testcases/simple11.exp
+++ b/crm/pengine/testcases/simple11.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/simple12.dot b/crm/pengine/testcases/simple12.dot
new file mode 100644
index 0000000000..0bc70a17b3
--- /dev/null
+++ b/crm/pengine/testcases/simple12.dot
@@ -0,0 +1,5 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+"rsc2_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/simple12.exp b/crm/pengine/testcases/simple12.exp
index da479aab00..32428f90c9 100644
--- a/crm/pengine/testcases/simple12.exp
+++ b/crm/pengine/testcases/simple12.exp
@@ -1,21 +1,21 @@
-
+
-
+
diff --git a/crm/pengine/testcases/simple2.dot b/crm/pengine/testcases/simple2.dot
new file mode 100644
index 0000000000..3bbf162d76
--- /dev/null
+++ b/crm/pengine/testcases/simple2.dot
@@ -0,0 +1,4 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/simple2.exp b/crm/pengine/testcases/simple2.exp
index 05242be7da..07dc987376 100644
--- a/crm/pengine/testcases/simple2.exp
+++ b/crm/pengine/testcases/simple2.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/simple3.dot b/crm/pengine/testcases/simple3.dot
new file mode 100644
index 0000000000..3bbf162d76
--- /dev/null
+++ b/crm/pengine/testcases/simple3.dot
@@ -0,0 +1,4 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/simple3.exp b/crm/pengine/testcases/simple3.exp
index 40dca645ef..3940c2d425 100644
--- a/crm/pengine/testcases/simple3.exp
+++ b/crm/pengine/testcases/simple3.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/simple4.dot b/crm/pengine/testcases/simple4.dot
new file mode 100644
index 0000000000..9a26ea5abf
--- /dev/null
+++ b/crm/pengine/testcases/simple4.dot
@@ -0,0 +1,6 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_start_0" [ color="blue" ]
+"rsc1_stop_0" [ color="green" ]
+"rsc1_stop_0" -> "rsc1_start_0"
+}
diff --git a/crm/pengine/testcases/simple4.exp b/crm/pengine/testcases/simple4.exp
index 8097b419b8..9690cdfbec 100644
--- a/crm/pengine/testcases/simple4.exp
+++ b/crm/pengine/testcases/simple4.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/simple6.dot b/crm/pengine/testcases/simple6.dot
new file mode 100644
index 0000000000..09d144abaf
--- /dev/null
+++ b/crm/pengine/testcases/simple6.dot
@@ -0,0 +1,5 @@
+digraph "g" {
+ size = "30,30"
+"rsc2_start_0" [ color="green" ]
+"rsc1_stop_0" [ color="green" ]
+}
diff --git a/crm/pengine/testcases/simple6.exp b/crm/pengine/testcases/simple6.exp
index 7f980cd9bb..2793966581 100644
--- a/crm/pengine/testcases/simple6.exp
+++ b/crm/pengine/testcases/simple6.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/simple7.dot b/crm/pengine/testcases/simple7.dot
new file mode 100644
index 0000000000..9920e3b354
--- /dev/null
+++ b/crm/pengine/testcases/simple7.dot
@@ -0,0 +1,6 @@
+digraph "g" {
+ size = "30,30"
+"rsc1_stop_0" [ color="green" ]
+"do_shutdown" [ color="green" ]
+"rsc1_stop_0" -> "do_shutdown"
+}
diff --git a/crm/pengine/testcases/simple7.exp b/crm/pengine/testcases/simple7.exp
index 14e5897241..f5138d72cb 100644
--- a/crm/pengine/testcases/simple7.exp
+++ b/crm/pengine/testcases/simple7.exp
@@ -1,24 +1,24 @@
-
+
-
+
-
+