From 110820e7b70472da43ddaeb452551e5b34d0da21 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Tue, 6 Mar 2018 15:52:53 -0500
Subject: [PATCH] Revert "Accommodate XCC firmware behavior"

This reverts commit 9baa1f5652e90c7d6e9de07260739ed8b3b5299b.
---
 confluent_server/confluent/discovery/core.py  |  7 +------
 .../confluent/discovery/handlers/xcc.py       | 19 +------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/confluent_server/confluent/discovery/core.py b/confluent_server/confluent/discovery/core.py
index 24562f2a..16e9a364 100644
--- a/confluent_server/confluent/discovery/core.py
+++ b/confluent_server/confluent/discovery/core.py
@@ -823,12 +823,7 @@ def eval_node(cfg, handler, info, nodename, manual=False):
         handler.probe()  # unicast interrogation as possible to get more data
         # switch concurrently
         # do some preconfig, for example, to bring a SMM online if applicable
-        errorstr = handler.preconfig()
-        if errorstr:
-            if manual:
-                raise exc.InvalidArgumentException(errorstr)
-            log.log({'error': errorstr})
-            return
+        handler.preconfig()
     except Exception as e:
         unknown_info[info['hwaddr']] = info
         info['discostatus'] = 'unidentified'
diff --git a/confluent_server/confluent/discovery/handlers/xcc.py b/confluent_server/confluent/discovery/handlers/xcc.py
index 253bb940..ad222489 100644
--- a/confluent_server/confluent/discovery/handlers/xcc.py
+++ b/confluent_server/confluent/discovery/handlers/xcc.py
@@ -22,24 +22,7 @@ class NodeHandler(immhandler.NodeHandler):
     devname = 'XCC'
 
     def preconfig(self):
-        ff = None
-        try:
-            ff = self.info['attributes']['enclosure-form-factor']
-        except KeyError:
-            try:
-                # an XCC should always have that set, this is sign of
-                # a bug, try to reset the BMC as a workaround
-                ipmicmd = self._get_ipmicmd()
-                ipmicmd.reset_bmc()
-                return "XCC with address {0} did not have attributes " \
-                       "declared, attempting to correct with " \
-                       "XCC reset".format(self.ipaddr)
-            except pygexc.IpmiException as e:
-                if (e.ipmicode != 193 and
-                        'Unauthorized name' not in str(e) and
-                        'Incorrect password' not in str(e)):
-                # raise an issue if anything other than to be expected
-                raise
+        ff = self.info.get('attributes', {}).get('enclosure-form-factor', '')
         if ff not in ('dense-computing', [u'dense-computing']):
             return
         # attempt to enable SMM