From 8aaec27237e559b74d8831e19c17d9b2ee2198e8 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 11 Jun 2014 15:54:04 -0400 Subject: [PATCH] Try failing over to another syntax for wvid http call --- xCAT-server/lib/xcat/plugins/ipmi.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm index 68616de25..e5d2dd712 100644 --- a/xCAT-server/lib/xcat/plugins/ipmi.pm +++ b/xCAT-server/lib/xcat/plugins/ipmi.pm @@ -1192,6 +1192,12 @@ sub getrvidparms_imm2 { $response = $browser->request(GET $baseurl."designs/imm/viewer(".$sessdata->{ipmisession}->{bmc}.'@'.$httpport.'@'.$ip6mode.'@'.time().'@1@0@1@jnlp'.'@USERID@0@0@0@0'.')'); #arguments are host, then ipv6 or not, then timestamp, then whether to encrypte or not, singleusermode, finally 'notwin32' $jnlp = $response->content; + if ($jnlp =~ /Failed to parse ip format for request/) { + $response = $browser->request(GET $baseurl."designs/imm/viewer(".$sessdata->{ipmisession}->{bmc}.'@'.$httpport.'@'.$ip6mode.'@'.time().'@1@0@1@jnlp'.'@USERID@0@0@0@0@0'.')'); + #arguments are host, then ipv6 or not, then timestamp, then whether to encrypte or not, singleusermode, 'notwin32', and one more (unknown) + $jnlp = $response->content; + } + } $response = $browser->request(GET $baseurl."data/logout"); my $currnode = $sessdata->{node};