cluster: STABLE2 - fence_mcdata: Fix unexpected port state

cluster: STABLE2 - fence_mcdata: Fix unexpected port state

[Jan Friesse]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=92f5bc5d34de47e2fdc45f847725578e3af399f9
Commit:        92f5bc5d34de47e2fdc45f847725578e3af399f9
Parent:        02a1c9e46bd6b8644dade2578d07a36856f9fed1
Author:        Jan Friesse <jfriesse@redhat.com>
AuthorDate:    Wed Mar 4 15:29:31 2009 +0100
Committer:     Jan Friesse <jfriesse@redhat.com>
CommitterDate: Wed Mar 4 15:30:50 2009 +0100

fence_mcdata: Fix unexpected port state

Current versions of fence_mcdata wait for "Blocked:
(true|false)", but newer models (like Sphereon 4500) return
"Blocked:  (Blocked|Unblocked)" on the port show command.

The attached patch adds the necessary bits to make the
script recognize that it has indeed done the request action.

This patch long lives in RHEL 4 branch, but never
arrived to RHEL5/master/STABLE2/STABLE3.

RHBZ#470983
---
 fence/agents/mcdata/fence_mcdata.pl |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/fence/agents/mcdata/fence_mcdata.pl b/fence/agents/mcdata/fence_mcdata.pl
index e16282b..0e8c268 100644
--- a/fence/agents/mcdata/fence_mcdata.pl
+++ b/fence/agents/mcdata/fence_mcdata.pl
@@ -256,7 +256,9 @@ foreach my $line (@lines)
    }
    next unless ( $field eq "Blocked" );
    if ( ($block && $b_state eq "true") ||
-        (!$block && $b_state eq "false") )
+        (!$block && $b_state eq "false") ||
+        ($block && $b_state eq "Blocked") ||
+        (!$block && $b_state eq "Unblocked") )
    {
       $fail = 0;
    }