diff --git a/pengine/test10/bnc-515172.dot b/pengine/test10/bnc-515172.dot index 1326addf58..8681a2a35b 100644 --- a/pengine/test10/bnc-515172.dot +++ b/pengine/test10/bnc-515172.dot @@ -1,13 +1,10 @@ digraph "g" { "GRP_Web_Server_running_0" [ style=bold color="green" fontcolor="orange" ] "GRP_Web_Server_start_0" -> "GRP_Web_Server_running_0" [ style = bold] "GRP_Web_Server_start_0" -> "PRIM_Web_IP1_start_0 sles11-ha2" [ style = bold] "GRP_Web_Server_start_0" [ style=bold color="green" fontcolor="orange" ] -"PRIM_Web_IP1_clear_failcount sles11-ha1" [ style=bold color="green" fontcolor="black" ] -"PRIM_Web_IP1_clear_failcount sles11-ha2" [ style=bold color="green" fontcolor="black" ] -"PRIM_Web_IP1_clear_failcount sles11-ha3" [ style=bold color="green" fontcolor="black" ] "PRIM_Web_IP1_monitor_5000 sles11-ha2" [ style=bold color="green" fontcolor="black" ] "PRIM_Web_IP1_start_0 sles11-ha2" -> "GRP_Web_Server_running_0" [ style = bold] "PRIM_Web_IP1_start_0 sles11-ha2" -> "PRIM_Web_IP1_monitor_5000 sles11-ha2" [ style = bold] "PRIM_Web_IP1_start_0 sles11-ha2" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/bnc-515172.exp b/pengine/test10/bnc-515172.exp index 16e3165b2b..8c2080ff63 100644 --- a/pengine/test10/bnc-515172.exp +++ b/pengine/test10/bnc-515172.exp @@ -1,79 +1,52 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + diff --git a/pengine/test10/bug-lf-2106.dot b/pengine/test10/bug-lf-2106.dot index c0fe35fa4e..be9272971c 100644 --- a/pengine/test10/bug-lf-2106.dot +++ b/pengine/test10/bug-lf-2106.dot @@ -1,65 +1,33 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] -"apcstonith_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ] -"apcstonith_clear_failcount cl-virt-2" [ style=bold color="green" fontcolor="black" ] -"bugtrack_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ] -"bugtrack_clear_failcount cl-virt-2" [ style=bold color="green" fontcolor="black" ] -"drbd-bugtrack:0_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ] -"drbd-bugtrack:1_clear_failcount cl-virt-2" [ style=bold color="green" fontcolor="black" ] -"drbd-infotos:0_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ] -"drbd-infotos:1_clear_failcount cl-virt-2" [ style=bold color="green" fontcolor="black" ] -"drbd-itwiki:0_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ] -"drbd-itwiki:1_clear_failcount cl-virt-2" [ style=bold color="green" fontcolor="black" ] -"drbd-medomus-cvs:0_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ] -"drbd-medomus-cvs:1_clear_failcount cl-virt-2" [ style=bold color="green" fontcolor="black" ] -"drbd-servsyslog:0_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ] -"drbd-servsyslog:1_clear_failcount cl-virt-2" [ style=bold color="green" fontcolor="black" ] -"drbd-smsprod2:0_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ] -"drbd-smsprod2:1_clear_failcount cl-virt-2" [ style=bold color="green" fontcolor="black" ] -"infotos_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ] -"infotos_clear_failcount cl-virt-2" [ style=bold color="green" fontcolor="black" ] -"itwiki_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ] -"itwiki_clear_failcount cl-virt-2" [ style=bold color="green" fontcolor="black" ] -"medomus-cvs_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ] -"medomus-cvs_clear_failcount cl-virt-2" [ style=bold color="green" fontcolor="black" ] "pingd:0_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ] "pingd:0_monitor_30000 cl-virt-1" [ style=bold color="green" fontcolor="black" ] "pingd:0_start_0 cl-virt-1" -> "pingd:0_monitor_30000 cl-virt-1" [ style = bold] "pingd:0_start_0 cl-virt-1" -> "pingdclone_running_0" [ style = bold] "pingd:0_start_0 cl-virt-1" [ style=bold color="green" fontcolor="black" ] "pingd:0_stop_0 cl-virt-1" -> "all_stopped" [ style = bold] "pingd:0_stop_0 cl-virt-1" -> "pingd:0_start_0 cl-virt-1" [ style = bold] "pingd:0_stop_0 cl-virt-1" -> "pingdclone_stopped_0" [ style = bold] "pingd:0_stop_0 cl-virt-1" [ style=bold color="green" fontcolor="black" ] "pingd:1_clear_failcount cl-virt-2" [ style=bold color="green" fontcolor="black" ] "pingd:1_monitor_30000 cl-virt-2" [ style=bold color="green" fontcolor="black" ] "pingd:1_start_0 cl-virt-2" -> "pingd:1_monitor_30000 cl-virt-2" [ style = bold] "pingd:1_start_0 cl-virt-2" -> "pingdclone_running_0" [ style = bold] "pingd:1_start_0 cl-virt-2" [ style=bold color="green" fontcolor="black" ] "pingd:1_stop_0 cl-virt-2" -> "all_stopped" [ style = bold] "pingd:1_stop_0 cl-virt-2" -> "pingd:1_start_0 cl-virt-2" [ style = bold] "pingd:1_stop_0 cl-virt-2" -> "pingdclone_stopped_0" [ style = bold] "pingd:1_stop_0 cl-virt-2" [ style=bold color="green" fontcolor="black" ] "pingdclone_running_0" [ style=bold color="green" fontcolor="orange" ] "pingdclone_start_0" -> "pingd:0_start_0 cl-virt-1" [ style = bold] "pingdclone_start_0" -> "pingd:1_start_0 cl-virt-2" [ style = bold] "pingdclone_start_0" -> "pingdclone_running_0" [ style = bold] "pingdclone_start_0" [ style=bold color="green" fontcolor="orange" ] "pingdclone_stop_0" -> "pingd:0_stop_0 cl-virt-1" [ style = bold] "pingdclone_stop_0" -> "pingd:1_stop_0 cl-virt-2" [ style = bold] "pingdclone_stop_0" -> "pingdclone_start_0" [ style = bold] "pingdclone_stop_0" -> "pingdclone_stopped_0" [ style = bold] "pingdclone_stop_0" [ style=bold color="green" fontcolor="orange" ] "pingdclone_stopped_0" -> "pingdclone_start_0" [ style = bold] "pingdclone_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"servsyslog_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ] -"servsyslog_clear_failcount cl-virt-2" [ style=bold color="green" fontcolor="black" ] -"smsprod2_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ] -"smsprod2_clear_failcount cl-virt-2" [ style=bold color="green" fontcolor="black" ] -"ssh-bin_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ] -"ssh-bin_clear_failcount cl-virt-2" [ style=bold color="green" fontcolor="black" ] -"ssh-ip1_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ] -"ssh-ip1_clear_failcount cl-virt-2" [ style=bold color="green" fontcolor="black" ] -"ssh-ip2_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ] -"ssh-ip2_clear_failcount cl-virt-2" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/bug-lf-2106.exp b/pengine/test10/bug-lf-2106.exp index 41e93ed226..8391827f6a 100644 --- a/pengine/test10/bug-lf-2106.exp +++ b/pengine/test10/bug-lf-2106.exp @@ -1,467 +1,179 @@ - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + diff --git a/pengine/test10/clone-anon-dup.dot b/pengine/test10/clone-anon-dup.dot index db32648a42..be1b0bea10 100644 --- a/pengine/test10/clone-anon-dup.dot +++ b/pengine/test10/clone-anon-dup.dot @@ -1,37 +1,31 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] -"apache2:0_clear_failcount wc01" [ style=bold color="green" fontcolor="black" ] -"apache2:2_clear_failcount wc02" [ style=bold color="green" fontcolor="black" ] "apache2:2_stop_0 wc02" -> "all_stopped" [ style = bold] "apache2:2_stop_0 wc02" -> "group_webservice:2_stopped_0" [ style = bold] "apache2:2_stop_0 wc02" [ style=bold color="green" fontcolor="black" ] -"apache2:3_clear_failcount wc03" [ style=bold color="green" fontcolor="black" ] "clone_webservice_stop_0" -> "clone_webservice_stopped_0" [ style = bold] "clone_webservice_stop_0" -> "group_webservice:2_stop_0" [ style = bold] "clone_webservice_stop_0" [ style=bold color="green" fontcolor="orange" ] "clone_webservice_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"fs_www:0_clear_failcount wc01" [ style=bold color="green" fontcolor="black" ] -"fs_www:0_clear_failcount wc02" [ style=bold color="green" fontcolor="black" ] -"fs_www:2_clear_failcount wc03" [ style=bold color="green" fontcolor="black" ] "group_webservice:2_stop_0" -> "apache2:2_stop_0 wc02" [ style = bold] "group_webservice:2_stop_0" -> "group_webservice:2_stopped_0" [ style = bold] "group_webservice:2_stop_0" [ style=bold color="green" fontcolor="orange" ] "group_webservice:2_stopped_0" -> "clone_webservice_stopped_0" [ style = bold] "group_webservice:2_stopped_0" [ style=bold color="green" fontcolor="orange" ] "probe_complete wc01" -> "probe_complete" [ style = bold] "probe_complete wc01" [ style=bold color="green" fontcolor="black" ] "probe_complete wc02" -> "probe_complete" [ style = bold] "probe_complete wc02" [ style=bold color="green" fontcolor="black" ] "probe_complete wc03" -> "probe_complete" [ style = bold] "probe_complete wc03" [ style=bold color="green" fontcolor="black" ] "probe_complete" -> "apache2:2_stop_0 wc02" [ style = bold] "probe_complete" -> "stonith-1_start_0 wc01" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "stonith-1_monitor_0 wc01" -> "probe_complete wc01" [ style = bold] "stonith-1_monitor_0 wc01" [ style=bold color="green" fontcolor="black" ] "stonith-1_monitor_0 wc02" -> "probe_complete wc02" [ style = bold] "stonith-1_monitor_0 wc02" [ style=bold color="green" fontcolor="black" ] "stonith-1_monitor_0 wc03" -> "probe_complete wc03" [ style = bold] "stonith-1_monitor_0 wc03" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 wc01" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/clone-anon-dup.exp b/pengine/test10/clone-anon-dup.exp index 178ae96bab..228c37d84c 100644 --- a/pengine/test10/clone-anon-dup.exp +++ b/pengine/test10/clone-anon-dup.exp @@ -1,229 +1,175 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + - + - + - + - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +