From 18b6398c64dfd99f244f58ef49928445b450fdc3 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 23 Jan 2020 08:44:17 -0500 Subject: [PATCH] Fix XCC discovery issues A couple of issues could occur during discover that should be stepped over. --- confluent_server/confluent/discovery/handlers/xcc.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/confluent_server/confluent/discovery/handlers/xcc.py b/confluent_server/confluent/discovery/handlers/xcc.py index d09b84bf..8f357acf 100644 --- a/confluent_server/confluent/discovery/handlers/xcc.py +++ b/confluent_server/confluent/discovery/handlers/xcc.py @@ -15,6 +15,7 @@ import base64 import codecs import confluent.discovery.handlers.imm as immhandler +import confluent.exceptions as exc import confluent.netutil as netutil import confluent.util as util import errno @@ -95,7 +96,8 @@ class NodeHandler(immhandler.NodeHandler): ipmicmd.xraw_command(netfn=0x3a, command=0xf1, data=(1,)) except pygexc.IpmiException as e: if (e.ipmicode != 193 and 'Unauthorized name' not in str(e) and - 'Incorrect password' not in str(e)): + 'Incorrect password' not in str(e) and + str(e) != 'Session no longer connected'): # raise an issue if anything other than to be expected if disableipmi: _, _ = wc.grab_json_response_with_status(