diff --git a/pengine/test10/resource-discovery.dot b/pengine/test10/resource-discovery.dot
index efb2434047..5b1aab995d 100644
--- a/pengine/test10/resource-discovery.dot
+++ b/pengine/test10/resource-discovery.dot
@@ -1,185 +1,171 @@
digraph "g" {
-"FAKE1_monitor_0 18builder" -> "probe_complete 18builder" [ style = bold]
-"FAKE1_monitor_0 18builder" [ style=bold color="green" fontcolor="black"]
-"FAKE1_monitor_0 18node1" -> "probe_complete 18node1" [ style = bold]
-"FAKE1_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
-"FAKE1_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
-"FAKE1_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
-"FAKE1_monitor_0 18node3" -> "probe_complete 18node3" [ style = bold]
-"FAKE1_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
"FAKE1_monitor_0 18node4" -> "probe_complete 18node4" [ style = bold]
"FAKE1_monitor_0 18node4" [ style=bold color="green" fontcolor="black"]
-"FAKE1_monitor_60000 18node2" [ style=bold color="green" fontcolor="black"]
-"FAKE1_start_0 18node2" -> "FAKE1_monitor_60000 18node2" [ style = bold]
-"FAKE1_start_0 18node2" [ style=bold color="green" fontcolor="black"]
-"FAKE2_monitor_60000 18node3" [ style=bold color="green" fontcolor="black"]
-"FAKE2_start_0 18node3" -> "FAKE2_monitor_60000 18node3" [ style = bold]
-"FAKE2_start_0 18node3" [ style=bold color="green" fontcolor="black"]
-"FAKE2_stop_0 18node2" -> "FAKE2_start_0 18node3" [ style = bold]
-"FAKE2_stop_0 18node2" -> "all_stopped" [ style = bold]
-"FAKE2_stop_0 18node2" [ style=bold color="green" fontcolor="black"]
+"FAKE1_monitor_60000 18node4" [ style=bold color="green" fontcolor="black"]
+"FAKE1_start_0 18node4" -> "FAKE1_monitor_60000 18node4" [ style = bold]
+"FAKE1_start_0 18node4" [ style=bold color="green" fontcolor="black"]
+"FAKE2_monitor_0 18node1" -> "probe_complete 18node1" [ style = bold]
+"FAKE2_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
+"FAKE2_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
+"FAKE2_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
+"FAKE2_monitor_60000 18node2" [ style=bold color="green" fontcolor="black"]
+"FAKE2_start_0 18node2" -> "FAKE2_monitor_60000 18node2" [ style = bold]
+"FAKE2_start_0 18node2" [ style=bold color="green" fontcolor="black"]
"FAKE3_monitor_0 18node3" -> "probe_complete 18node3" [ style = bold]
"FAKE3_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
"FAKE3_monitor_60000 18node3" [ style=bold color="green" fontcolor="black"]
"FAKE3_start_0 18node3" -> "FAKE3_monitor_60000 18node3" [ style = bold]
"FAKE3_start_0 18node3" [ style=bold color="green" fontcolor="black"]
-"FAKE3_stop_0 18builder" -> "FAKE3_start_0 18node3" [ style = bold]
-"FAKE3_stop_0 18builder" -> "all_stopped" [ style = bold]
-"FAKE3_stop_0 18builder" [ style=bold color="green" fontcolor="black"]
"FAKE4_monitor_0 18node4" -> "probe_complete 18node4" [ style = bold]
"FAKE4_monitor_0 18node4" [ style=bold color="green" fontcolor="black"]
"FAKE4_monitor_60000 18node4" [ style=bold color="green" fontcolor="black"]
"FAKE4_start_0 18node4" -> "FAKE4_monitor_60000 18node4" [ style = bold]
"FAKE4_start_0 18node4" [ style=bold color="green" fontcolor="black"]
-"FAKE4_stop_0 18node1" -> "FAKE4_start_0 18node4" [ style = bold]
-"FAKE4_stop_0 18node1" -> "all_stopped" [ style = bold]
-"FAKE4_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
-"FAKE5_monitor_0 18builder" -> "probe_complete 18builder" [ style = bold]
-"FAKE5_monitor_0 18builder" [ style=bold color="green" fontcolor="black"]
"FAKE5_monitor_0 18node1" -> "probe_complete 18node1" [ style = bold]
"FAKE5_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
"FAKE5_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
"FAKE5_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
"FAKE5_monitor_0 18node3" -> "probe_complete 18node3" [ style = bold]
"FAKE5_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
"FAKE5_monitor_0 18node4" -> "probe_complete 18node4" [ style = bold]
"FAKE5_monitor_0 18node4" [ style=bold color="green" fontcolor="black"]
"FAKE5_monitor_0 remote1" -> "probe_complete remote1" [ style = bold]
"FAKE5_monitor_0 remote1" [ style=bold color="green" fontcolor="black"]
"FAKE5_monitor_60000 remote1" [ style=bold color="green" fontcolor="black"]
"FAKE5_start_0 remote1" -> "FAKE5_monitor_60000 remote1" [ style = bold]
"FAKE5_start_0 remote1" [ style=bold color="green" fontcolor="black"]
+"FAKE6_monitor_0 18node1" -> "probe_complete 18node1" [ style = bold]
+"FAKE6_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
+"FAKE6_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
+"FAKE6_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
+"FAKE6_monitor_10000 18node1" [ style=bold color="green" fontcolor="black"]
+"FAKE6_start_0 18node1" -> "FAKE6_monitor_10000 18node1" [ style = bold]
+"FAKE6_start_0 18node1" -> "FAKE7_start_0 18node1" [ style = bold]
+"FAKE6_start_0 18node1" -> "FAKEGROUP_running_0" [ style = bold]
+"FAKE6_start_0 18node1" [ style=bold color="green" fontcolor="black"]
+"FAKE7_monitor_0 18node1" -> "probe_complete 18node1" [ style = bold]
+"FAKE7_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
+"FAKE7_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
+"FAKE7_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
+"FAKE7_monitor_10000 18node1" [ style=bold color="green" fontcolor="black"]
+"FAKE7_start_0 18node1" -> "FAKE7_monitor_10000 18node1" [ style = bold]
+"FAKE7_start_0 18node1" -> "FAKEGROUP_running_0" [ style = bold]
+"FAKE7_start_0 18node1" [ style=bold color="green" fontcolor="black"]
"FAKECLONE1-clone_running_0" [ style=bold color="green" fontcolor="orange"]
"FAKECLONE1-clone_start_0" -> "FAKECLONE1-clone_running_0" [ style = bold]
-"FAKECLONE1-clone_start_0" -> "FAKECLONE1:0_start_0 18builder" [ style = bold]
-"FAKECLONE1-clone_start_0" -> "FAKECLONE1:1_start_0 18node1" [ style = bold]
-"FAKECLONE1-clone_start_0" -> "FAKECLONE1:2_start_0 18node2" [ style = bold]
-"FAKECLONE1-clone_start_0" -> "FAKECLONE1:3_start_0 18node4" [ style = bold]
-"FAKECLONE1-clone_start_0" -> "FAKECLONE1:4_start_0 remote1" [ style = bold]
-"FAKECLONE1-clone_start_0" -> "FAKECLONE1:5_start_0 18node3" [ style = bold]
+"FAKECLONE1-clone_start_0" -> "FAKECLONE1:0_start_0 18node1" [ style = bold]
+"FAKECLONE1-clone_start_0" -> "FAKECLONE1:1_start_0 remote1" [ style = bold]
"FAKECLONE1-clone_start_0" [ style=bold color="green" fontcolor="orange"]
-"FAKECLONE1:0_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"]
-"FAKECLONE1:0_start_0 18builder" -> "FAKECLONE1-clone_running_0" [ style = bold]
-"FAKECLONE1:0_start_0 18builder" -> "FAKECLONE1:0_monitor_60000 18builder" [ style = bold]
-"FAKECLONE1:0_start_0 18builder" [ style=bold color="green" fontcolor="black"]
-"FAKECLONE1:1_monitor_60000 18node1" [ style=bold color="green" fontcolor="black"]
-"FAKECLONE1:1_start_0 18node1" -> "FAKECLONE1-clone_running_0" [ style = bold]
-"FAKECLONE1:1_start_0 18node1" -> "FAKECLONE1:1_monitor_60000 18node1" [ style = bold]
-"FAKECLONE1:1_start_0 18node1" [ style=bold color="green" fontcolor="black"]
-"FAKECLONE1:2_monitor_60000 18node2" [ style=bold color="green" fontcolor="black"]
-"FAKECLONE1:2_start_0 18node2" -> "FAKECLONE1-clone_running_0" [ style = bold]
-"FAKECLONE1:2_start_0 18node2" -> "FAKECLONE1:2_monitor_60000 18node2" [ style = bold]
-"FAKECLONE1:2_start_0 18node2" [ style=bold color="green" fontcolor="black"]
-"FAKECLONE1:3_monitor_60000 18node4" [ style=bold color="green" fontcolor="black"]
-"FAKECLONE1:3_start_0 18node4" -> "FAKECLONE1-clone_running_0" [ style = bold]
-"FAKECLONE1:3_start_0 18node4" -> "FAKECLONE1:3_monitor_60000 18node4" [ style = bold]
-"FAKECLONE1:3_start_0 18node4" [ style=bold color="green" fontcolor="black"]
-"FAKECLONE1:4_monitor_0 remote1" -> "probe_complete remote1" [ style = bold]
-"FAKECLONE1:4_monitor_0 remote1" [ style=bold color="green" fontcolor="black"]
-"FAKECLONE1:4_monitor_60000 remote1" [ style=bold color="green" fontcolor="black"]
-"FAKECLONE1:4_start_0 remote1" -> "FAKECLONE1-clone_running_0" [ style = bold]
-"FAKECLONE1:4_start_0 remote1" -> "FAKECLONE1:4_monitor_60000 remote1" [ style = bold]
-"FAKECLONE1:4_start_0 remote1" [ style=bold color="green" fontcolor="black"]
-"FAKECLONE1:5_monitor_60000 18node3" [ style=bold color="green" fontcolor="black"]
-"FAKECLONE1:5_start_0 18node3" -> "FAKECLONE1-clone_running_0" [ style = bold]
-"FAKECLONE1:5_start_0 18node3" -> "FAKECLONE1:5_monitor_60000 18node3" [ style = bold]
-"FAKECLONE1:5_start_0 18node3" [ style=bold color="green" fontcolor="black"]
+"FAKECLONE1:0_monitor_0 18node1" -> "probe_complete 18node1" [ style = bold]
+"FAKECLONE1:0_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
+"FAKECLONE1:0_monitor_60000 18node1" [ style=bold color="green" fontcolor="black"]
+"FAKECLONE1:0_start_0 18node1" -> "FAKECLONE1-clone_running_0" [ style = bold]
+"FAKECLONE1:0_start_0 18node1" -> "FAKECLONE1:0_monitor_60000 18node1" [ style = bold]
+"FAKECLONE1:0_start_0 18node1" [ style=bold color="green" fontcolor="black"]
+"FAKECLONE1:1_monitor_0 remote1" -> "probe_complete remote1" [ style = bold]
+"FAKECLONE1:1_monitor_0 remote1" [ style=bold color="green" fontcolor="black"]
+"FAKECLONE1:1_monitor_60000 remote1" [ style=bold color="green" fontcolor="black"]
+"FAKECLONE1:1_start_0 remote1" -> "FAKECLONE1-clone_running_0" [ style = bold]
+"FAKECLONE1:1_start_0 remote1" -> "FAKECLONE1:1_monitor_60000 remote1" [ style = bold]
+"FAKECLONE1:1_start_0 remote1" [ style=bold color="green" fontcolor="black"]
"FAKECLONE2-clone_running_0" [ style=bold color="green" fontcolor="orange"]
"FAKECLONE2-clone_start_0" -> "FAKECLONE2-clone_running_0" [ style = bold]
-"FAKECLONE2-clone_start_0" -> "FAKECLONE2:0_start_0 18builder" [ style = bold]
+"FAKECLONE2-clone_start_0" -> "FAKECLONE2:0_start_0 18node3" [ style = bold]
"FAKECLONE2-clone_start_0" -> "FAKECLONE2:1_start_0 18node1" [ style = bold]
"FAKECLONE2-clone_start_0" -> "FAKECLONE2:2_start_0 18node2" [ style = bold]
"FAKECLONE2-clone_start_0" -> "FAKECLONE2:3_start_0 18node4" [ style = bold]
"FAKECLONE2-clone_start_0" -> "FAKECLONE2:4_start_0 remote1" [ style = bold]
-"FAKECLONE2-clone_start_0" -> "FAKECLONE2:5_start_0 18node3" [ style = bold]
"FAKECLONE2-clone_start_0" [ style=bold color="green" fontcolor="orange"]
-"FAKECLONE2:0_monitor_0 18builder" -> "probe_complete 18builder" [ style = bold]
-"FAKECLONE2:0_monitor_0 18builder" [ style=bold color="green" fontcolor="black"]
-"FAKECLONE2:0_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"]
-"FAKECLONE2:0_start_0 18builder" -> "FAKECLONE2-clone_running_0" [ style = bold]
-"FAKECLONE2:0_start_0 18builder" -> "FAKECLONE2:0_monitor_60000 18builder" [ style = bold]
-"FAKECLONE2:0_start_0 18builder" [ style=bold color="green" fontcolor="black"]
+"FAKECLONE2:0_monitor_0 18node3" -> "probe_complete 18node3" [ style = bold]
+"FAKECLONE2:0_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
+"FAKECLONE2:0_monitor_60000 18node3" [ style=bold color="green" fontcolor="black"]
+"FAKECLONE2:0_start_0 18node3" -> "FAKECLONE2-clone_running_0" [ style = bold]
+"FAKECLONE2:0_start_0 18node3" -> "FAKECLONE2:0_monitor_60000 18node3" [ style = bold]
+"FAKECLONE2:0_start_0 18node3" [ style=bold color="green" fontcolor="black"]
"FAKECLONE2:1_monitor_0 18node1" -> "probe_complete 18node1" [ style = bold]
"FAKECLONE2:1_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
"FAKECLONE2:1_monitor_60000 18node1" [ style=bold color="green" fontcolor="black"]
"FAKECLONE2:1_start_0 18node1" -> "FAKECLONE2-clone_running_0" [ style = bold]
"FAKECLONE2:1_start_0 18node1" -> "FAKECLONE2:1_monitor_60000 18node1" [ style = bold]
"FAKECLONE2:1_start_0 18node1" [ style=bold color="green" fontcolor="black"]
"FAKECLONE2:2_monitor_60000 18node2" [ style=bold color="green" fontcolor="black"]
"FAKECLONE2:2_start_0 18node2" -> "FAKECLONE2-clone_running_0" [ style = bold]
"FAKECLONE2:2_start_0 18node2" -> "FAKECLONE2:2_monitor_60000 18node2" [ style = bold]
"FAKECLONE2:2_start_0 18node2" [ style=bold color="green" fontcolor="black"]
"FAKECLONE2:3_monitor_0 18node4" -> "probe_complete 18node4" [ style = bold]
"FAKECLONE2:3_monitor_0 18node4" [ style=bold color="green" fontcolor="black"]
"FAKECLONE2:3_monitor_60000 18node4" [ style=bold color="green" fontcolor="black"]
"FAKECLONE2:3_start_0 18node4" -> "FAKECLONE2-clone_running_0" [ style = bold]
"FAKECLONE2:3_start_0 18node4" -> "FAKECLONE2:3_monitor_60000 18node4" [ style = bold]
"FAKECLONE2:3_start_0 18node4" [ style=bold color="green" fontcolor="black"]
"FAKECLONE2:4_monitor_0 remote1" -> "probe_complete remote1" [ style = bold]
"FAKECLONE2:4_monitor_0 remote1" [ style=bold color="green" fontcolor="black"]
"FAKECLONE2:4_monitor_60000 remote1" [ style=bold color="green" fontcolor="black"]
"FAKECLONE2:4_start_0 remote1" -> "FAKECLONE2-clone_running_0" [ style = bold]
"FAKECLONE2:4_start_0 remote1" -> "FAKECLONE2:4_monitor_60000 remote1" [ style = bold]
"FAKECLONE2:4_start_0 remote1" [ style=bold color="green" fontcolor="black"]
-"FAKECLONE2:5_monitor_0 18node3" -> "probe_complete 18node3" [ style = bold]
-"FAKECLONE2:5_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
-"FAKECLONE2:5_monitor_60000 18node3" [ style=bold color="green" fontcolor="black"]
-"FAKECLONE2:5_start_0 18node3" -> "FAKECLONE2-clone_running_0" [ style = bold]
-"FAKECLONE2:5_start_0 18node3" -> "FAKECLONE2:5_monitor_60000 18node3" [ style = bold]
-"FAKECLONE2:5_start_0 18node3" [ style=bold color="green" fontcolor="black"]
-"all_stopped" [ style=bold color="green" fontcolor="orange"]
-"probe_complete 18builder" -> "probe_nodes_complete" [ style = bold]
-"probe_complete 18builder" [ style=bold color="green" fontcolor="black"]
+"FAKEGROUP_running_0" [ style=bold color="green" fontcolor="orange"]
+"FAKEGROUP_start_0" -> "FAKE6_start_0 18node1" [ style = bold]
+"FAKEGROUP_start_0" -> "FAKE7_start_0 18node1" [ style = bold]
+"FAKEGROUP_start_0" -> "FAKEGROUP_running_0" [ style = bold]
+"FAKEGROUP_start_0" [ style=bold color="green" fontcolor="orange"]
"probe_complete 18node1" -> "probe_nodes_complete" [ style = bold]
"probe_complete 18node1" [ style=bold color="green" fontcolor="black"]
"probe_complete 18node2" -> "probe_nodes_complete" [ style = bold]
"probe_complete 18node2" [ style=bold color="green" fontcolor="black"]
"probe_complete 18node3" -> "probe_nodes_complete" [ style = bold]
"probe_complete 18node3" [ style=bold color="green" fontcolor="black"]
"probe_complete 18node4" -> "probe_nodes_complete" [ style = bold]
"probe_complete 18node4" [ style=bold color="green" fontcolor="black"]
"probe_complete remote1" -> "probe_complete" [ style = bold]
"probe_complete remote1" [ style=bold color="green" fontcolor="black"]
-"probe_complete" -> "FAKE1_start_0 18node2" [ style = bold]
-"probe_complete" -> "FAKE2_stop_0 18node2" [ style = bold]
+"probe_complete" -> "FAKE1_start_0 18node4" [ style = bold]
+"probe_complete" -> "FAKE2_start_0 18node2" [ style = bold]
"probe_complete" -> "FAKE3_start_0 18node3" [ style = bold]
-"probe_complete" -> "FAKE3_stop_0 18builder" [ style = bold]
"probe_complete" -> "FAKE4_start_0 18node4" [ style = bold]
-"probe_complete" -> "FAKE4_stop_0 18node1" [ style = bold]
"probe_complete" -> "FAKE5_start_0 remote1" [ style = bold]
-"probe_complete" -> "FAKECLONE1:0_start_0 18builder" [ style = bold]
-"probe_complete" -> "FAKECLONE1:1_start_0 18node1" [ style = bold]
-"probe_complete" -> "FAKECLONE1:2_start_0 18node2" [ style = bold]
-"probe_complete" -> "FAKECLONE1:3_start_0 18node4" [ style = bold]
-"probe_complete" -> "FAKECLONE1:4_start_0 remote1" [ style = bold]
-"probe_complete" -> "FAKECLONE1:5_start_0 18node3" [ style = bold]
-"probe_complete" -> "FAKECLONE2:0_start_0 18builder" [ style = bold]
+"probe_complete" -> "FAKE6_start_0 18node1" [ style = bold]
+"probe_complete" -> "FAKE7_start_0 18node1" [ style = bold]
+"probe_complete" -> "FAKECLONE1:0_start_0 18node1" [ style = bold]
+"probe_complete" -> "FAKECLONE1:1_start_0 remote1" [ style = bold]
+"probe_complete" -> "FAKECLONE2:0_start_0 18node3" [ style = bold]
"probe_complete" -> "FAKECLONE2:1_start_0 18node1" [ style = bold]
"probe_complete" -> "FAKECLONE2:2_start_0 18node2" [ style = bold]
"probe_complete" -> "FAKECLONE2:3_start_0 18node4" [ style = bold]
"probe_complete" -> "FAKECLONE2:4_start_0 remote1" [ style = bold]
-"probe_complete" -> "FAKECLONE2:5_start_0 18node3" [ style = bold]
+"probe_complete" -> "shooter_start_0 18node2" [ style = bold]
"probe_complete" [ style=bold color="green" fontcolor="orange"]
-"probe_nodes_complete" -> "remote1_start_0 18builder" [ style = bold]
+"probe_nodes_complete" -> "remote1_start_0 18node1" [ style = bold]
"probe_nodes_complete" [ style=bold color="green" fontcolor="orange"]
+"remote1_monitor_0 18node1" -> "probe_complete 18node1" [ style = bold]
+"remote1_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
+"remote1_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
+"remote1_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
"remote1_monitor_0 18node3" -> "probe_complete 18node3" [ style = bold]
"remote1_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
"remote1_monitor_0 18node4" -> "probe_complete 18node4" [ style = bold]
"remote1_monitor_0 18node4" [ style=bold color="green" fontcolor="black"]
-"remote1_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"]
-"remote1_start_0 18builder" -> "FAKE5_monitor_0 remote1" [ style = bold]
-"remote1_start_0 18builder" -> "FAKE5_monitor_60000 remote1" [ style = bold]
-"remote1_start_0 18builder" -> "FAKE5_start_0 remote1" [ style = bold]
-"remote1_start_0 18builder" -> "FAKECLONE1:4_monitor_0 remote1" [ style = bold]
-"remote1_start_0 18builder" -> "FAKECLONE1:4_monitor_60000 remote1" [ style = bold]
-"remote1_start_0 18builder" -> "FAKECLONE1:4_start_0 remote1" [ style = bold]
-"remote1_start_0 18builder" -> "FAKECLONE2:4_monitor_0 remote1" [ style = bold]
-"remote1_start_0 18builder" -> "FAKECLONE2:4_monitor_60000 remote1" [ style = bold]
-"remote1_start_0 18builder" -> "FAKECLONE2:4_start_0 remote1" [ style = bold]
-"remote1_start_0 18builder" -> "remote1_monitor_60000 18builder" [ style = bold]
-"remote1_start_0 18builder" [ style=bold color="green" fontcolor="black"]
+"remote1_monitor_60000 18node1" [ style=bold color="green" fontcolor="black"]
+"remote1_start_0 18node1" -> "FAKE5_monitor_0 remote1" [ style = bold]
+"remote1_start_0 18node1" -> "FAKE5_monitor_60000 remote1" [ style = bold]
+"remote1_start_0 18node1" -> "FAKE5_start_0 remote1" [ style = bold]
+"remote1_start_0 18node1" -> "FAKECLONE1:1_monitor_0 remote1" [ style = bold]
+"remote1_start_0 18node1" -> "FAKECLONE1:1_monitor_60000 remote1" [ style = bold]
+"remote1_start_0 18node1" -> "FAKECLONE1:1_start_0 remote1" [ style = bold]
+"remote1_start_0 18node1" -> "FAKECLONE2:4_monitor_0 remote1" [ style = bold]
+"remote1_start_0 18node1" -> "FAKECLONE2:4_monitor_60000 remote1" [ style = bold]
+"remote1_start_0 18node1" -> "FAKECLONE2:4_start_0 remote1" [ style = bold]
+"remote1_start_0 18node1" -> "remote1_monitor_60000 18node1" [ style = bold]
+"remote1_start_0 18node1" [ style=bold color="green" fontcolor="black"]
+"shooter_monitor_0 18node1" -> "probe_complete 18node1" [ style = bold]
+"shooter_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
+"shooter_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
+"shooter_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
"shooter_monitor_0 18node3" -> "probe_complete 18node3" [ style = bold]
"shooter_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
"shooter_monitor_0 18node4" -> "probe_complete 18node4" [ style = bold]
"shooter_monitor_0 18node4" [ style=bold color="green" fontcolor="black"]
+"shooter_monitor_60000 18node2" [ style=bold color="green" fontcolor="black"]
+"shooter_start_0 18node2" -> "shooter_monitor_60000 18node2" [ style = bold]
+"shooter_start_0 18node2" [ style=bold color="green" fontcolor="black"]
}
diff --git a/pengine/test10/resource-discovery.exp b/pengine/test10/resource-discovery.exp
index 2770f4ec95..5459bd7960 100644
--- a/pengine/test10/resource-discovery.exp
+++ b/pengine/test10/resource-discovery.exp
@@ -1,1041 +1,979 @@
-
+
-
+
-
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
-
-
-
+
+
+
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
-
-
-
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
-
-
-
+
+
+
-
+
-
-
-
-
+
-
-
-
+
+
+
-
-
-
-
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
+
+
+
-
+
-
-
-
+
+
+
-
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
-
+
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
-
+
-
-
-
-
+
+
+
-
+
+
+
+
-
+
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
-
-
-
+
+
+
-
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
+
-
-
-
+
+
+
-
-
-
-
-
+
-
-
-
+
+
+
-
-
-
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
+
diff --git a/pengine/test10/resource-discovery.scores b/pengine/test10/resource-discovery.scores
index e1fa78eaa1..9b56b969ee 100644
--- a/pengine/test10/resource-discovery.scores
+++ b/pengine/test10/resource-discovery.scores
@@ -1,199 +1,171 @@
Allocation scores:
-clone_color: FAKECLONE1-clone allocation score on 18builder: 0
clone_color: FAKECLONE1-clone allocation score on 18node1: 0
-clone_color: FAKECLONE1-clone allocation score on 18node2: 0
-clone_color: FAKECLONE1-clone allocation score on 18node3: 0
-clone_color: FAKECLONE1-clone allocation score on 18node4: 0
+clone_color: FAKECLONE1-clone allocation score on 18node2: -INFINITY
+clone_color: FAKECLONE1-clone allocation score on 18node3: -INFINITY
+clone_color: FAKECLONE1-clone allocation score on 18node4: -INFINITY
clone_color: FAKECLONE1-clone allocation score on remote1: 0
-clone_color: FAKECLONE1:0 allocation score on 18builder: 0
clone_color: FAKECLONE1:0 allocation score on 18node1: 0
-clone_color: FAKECLONE1:0 allocation score on 18node2: 0
-clone_color: FAKECLONE1:0 allocation score on 18node3: 0
-clone_color: FAKECLONE1:0 allocation score on 18node4: 0
+clone_color: FAKECLONE1:0 allocation score on 18node2: -INFINITY
+clone_color: FAKECLONE1:0 allocation score on 18node3: -INFINITY
+clone_color: FAKECLONE1:0 allocation score on 18node4: -INFINITY
clone_color: FAKECLONE1:0 allocation score on remote1: 0
-clone_color: FAKECLONE1:1 allocation score on 18builder: 0
clone_color: FAKECLONE1:1 allocation score on 18node1: 0
-clone_color: FAKECLONE1:1 allocation score on 18node2: 0
-clone_color: FAKECLONE1:1 allocation score on 18node3: 0
-clone_color: FAKECLONE1:1 allocation score on 18node4: 0
+clone_color: FAKECLONE1:1 allocation score on 18node2: -INFINITY
+clone_color: FAKECLONE1:1 allocation score on 18node3: -INFINITY
+clone_color: FAKECLONE1:1 allocation score on 18node4: -INFINITY
clone_color: FAKECLONE1:1 allocation score on remote1: 0
-clone_color: FAKECLONE1:2 allocation score on 18builder: 0
clone_color: FAKECLONE1:2 allocation score on 18node1: 0
-clone_color: FAKECLONE1:2 allocation score on 18node2: 0
-clone_color: FAKECLONE1:2 allocation score on 18node3: 0
-clone_color: FAKECLONE1:2 allocation score on 18node4: 0
+clone_color: FAKECLONE1:2 allocation score on 18node2: -INFINITY
+clone_color: FAKECLONE1:2 allocation score on 18node3: -INFINITY
+clone_color: FAKECLONE1:2 allocation score on 18node4: -INFINITY
clone_color: FAKECLONE1:2 allocation score on remote1: 0
-clone_color: FAKECLONE1:3 allocation score on 18builder: 0
clone_color: FAKECLONE1:3 allocation score on 18node1: 0
-clone_color: FAKECLONE1:3 allocation score on 18node2: 0
-clone_color: FAKECLONE1:3 allocation score on 18node3: 0
-clone_color: FAKECLONE1:3 allocation score on 18node4: 0
+clone_color: FAKECLONE1:3 allocation score on 18node2: -INFINITY
+clone_color: FAKECLONE1:3 allocation score on 18node3: -INFINITY
+clone_color: FAKECLONE1:3 allocation score on 18node4: -INFINITY
clone_color: FAKECLONE1:3 allocation score on remote1: 0
-clone_color: FAKECLONE1:4 allocation score on 18builder: 0
clone_color: FAKECLONE1:4 allocation score on 18node1: 0
-clone_color: FAKECLONE1:4 allocation score on 18node2: 0
-clone_color: FAKECLONE1:4 allocation score on 18node3: 0
-clone_color: FAKECLONE1:4 allocation score on 18node4: 0
+clone_color: FAKECLONE1:4 allocation score on 18node2: -INFINITY
+clone_color: FAKECLONE1:4 allocation score on 18node3: -INFINITY
+clone_color: FAKECLONE1:4 allocation score on 18node4: -INFINITY
clone_color: FAKECLONE1:4 allocation score on remote1: 0
-clone_color: FAKECLONE1:5 allocation score on 18builder: 0
-clone_color: FAKECLONE1:5 allocation score on 18node1: 0
-clone_color: FAKECLONE1:5 allocation score on 18node2: 0
-clone_color: FAKECLONE1:5 allocation score on 18node3: 0
-clone_color: FAKECLONE1:5 allocation score on 18node4: 0
-clone_color: FAKECLONE1:5 allocation score on remote1: 0
-clone_color: FAKECLONE2-clone allocation score on 18builder: 0
clone_color: FAKECLONE2-clone allocation score on 18node1: 0
clone_color: FAKECLONE2-clone allocation score on 18node2: 0
clone_color: FAKECLONE2-clone allocation score on 18node3: 0
clone_color: FAKECLONE2-clone allocation score on 18node4: 0
clone_color: FAKECLONE2-clone allocation score on remote1: 0
-clone_color: FAKECLONE2:0 allocation score on 18builder: 0
clone_color: FAKECLONE2:0 allocation score on 18node1: 0
clone_color: FAKECLONE2:0 allocation score on 18node2: 0
clone_color: FAKECLONE2:0 allocation score on 18node3: 0
clone_color: FAKECLONE2:0 allocation score on 18node4: 0
clone_color: FAKECLONE2:0 allocation score on remote1: 0
-clone_color: FAKECLONE2:1 allocation score on 18builder: 0
clone_color: FAKECLONE2:1 allocation score on 18node1: 0
clone_color: FAKECLONE2:1 allocation score on 18node2: 0
clone_color: FAKECLONE2:1 allocation score on 18node3: 0
clone_color: FAKECLONE2:1 allocation score on 18node4: 0
clone_color: FAKECLONE2:1 allocation score on remote1: 0
-clone_color: FAKECLONE2:2 allocation score on 18builder: 0
clone_color: FAKECLONE2:2 allocation score on 18node1: 0
clone_color: FAKECLONE2:2 allocation score on 18node2: 0
clone_color: FAKECLONE2:2 allocation score on 18node3: 0
clone_color: FAKECLONE2:2 allocation score on 18node4: 0
clone_color: FAKECLONE2:2 allocation score on remote1: 0
-clone_color: FAKECLONE2:3 allocation score on 18builder: 0
clone_color: FAKECLONE2:3 allocation score on 18node1: 0
clone_color: FAKECLONE2:3 allocation score on 18node2: 0
clone_color: FAKECLONE2:3 allocation score on 18node3: 0
clone_color: FAKECLONE2:3 allocation score on 18node4: 0
clone_color: FAKECLONE2:3 allocation score on remote1: 0
-clone_color: FAKECLONE2:4 allocation score on 18builder: 0
clone_color: FAKECLONE2:4 allocation score on 18node1: 0
clone_color: FAKECLONE2:4 allocation score on 18node2: 0
clone_color: FAKECLONE2:4 allocation score on 18node3: 0
clone_color: FAKECLONE2:4 allocation score on 18node4: 0
clone_color: FAKECLONE2:4 allocation score on remote1: 0
-clone_color: FAKECLONE2:5 allocation score on 18builder: 0
-clone_color: FAKECLONE2:5 allocation score on 18node1: 0
-clone_color: FAKECLONE2:5 allocation score on 18node2: 0
-clone_color: FAKECLONE2:5 allocation score on 18node3: 0
-clone_color: FAKECLONE2:5 allocation score on 18node4: 0
-clone_color: FAKECLONE2:5 allocation score on remote1: 0
-native_color: FAKE1 allocation score on 18builder: 0
-native_color: FAKE1 allocation score on 18node1: 0
-native_color: FAKE1 allocation score on 18node2: 0
-native_color: FAKE1 allocation score on 18node3: 0
+group_color: FAKE6 allocation score on 18node1: 0
+group_color: FAKE6 allocation score on 18node2: 0
+group_color: FAKE6 allocation score on 18node3: -INFINITY
+group_color: FAKE6 allocation score on 18node4: -INFINITY
+group_color: FAKE6 allocation score on remote1: -INFINITY
+group_color: FAKE7 allocation score on 18node1: 0
+group_color: FAKE7 allocation score on 18node2: 0
+group_color: FAKE7 allocation score on 18node3: -INFINITY
+group_color: FAKE7 allocation score on 18node4: -INFINITY
+group_color: FAKE7 allocation score on remote1: -INFINITY
+group_color: FAKEGROUP allocation score on 18node1: 0
+group_color: FAKEGROUP allocation score on 18node2: 0
+group_color: FAKEGROUP allocation score on 18node3: -INFINITY
+group_color: FAKEGROUP allocation score on 18node4: -INFINITY
+group_color: FAKEGROUP allocation score on remote1: -INFINITY
+native_color: FAKE1 allocation score on 18node1: -INFINITY
+native_color: FAKE1 allocation score on 18node2: -INFINITY
+native_color: FAKE1 allocation score on 18node3: -INFINITY
native_color: FAKE1 allocation score on 18node4: 0
native_color: FAKE1 allocation score on remote1: -INFINITY
-native_color: FAKE2 allocation score on 18builder: 0
-native_color: FAKE2 allocation score on 18node1: 0
-native_color: FAKE2 allocation score on 18node2: -INFINITY
-native_color: FAKE2 allocation score on 18node3: 0
-native_color: FAKE2 allocation score on 18node4: 0
-native_color: FAKE2 allocation score on remote1: 0
-native_color: FAKE3 allocation score on 18builder: 0
-native_color: FAKE3 allocation score on 18node1: 0
-native_color: FAKE3 allocation score on 18node2: 0
+native_color: FAKE2 allocation score on 18node1: 10
+native_color: FAKE2 allocation score on 18node2: 100
+native_color: FAKE2 allocation score on 18node3: -INFINITY
+native_color: FAKE2 allocation score on 18node4: -INFINITY
+native_color: FAKE2 allocation score on remote1: -INFINITY
+native_color: FAKE3 allocation score on 18node1: -INFINITY
+native_color: FAKE3 allocation score on 18node2: -INFINITY
native_color: FAKE3 allocation score on 18node3: INFINITY
-native_color: FAKE3 allocation score on 18node4: 0
-native_color: FAKE3 allocation score on remote1: 0
-native_color: FAKE4 allocation score on 18builder: 0
-native_color: FAKE4 allocation score on 18node1: 0
-native_color: FAKE4 allocation score on 18node2: 0
-native_color: FAKE4 allocation score on 18node3: 0
+native_color: FAKE3 allocation score on 18node4: -INFINITY
+native_color: FAKE3 allocation score on remote1: -INFINITY
+native_color: FAKE4 allocation score on 18node1: -INFINITY
+native_color: FAKE4 allocation score on 18node2: -INFINITY
+native_color: FAKE4 allocation score on 18node3: -INFINITY
native_color: FAKE4 allocation score on 18node4: 0
-native_color: FAKE4 allocation score on remote1: 0
-native_color: FAKE5 allocation score on 18builder: 0
+native_color: FAKE4 allocation score on remote1: -INFINITY
native_color: FAKE5 allocation score on 18node1: 0
native_color: FAKE5 allocation score on 18node2: 0
native_color: FAKE5 allocation score on 18node3: 0
native_color: FAKE5 allocation score on 18node4: 0
native_color: FAKE5 allocation score on remote1: 0
-native_color: FAKECLONE1:0 allocation score on 18builder: 0
+native_color: FAKE6 allocation score on 18node1: 0
+native_color: FAKE6 allocation score on 18node2: 0
+native_color: FAKE6 allocation score on 18node3: -INFINITY
+native_color: FAKE6 allocation score on 18node4: -INFINITY
+native_color: FAKE6 allocation score on remote1: -INFINITY
+native_color: FAKE7 allocation score on 18node1: 0
+native_color: FAKE7 allocation score on 18node2: -INFINITY
+native_color: FAKE7 allocation score on 18node3: -INFINITY
+native_color: FAKE7 allocation score on 18node4: -INFINITY
+native_color: FAKE7 allocation score on remote1: -INFINITY
native_color: FAKECLONE1:0 allocation score on 18node1: 0
-native_color: FAKECLONE1:0 allocation score on 18node2: 0
-native_color: FAKECLONE1:0 allocation score on 18node3: 0
-native_color: FAKECLONE1:0 allocation score on 18node4: 0
+native_color: FAKECLONE1:0 allocation score on 18node2: -INFINITY
+native_color: FAKECLONE1:0 allocation score on 18node3: -INFINITY
+native_color: FAKECLONE1:0 allocation score on 18node4: -INFINITY
native_color: FAKECLONE1:0 allocation score on remote1: 0
-native_color: FAKECLONE1:1 allocation score on 18builder: -INFINITY
-native_color: FAKECLONE1:1 allocation score on 18node1: 0
-native_color: FAKECLONE1:1 allocation score on 18node2: 0
-native_color: FAKECLONE1:1 allocation score on 18node3: 0
-native_color: FAKECLONE1:1 allocation score on 18node4: 0
+native_color: FAKECLONE1:1 allocation score on 18node1: -INFINITY
+native_color: FAKECLONE1:1 allocation score on 18node2: -INFINITY
+native_color: FAKECLONE1:1 allocation score on 18node3: -INFINITY
+native_color: FAKECLONE1:1 allocation score on 18node4: -INFINITY
native_color: FAKECLONE1:1 allocation score on remote1: 0
-native_color: FAKECLONE1:2 allocation score on 18builder: -INFINITY
native_color: FAKECLONE1:2 allocation score on 18node1: -INFINITY
-native_color: FAKECLONE1:2 allocation score on 18node2: 0
-native_color: FAKECLONE1:2 allocation score on 18node3: 0
-native_color: FAKECLONE1:2 allocation score on 18node4: 0
-native_color: FAKECLONE1:2 allocation score on remote1: 0
-native_color: FAKECLONE1:3 allocation score on 18builder: -INFINITY
+native_color: FAKECLONE1:2 allocation score on 18node2: -INFINITY
+native_color: FAKECLONE1:2 allocation score on 18node3: -INFINITY
+native_color: FAKECLONE1:2 allocation score on 18node4: -INFINITY
+native_color: FAKECLONE1:2 allocation score on remote1: -INFINITY
native_color: FAKECLONE1:3 allocation score on 18node1: -INFINITY
native_color: FAKECLONE1:3 allocation score on 18node2: -INFINITY
-native_color: FAKECLONE1:3 allocation score on 18node3: 0
-native_color: FAKECLONE1:3 allocation score on 18node4: 0
-native_color: FAKECLONE1:3 allocation score on remote1: 0
-native_color: FAKECLONE1:4 allocation score on 18builder: -INFINITY
+native_color: FAKECLONE1:3 allocation score on 18node3: -INFINITY
+native_color: FAKECLONE1:3 allocation score on 18node4: -INFINITY
+native_color: FAKECLONE1:3 allocation score on remote1: -INFINITY
native_color: FAKECLONE1:4 allocation score on 18node1: -INFINITY
native_color: FAKECLONE1:4 allocation score on 18node2: -INFINITY
-native_color: FAKECLONE1:4 allocation score on 18node3: 0
+native_color: FAKECLONE1:4 allocation score on 18node3: -INFINITY
native_color: FAKECLONE1:4 allocation score on 18node4: -INFINITY
-native_color: FAKECLONE1:4 allocation score on remote1: 0
-native_color: FAKECLONE1:5 allocation score on 18builder: -INFINITY
-native_color: FAKECLONE1:5 allocation score on 18node1: -INFINITY
-native_color: FAKECLONE1:5 allocation score on 18node2: -INFINITY
-native_color: FAKECLONE1:5 allocation score on 18node3: 0
-native_color: FAKECLONE1:5 allocation score on 18node4: -INFINITY
-native_color: FAKECLONE1:5 allocation score on remote1: -INFINITY
-native_color: FAKECLONE2:0 allocation score on 18builder: 0
+native_color: FAKECLONE1:4 allocation score on remote1: -INFINITY
native_color: FAKECLONE2:0 allocation score on 18node1: 0
native_color: FAKECLONE2:0 allocation score on 18node2: 0
native_color: FAKECLONE2:0 allocation score on 18node3: 0
native_color: FAKECLONE2:0 allocation score on 18node4: 0
native_color: FAKECLONE2:0 allocation score on remote1: 0
-native_color: FAKECLONE2:1 allocation score on 18builder: -INFINITY
native_color: FAKECLONE2:1 allocation score on 18node1: 0
native_color: FAKECLONE2:1 allocation score on 18node2: 0
-native_color: FAKECLONE2:1 allocation score on 18node3: 0
+native_color: FAKECLONE2:1 allocation score on 18node3: -INFINITY
native_color: FAKECLONE2:1 allocation score on 18node4: 0
native_color: FAKECLONE2:1 allocation score on remote1: 0
-native_color: FAKECLONE2:2 allocation score on 18builder: -INFINITY
native_color: FAKECLONE2:2 allocation score on 18node1: -INFINITY
native_color: FAKECLONE2:2 allocation score on 18node2: 0
-native_color: FAKECLONE2:2 allocation score on 18node3: 0
+native_color: FAKECLONE2:2 allocation score on 18node3: -INFINITY
native_color: FAKECLONE2:2 allocation score on 18node4: 0
native_color: FAKECLONE2:2 allocation score on remote1: 0
-native_color: FAKECLONE2:3 allocation score on 18builder: -INFINITY
native_color: FAKECLONE2:3 allocation score on 18node1: -INFINITY
native_color: FAKECLONE2:3 allocation score on 18node2: -INFINITY
-native_color: FAKECLONE2:3 allocation score on 18node3: 0
+native_color: FAKECLONE2:3 allocation score on 18node3: -INFINITY
native_color: FAKECLONE2:3 allocation score on 18node4: 0
native_color: FAKECLONE2:3 allocation score on remote1: 0
-native_color: FAKECLONE2:4 allocation score on 18builder: -INFINITY
native_color: FAKECLONE2:4 allocation score on 18node1: -INFINITY
native_color: FAKECLONE2:4 allocation score on 18node2: -INFINITY
-native_color: FAKECLONE2:4 allocation score on 18node3: 0
+native_color: FAKECLONE2:4 allocation score on 18node3: -INFINITY
native_color: FAKECLONE2:4 allocation score on 18node4: -INFINITY
native_color: FAKECLONE2:4 allocation score on remote1: 0
-native_color: FAKECLONE2:5 allocation score on 18builder: -INFINITY
-native_color: FAKECLONE2:5 allocation score on 18node1: -INFINITY
-native_color: FAKECLONE2:5 allocation score on 18node2: -INFINITY
-native_color: FAKECLONE2:5 allocation score on 18node3: 0
-native_color: FAKECLONE2:5 allocation score on 18node4: -INFINITY
-native_color: FAKECLONE2:5 allocation score on remote1: -INFINITY
-native_color: remote1 allocation score on 18builder: 0
native_color: remote1 allocation score on 18node1: 0
native_color: remote1 allocation score on 18node2: 0
native_color: remote1 allocation score on 18node3: 0
native_color: remote1 allocation score on 18node4: 0
native_color: remote1 allocation score on remote1: -INFINITY
-native_color: shooter allocation score on 18builder: 0
native_color: shooter allocation score on 18node1: 0
native_color: shooter allocation score on 18node2: 0
native_color: shooter allocation score on 18node3: 0
native_color: shooter allocation score on 18node4: 0
native_color: shooter allocation score on remote1: -INFINITY
diff --git a/pengine/test10/resource-discovery.summary b/pengine/test10/resource-discovery.summary
index af0e5b3e70..e3d23a53c3 100644
--- a/pengine/test10/resource-discovery.summary
+++ b/pengine/test10/resource-discovery.summary
@@ -1,124 +1,128 @@
Current cluster status:
-Online: [ 18builder 18node1 18node2 18node3 18node4 ]
+Online: [ 18node1 18node2 18node3 18node4 ]
RemoteOFFLINE: [ remote1 ]
- shooter (stonith:fence_xvm): Started 18node1
+ shooter (stonith:fence_xvm): Stopped
remote1 (ocf::pacemaker:remote): Stopped
FAKE1 (ocf::heartbeat:Dummy): Stopped
- FAKE2 (ocf::heartbeat:Dummy): Started 18node2
- FAKE3 (ocf::heartbeat:Dummy): Started 18builder
- FAKE4 (ocf::heartbeat:Dummy): Started 18node1
+ FAKE2 (ocf::heartbeat:Dummy): Stopped
+ FAKE3 (ocf::heartbeat:Dummy): Stopped
+ FAKE4 (ocf::heartbeat:Dummy): Stopped
FAKE5 (ocf::heartbeat:Dummy): Stopped
Clone Set: FAKECLONE1-clone [FAKECLONE1]
- Stopped: [ 18builder 18node1 18node2 18node3 18node4 remote1 ]
+ Stopped: [ 18node1 18node2 18node3 18node4 remote1 ]
Clone Set: FAKECLONE2-clone [FAKECLONE2]
- Stopped: [ 18builder 18node1 18node2 18node3 18node4 remote1 ]
+ Stopped: [ 18node1 18node2 18node3 18node4 remote1 ]
+ Resource Group: FAKEGROUP
+ FAKE6 (ocf::heartbeat:Dummy): Stopped
+ FAKE7 (ocf::heartbeat:Dummy): Stopped
Transition Summary:
- * Start remote1 (18builder)
- * Start FAKE1 (18node2)
- * Move FAKE2 (Started 18node2 -> 18node3)
- * Move FAKE3 (Started 18builder -> 18node3)
- * Move FAKE4 (Started 18node1 -> 18node4)
+ * Start shooter (18node2)
+ * Start remote1 (18node1)
+ * Start FAKE1 (18node4)
+ * Start FAKE2 (18node2)
+ * Start FAKE3 (18node3)
+ * Start FAKE4 (18node4)
* Start FAKE5 (remote1)
- * Start FAKECLONE1:0 (18builder)
- * Start FAKECLONE1:1 (18node1)
- * Start FAKECLONE1:2 (18node2)
- * Start FAKECLONE1:3 (18node4)
- * Start FAKECLONE1:4 (remote1)
- * Start FAKECLONE1:5 (18node3)
- * Start FAKECLONE2:0 (18builder)
+ * Start FAKECLONE1:0 (18node1)
+ * Start FAKECLONE1:1 (remote1)
+ * Start FAKECLONE2:0 (18node3)
* Start FAKECLONE2:1 (18node1)
* Start FAKECLONE2:2 (18node2)
* Start FAKECLONE2:3 (18node4)
* Start FAKECLONE2:4 (remote1)
- * Start FAKECLONE2:5 (18node3)
+ * Start FAKE6 (18node1)
+ * Start FAKE7 (18node1)
Executing cluster transition:
* Resource action: shooter monitor on 18node4
* Resource action: shooter monitor on 18node3
+ * Resource action: shooter monitor on 18node2
+ * Resource action: shooter monitor on 18node1
* Resource action: remote1 monitor on 18node4
* Resource action: remote1 monitor on 18node3
+ * Resource action: remote1 monitor on 18node2
+ * Resource action: remote1 monitor on 18node1
* Resource action: FAKE1 monitor on 18node4
- * Resource action: FAKE1 monitor on 18node3
- * Resource action: FAKE1 monitor on 18node2
- * Resource action: FAKE1 monitor on 18node1
- * Resource action: FAKE1 monitor on 18builder
+ * Resource action: FAKE2 monitor on 18node2
+ * Resource action: FAKE2 monitor on 18node1
* Resource action: FAKE3 monitor on 18node3
* Resource action: FAKE4 monitor on 18node4
* Resource action: FAKE5 monitor on 18node4
* Resource action: FAKE5 monitor on 18node3
* Resource action: FAKE5 monitor on 18node2
* Resource action: FAKE5 monitor on 18node1
- * Resource action: FAKE5 monitor on 18builder
+ * Resource action: FAKECLONE1:0 monitor on 18node1
* Pseudo action: FAKECLONE1-clone_start_0
- * Resource action: FAKECLONE2:0 monitor on 18builder
+ * Resource action: FAKECLONE2:0 monitor on 18node3
* Resource action: FAKECLONE2:1 monitor on 18node1
* Resource action: FAKECLONE2:3 monitor on 18node4
- * Resource action: FAKECLONE2:5 monitor on 18node3
* Pseudo action: FAKECLONE2-clone_start_0
+ * Pseudo action: FAKEGROUP_start_0
+ * Resource action: FAKE6 monitor on 18node2
+ * Resource action: FAKE6 monitor on 18node1
+ * Resource action: FAKE7 monitor on 18node2
+ * Resource action: FAKE7 monitor on 18node1
* Pseudo action: probe_nodes_complete
- * Resource action: remote1 start on 18builder
+ * Resource action: remote1 start on 18node1
* Resource action: FAKE5 monitor on remote1
- * Resource action: FAKECLONE1:4 monitor on remote1
+ * Resource action: FAKECLONE1:1 monitor on remote1
* Resource action: FAKECLONE2:4 monitor on remote1
* Pseudo action: probe_complete
- * Resource action: remote1 monitor=60000 on 18builder
- * Resource action: FAKE1 start on 18node2
- * Resource action: FAKE2 stop on 18node2
- * Resource action: FAKE3 stop on 18builder
- * Resource action: FAKE4 stop on 18node1
+ * Resource action: shooter start on 18node2
+ * Resource action: remote1 monitor=60000 on 18node1
+ * Resource action: FAKE1 start on 18node4
+ * Resource action: FAKE2 start on 18node2
+ * Resource action: FAKE3 start on 18node3
+ * Resource action: FAKE4 start on 18node4
* Resource action: FAKE5 start on remote1
- * Resource action: FAKECLONE1:0 start on 18builder
- * Resource action: FAKECLONE1:1 start on 18node1
- * Resource action: FAKECLONE1:2 start on 18node2
- * Resource action: FAKECLONE1:3 start on 18node4
- * Resource action: FAKECLONE1:4 start on remote1
- * Resource action: FAKECLONE1:5 start on 18node3
+ * Resource action: FAKECLONE1:0 start on 18node1
+ * Resource action: FAKECLONE1:1 start on remote1
* Pseudo action: FAKECLONE1-clone_running_0
- * Resource action: FAKECLONE2:0 start on 18builder
+ * Resource action: FAKECLONE2:0 start on 18node3
* Resource action: FAKECLONE2:1 start on 18node1
* Resource action: FAKECLONE2:2 start on 18node2
* Resource action: FAKECLONE2:3 start on 18node4
* Resource action: FAKECLONE2:4 start on remote1
- * Resource action: FAKECLONE2:5 start on 18node3
* Pseudo action: FAKECLONE2-clone_running_0
- * Pseudo action: all_stopped
- * Resource action: FAKE1 monitor=60000 on 18node2
- * Resource action: FAKE2 start on 18node3
- * Resource action: FAKE3 start on 18node3
- * Resource action: FAKE4 start on 18node4
+ * Resource action: FAKE6 start on 18node1
+ * Resource action: FAKE7 start on 18node1
+ * Resource action: shooter monitor=60000 on 18node2
+ * Resource action: FAKE1 monitor=60000 on 18node4
+ * Resource action: FAKE2 monitor=60000 on 18node2
+ * Resource action: FAKE3 monitor=60000 on 18node3
+ * Resource action: FAKE4 monitor=60000 on 18node4
* Resource action: FAKE5 monitor=60000 on remote1
- * Resource action: FAKECLONE1:0 monitor=60000 on 18builder
- * Resource action: FAKECLONE1:1 monitor=60000 on 18node1
- * Resource action: FAKECLONE1:2 monitor=60000 on 18node2
- * Resource action: FAKECLONE1:3 monitor=60000 on 18node4
- * Resource action: FAKECLONE1:4 monitor=60000 on remote1
- * Resource action: FAKECLONE1:5 monitor=60000 on 18node3
- * Resource action: FAKECLONE2:0 monitor=60000 on 18builder
+ * Resource action: FAKECLONE1:0 monitor=60000 on 18node1
+ * Resource action: FAKECLONE1:1 monitor=60000 on remote1
+ * Resource action: FAKECLONE2:0 monitor=60000 on 18node3
* Resource action: FAKECLONE2:1 monitor=60000 on 18node1
* Resource action: FAKECLONE2:2 monitor=60000 on 18node2
* Resource action: FAKECLONE2:3 monitor=60000 on 18node4
* Resource action: FAKECLONE2:4 monitor=60000 on remote1
- * Resource action: FAKECLONE2:5 monitor=60000 on 18node3
- * Resource action: FAKE2 monitor=60000 on 18node3
- * Resource action: FAKE3 monitor=60000 on 18node3
- * Resource action: FAKE4 monitor=60000 on 18node4
+ * Pseudo action: FAKEGROUP_running_0
+ * Resource action: FAKE6 monitor=10000 on 18node1
+ * Resource action: FAKE7 monitor=10000 on 18node1
Revised cluster status:
-Online: [ 18builder 18node1 18node2 18node3 18node4 ]
+Online: [ 18node1 18node2 18node3 18node4 ]
RemoteOnline: [ remote1 ]
- shooter (stonith:fence_xvm): Started 18node1
- remote1 (ocf::pacemaker:remote): Started 18builder
- FAKE1 (ocf::heartbeat:Dummy): Started 18node2
- FAKE2 (ocf::heartbeat:Dummy): Started 18node3
+ shooter (stonith:fence_xvm): Started 18node2
+ remote1 (ocf::pacemaker:remote): Started 18node1
+ FAKE1 (ocf::heartbeat:Dummy): Started 18node4
+ FAKE2 (ocf::heartbeat:Dummy): Started 18node2
FAKE3 (ocf::heartbeat:Dummy): Started 18node3
FAKE4 (ocf::heartbeat:Dummy): Started 18node4
FAKE5 (ocf::heartbeat:Dummy): Started remote1
Clone Set: FAKECLONE1-clone [FAKECLONE1]
- Started: [ 18builder 18node1 18node2 18node3 18node4 remote1 ]
+ Started: [ 18node1 remote1 ]
+ Stopped: [ 18node2 18node3 18node4 ]
Clone Set: FAKECLONE2-clone [FAKECLONE2]
- Started: [ 18builder 18node1 18node2 18node3 18node4 remote1 ]
+ Started: [ 18node1 18node2 18node3 18node4 remote1 ]
+ Resource Group: FAKEGROUP
+ FAKE6 (ocf::heartbeat:Dummy): Started 18node1
+ FAKE7 (ocf::heartbeat:Dummy): Started 18node1
diff --git a/pengine/test10/resource-discovery.xml b/pengine/test10/resource-discovery.xml
index 5836804b8a..8b517df783 100644
--- a/pengine/test10/resource-discovery.xml
+++ b/pengine/test10/resource-discovery.xml
@@ -1,185 +1,143 @@
-
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+