From 01ae059b018f473a0e640ba9aec4d73e782562b5 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 3 Feb 2012 19:22:56 +0000
Subject: [PATCH] Fix rvitals energy when used on a system without metered or
 estimated AC draw

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11471 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/ipmi.pm | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index 4408b7c21..c9665eb4e 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -3812,6 +3812,18 @@ sub readenergy_withiem {
 }
 sub got_ac_energy {
     my $sessdata = shift;
+    if ($sessdata->{abortediem}) {
+	$sessdata->{abortediem}=0;
+#        $sessdata->{iemtextdata} = "AC Energy Usage: ";
+#        if ($sessdata->{abortediemreason}) {
+#             $sessdata->{iemtextdata} .= $sessdata->{abortediemreason};
+#         }
+#        xCAT::SvrUtils::sendmsg($sessdata->{iemtextdata},$callback,$sessdata->{node},%allerrornodes);
+    	$sessdata->{iem}->prep_get_dc_energy();
+        $sessdata->{iemcallback} = \&got_dc_energy;
+        process_data_from_iem($sessdata);
+	return;
+    }
     $sessdata->{iem}->prep_get_precision();
     $sessdata->{iemcallback} = \&got_ac_energy_with_precision;
     execute_iem_commands($sessdata); #this gets all precision data initialized
@@ -3847,11 +3859,19 @@ sub execute_iem_commands {
     }
 }
 sub executed_iem_command {
-    if (check_rsp_errors(@_)) {
+    my $rsp = $_[0];
+    my $sessdata = $_[1];
+    if ($rsp->{code} == 0xcb) {
+	$sessdata->{abortediem}=1;
+	$sessdata->{abortediemreason}="Not Present";
+	$sessdata->{iemcallback}->($sessdata);
+        return;	
+    }
+    if (check_rsp_errors(@_)) { #error while in an IEM transaction, skip to the end
+	$sessdata->{abortediem}=1;
+	$sessdata->{iemcallback}->($sessdata);
         return;
     }
-    my $rsp = shift;
-    my $sessdata = shift;
     my @returnd = ($rsp->{code},@{$rsp->{data}});
     $sessdata->{iem}->handle_next_payload(@returnd);
     execute_iem_commands($sessdata);