From f99e7697dcb0cf8ddebd518dcf2ab83e643f6080 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Wed, 25 Nov 2015 01:20:34 -0500
Subject: [PATCH] fix issue 462: The result of "rvitals wattage" is not right
 on firestone and habanero

---
 xCAT-server/lib/xcat/plugins/ipmi.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index caf625a35..5d77b7a35 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -5780,7 +5780,7 @@ sub vitals {
 		$sensor_filters{0x02}=1;
 	}
     if(grep /watt/,@textfilters) {
-        $sensor_filters{0x03}=1;
+        $sensor_filters{watt}=1;
     }
 	if(grep /fan/,@textfilters) {
 		$sensor_filters{0x04}=1;
@@ -5816,6 +5816,9 @@ sub vitals {
 				my $lformat = $format;
                 push @{$sessdata->{sensorstoread}},$sdr;
                 $usedkeys{$key}=1;
+            } elsif ($filter eq "watt" and $sdr->sensor_units_2 and $sdr->sensor_units_2==0x06) {
+                push @{$sessdata->{sensorstoread}},$sdr;
+                $usedkeys{$key}=1;
             }
 		}
 	}