# HG changeset patch # User Yan Gao # Date 1260434891 -28800 # Node ID c8013f5b53f018eb5ca2667e0170810e45257489 # Parent 456f25dc72b805e12e5dc32fb23ea8dbe5b8103c Low: PE: Add regression tests for the new placement strategies diff -r 456f25dc72b8 -r c8013f5b53f0 pengine/regression.sh --- a/pengine/regression.sh Thu Dec 10 12:37:46 2009 +0800 +++ b/pengine/regression.sh Thu Dec 10 16:48:11 2009 +0800 @@ -328,5 +328,10 @@ do_test systemhealthp3 "System Health (Progessive) #3" echo "" +do_test utilization "Placement Strategy - utilization" +do_test minimal "Placement Strategy - minimal" +do_test balanced "Placement Strategy - balanced" + +echo "" test_results diff -r 456f25dc72b8 -r c8013f5b53f0 pengine/test10/balanced.dot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pengine/test10/balanced.dot Thu Dec 10 16:48:11 2009 +0800 @@ -0,0 +1,19 @@ +digraph "g" { +"probe_complete host1" -> "probe_complete" [ style = bold] +"probe_complete host1" [ style=bold color="green" fontcolor="black" ] +"probe_complete host2" -> "probe_complete" [ style = bold] +"probe_complete host2" [ style=bold color="green" fontcolor="black" ] +"probe_complete" -> "rsc1_start_0 host2" [ style = bold] +"probe_complete" -> "rsc2_start_0 host1" [ style = bold] +"probe_complete" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 host1" -> "probe_complete host1" [ style = bold] +"rsc1_monitor_0 host1" [ style=bold color="green" fontcolor="black" ] +"rsc1_monitor_0 host2" -> "probe_complete host2" [ style = bold] +"rsc1_monitor_0 host2" [ style=bold color="green" fontcolor="black" ] +"rsc1_start_0 host2" [ style=bold color="green" fontcolor="black" ] +"rsc2_monitor_0 host1" -> "probe_complete host1" [ style = bold] +"rsc2_monitor_0 host1" [ style=bold color="green" fontcolor="black" ] +"rsc2_monitor_0 host2" -> "probe_complete host2" [ style = bold] +"rsc2_monitor_0 host2" [ style=bold color="green" fontcolor="black" ] +"rsc2_start_0 host1" [ style=bold color="green" fontcolor="black" ] +} diff -r 456f25dc72b8 -r c8013f5b53f0 pengine/test10/balanced.exp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pengine/test10/balanced.exp Thu Dec 10 16:48:11 2009 +0800 @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 456f25dc72b8 -r c8013f5b53f0 pengine/test10/balanced.score --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pengine/test10/balanced.score Thu Dec 10 16:48:11 2009 +0800 @@ -0,0 +1,5 @@ +Allocation scores: +native_color: rsc1 allocation score on host1: 0 +native_color: rsc1 allocation score on host2: 0 +native_color: rsc2 allocation score on host1: 0 +native_color: rsc2 allocation score on host2: 0 diff -r 456f25dc72b8 -r c8013f5b53f0 pengine/test10/balanced.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pengine/test10/balanced.xml Thu Dec 10 16:48:11 2009 +0800 @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 456f25dc72b8 -r c8013f5b53f0 pengine/test10/minimal.dot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pengine/test10/minimal.dot Thu Dec 10 16:48:11 2009 +0800 @@ -0,0 +1,19 @@ +digraph "g" { +"probe_complete host1" -> "probe_complete" [ style = bold] +"probe_complete host1" [ style=bold color="green" fontcolor="black" ] +"probe_complete host2" -> "probe_complete" [ style = bold] +"probe_complete host2" [ style=bold color="green" fontcolor="black" ] +"probe_complete" -> "rsc1_start_0 host1" [ style = bold] +"probe_complete" -> "rsc2_start_0 host1" [ style = bold] +"probe_complete" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 host1" -> "probe_complete host1" [ style = bold] +"rsc1_monitor_0 host1" [ style=bold color="green" fontcolor="black" ] +"rsc1_monitor_0 host2" -> "probe_complete host2" [ style = bold] +"rsc1_monitor_0 host2" [ style=bold color="green" fontcolor="black" ] +"rsc1_start_0 host1" [ style=bold color="green" fontcolor="black" ] +"rsc2_monitor_0 host1" -> "probe_complete host1" [ style = bold] +"rsc2_monitor_0 host1" [ style=bold color="green" fontcolor="black" ] +"rsc2_monitor_0 host2" -> "probe_complete host2" [ style = bold] +"rsc2_monitor_0 host2" [ style=bold color="green" fontcolor="black" ] +"rsc2_start_0 host1" [ style=bold color="green" fontcolor="black" ] +} diff -r 456f25dc72b8 -r c8013f5b53f0 pengine/test10/minimal.exp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pengine/test10/minimal.exp Thu Dec 10 16:48:11 2009 +0800 @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 456f25dc72b8 -r c8013f5b53f0 pengine/test10/minimal.score --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pengine/test10/minimal.score Thu Dec 10 16:48:11 2009 +0800 @@ -0,0 +1,5 @@ +Allocation scores: +native_color: rsc1 allocation score on host1: 0 +native_color: rsc1 allocation score on host2: 0 +native_color: rsc2 allocation score on host1: 0 +native_color: rsc2 allocation score on host2: 0 diff -r 456f25dc72b8 -r c8013f5b53f0 pengine/test10/minimal.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pengine/test10/minimal.xml Thu Dec 10 16:48:11 2009 +0800 @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 456f25dc72b8 -r c8013f5b53f0 pengine/test10/utilization.dot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pengine/test10/utilization.dot Thu Dec 10 16:48:11 2009 +0800 @@ -0,0 +1,17 @@ +digraph "g" { +"probe_complete host1" -> "probe_complete" [ style = bold] +"probe_complete host1" [ style=bold color="green" fontcolor="black" ] +"probe_complete host2" -> "probe_complete" [ style = bold] +"probe_complete host2" [ style=bold color="green" fontcolor="black" ] +"probe_complete" -> "rsc2_start_0 host2" [ style = bold] +"probe_complete" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 host1" -> "probe_complete host1" [ style = bold] +"rsc1_monitor_0 host1" [ style=bold color="green" fontcolor="black" ] +"rsc1_monitor_0 host2" -> "probe_complete host2" [ style = bold] +"rsc1_monitor_0 host2" [ style=bold color="green" fontcolor="black" ] +"rsc2_monitor_0 host1" -> "probe_complete host1" [ style = bold] +"rsc2_monitor_0 host1" [ style=bold color="green" fontcolor="black" ] +"rsc2_monitor_0 host2" -> "probe_complete host2" [ style = bold] +"rsc2_monitor_0 host2" [ style=bold color="green" fontcolor="black" ] +"rsc2_start_0 host2" [ style=bold color="green" fontcolor="black" ] +} diff -r 456f25dc72b8 -r c8013f5b53f0 pengine/test10/utilization.exp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pengine/test10/utilization.exp Thu Dec 10 16:48:11 2009 +0800 @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 456f25dc72b8 -r c8013f5b53f0 pengine/test10/utilization.score --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pengine/test10/utilization.score Thu Dec 10 16:48:11 2009 +0800 @@ -0,0 +1,5 @@ +Allocation scores: +native_color: rsc2 allocation score on host1: 0 +native_color: rsc2 allocation score on host2: 0 +native_color: rsc1 allocation score on host1: 0 +native_color: rsc1 allocation score on host2: 0 diff -r 456f25dc72b8 -r c8013f5b53f0 pengine/test10/utilization.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pengine/test10/utilization.xml Thu Dec 10 16:48:11 2009 +0800 @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +