From 8cf97833abecde89fc8180a0c16523e094ff851c Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 1 Feb 2023 13:09:40 -0500 Subject: [PATCH] Fixes for certificate directed discovery --- confluent_server/confluent/discovery/core.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/confluent_server/confluent/discovery/core.py b/confluent_server/confluent/discovery/core.py index b09bead8..aae203c5 100644 --- a/confluent_server/confluent/discovery/core.py +++ b/confluent_server/confluent/discovery/core.py @@ -1182,8 +1182,8 @@ def search_smms_by_cert(currsmm, cert, cfg): nl = list( cfg.filter_node_attributes('enclosure.bay={}'.format(bay), nl)) if len(nl) == 1: - return currsmm, port, nl[0] - return currsmm, port, None + return currsmm, bay, nl[0] + return currsmm, bay, None exnl = list(cfg.filter_node_attrubutes('enclosure.extends=' + currsmm)) if len(exnl) == 1: return search_smms_by_cert(exnl[0], cert, cfg) @@ -1228,7 +1228,7 @@ def eval_node(cfg, handler, info, nodename, manual=False): info['verfied'] = True info['enclosure.bay'] = match[1] if match[2]: - if not discover_node(cfg, handler, info, match[2]): + if not discover_node(cfg, handler, info, match[2], manual): pending_nodes[match[2]] = nodename return if 'enclosure.bay' not in info: