From c8931ae6e749e3f7f29bf3c94a5004b8c7aae64a Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 28 Jun 2019 16:01:26 -0400 Subject: [PATCH] Revert "Carry fix for null names to redfish" This reverts commit 8bbeeafa4932fd94aa6b4d518c5b7918b76259f6. --- .../confluent/plugins/hardwaremanagement/redfish.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/confluent_server/confluent/plugins/hardwaremanagement/redfish.py b/confluent_server/confluent/plugins/hardwaremanagement/redfish.py index f16f90d6..31ddce20 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/redfish.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/redfish.py @@ -830,8 +830,8 @@ class IpmiHandler(object): if newinf.get('information', None) and 'name' in newinf['information']: newinf = copy.deepcopy(newinf) del newinf['information']['name'] - if (fnmatch(newinf['name'], 'Adapter ??:??:??') or fnmatch( - newinf['name'], 'PCIeGen? x*') or not newinf['name']): + if (fnmatch(newinf['name'], 'Adapter ??:??:??') or + fnmatch(newinf['name'], 'PCIeGen? x*') or newinf['name'] == 'Adapter' or newinf['name'].startswith('slot_') or newinf['name'].startswith('ob_')):