power: Use `Combined' as Name for PDU+ILOM approach

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 886e95d4a39923cf4111e0750fa6a8e459b6307e..fb14c4b3994b294cb24b7f722fe69388aa3208dd 100644 (file)
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -938,9 +938,10 @@ sub power_cycle_host_setup ($) {
     # $ho->{PowerApproaches}[]{Name}        see below
     # $ho->{PowerApproaches}[]{MethObjs}[]  each has ->pdu_power_state($on)
     # `Name's are:
-    #    Only   Host only supports one method and this is it
-    #    ILOM   Try to use just the ILOM
-    #    PDU    Try to use the PDU (but also turn off/on ILOM if provided)
+    #    Only     Host only supports one method and this is it
+    #    ILOM     Try to use just the ILOM
+    #    PDU      Try to use the PDU (no ILOM provided)
+    #    Combined Try to use the PDU and ILOM tohether
     my @approaches;
     my $pdu_s = get_host_property($ho,'PowerPDU');
     my $ilom_s = get_host_property($ho,'PowerILOM');
@@ -955,8 +956,10 @@ sub power_cycle_host_setup ($) {
        }
        if ($pdu_s) {
            my $pdu_m = power_cycle_parse_method($ho, $pdu_s);
+           my $pdu_name = 'PDU';
            if ($ilom_m) {
                require Osstest::PDU::try_off;
+               $pdu_name = 'Combined';
                $pdu_m = [
                    @$pdu_m,
                    get_host_method_object($ho, 'PDU', 'pause'),
@@ -964,7 +967,7 @@ sub power_cycle_host_setup ($) {
                ];
            }
            push @approaches, {
-               Name => 'PDU',
+               Name => $pdu_name,
                MethObjs => ['nest', @$pdu_m ],
            };
        }

diff --git a/mg-hosts b/mg-hosts
index 2edf12164ea248238ab4dff170e8f0f90eafecb4..58b4acc39f14941550fe58253cd45751230132a7 100755 (executable)
--- a/mg-hosts
+++ b/mg-hosts
@@ -31,7 +31,7 @@
 #                "1" or "off"   : power off
 #                "c" or "r"     : reboot
 #               APPROACH_RE is a regexp specifying which method to
-#               use.  Methods are:  Only ILOM PDU SSH
+#               use.  Methods are:  Only Combined ILOM PDU SSH
 #               and the lightest method which matches will be used.
 #               If not specified, the most reliable method will be used.
 #