From 98a3f6fcdc764327a3ad3d168993d9b25c2d36a8 Mon Sep 17 00:00:00 2001
From: Jarrod Johnon <jjohnson2@lenovo.com>
Date: Thu, 22 Jan 2015 13:56:16 -0500
Subject: [PATCH] Relay target unreachable condition to client

If connectivity is lost in the midst of an interrogation,
relay the unreachable status to the client rather than
'Internal Error' that was occuring before.
---
 confluent_server/confluent/httpapi.py         |  1 +
 .../plugins/hardwaremanagement/ipmi.py        | 54 +++++++++++--------
 2 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/confluent_server/confluent/httpapi.py b/confluent_server/confluent/httpapi.py
index 3742f0e3..743fdce6 100644
--- a/confluent_server/confluent/httpapi.py
+++ b/confluent_server/confluent/httpapi.py
@@ -58,6 +58,7 @@ class RobustCookie(Cookie.SimpleCookie):
             # empty value if SimpleCookie rejects
             dict.__setitem__(self, K, Cookie.Morsel())
 
+
 def group_creation_resources():
     yield confluent.messages.Attributes(
         kv={'name': None}, desc="Name of the group").html() + '<br>'
diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
index 795e9aed..9cad83c8 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
@@ -312,26 +312,29 @@ class IpmiHandler(object):
 
 
     def read_sensors(self, sensorname):
-        if sensorname == 'all':
-            sensors = self.ipmicmd.get_sensor_descriptions()
-            readings = []
-            for sensor in filter(self.match_sensor, sensors):
-                try:
-                    reading = self.ipmicmd.get_sensor_reading(sensor['name'])
-                except pygexc.IpmiException as ie:
-                    if ie.ipmicode == 203:
-                        continue
-                    raise
-                readings.append(self._dict_sensor(reading))
-            yield msg.SensorReadings(readings, name=self.node)
-        else:
-            self.make_sensor_map()
-            if sensorname not in self.sensormap:
-                raise exc.NotFoundException('No such sensor')
-            reading = self.ipmicmd.get_sensor_reading(
-                self.sensormap[sensorname])
-            yield msg.SensorReadings([self._dict_sensor(reading)],
-                                     name=self.node)
+        try:
+            if sensorname == 'all':
+                sensors = self.ipmicmd.get_sensor_descriptions()
+                readings = []
+                for sensor in filter(self.match_sensor, sensors):
+                    try:
+                        reading = self.ipmicmd.get_sensor_reading(sensor['name'])
+                    except pygexc.IpmiException as ie:
+                        if ie.ipmicode == 203:
+                            continue
+                        raise
+                    readings.append(self._dict_sensor(reading))
+                yield msg.SensorReadings(readings, name=self.node)
+            else:
+                self.make_sensor_map()
+                if sensorname not in self.sensormap:
+                    raise exc.NotFoundException('No such sensor')
+                reading = self.ipmicmd.get_sensor_reading(
+                    self.sensormap[sensorname])
+                yield msg.SensorReadings([self._dict_sensor(reading)],
+                                         name=self.node)
+        except pygexc.IpmiException:
+            yield msg.ConfluentTargetTimeout(self.node)
 
     def handle_sensors(self):
         if self.element[-1] == '':
@@ -352,7 +355,10 @@ class IpmiHandler(object):
         return False
 
     def list_sensors(self):
-        sensors = self.ipmicmd.get_sensor_descriptions()
+        try:
+            sensors = self.ipmicmd.get_sensor_descriptions()
+        except pygexc.IpmiException:
+            yield msg.ConfluentTargetTimeout(self.node)
         yield msg.ChildCollection('all')
         for sensor in filter(self.match_sensor, sensors):
             yield msg.ChildCollection(simplify_name(sensor['name']))
@@ -378,7 +384,11 @@ class IpmiHandler(object):
 
     def health(self):
         if 'read' == self.op:
-            response = self.ipmicmd.get_health()
+            try:
+                response = self.ipmicmd.get_health()
+            except pygexc.IpmiException:
+                yield msg.ConfluentTargetTimeout(self.node)
+                return
             health = response['health']
             health = self._str_health(health)
             yield msg.HealthSummary(health, self.node)