From 8dbcc804ed83bb93234f7306513518a031185614 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Tue, 10 May 2022 16:05:37 -0400
Subject: [PATCH] Pull outlets into the generic hierarchy

This will more easily facilitate adding pdus without dependent nodes.
---
 confluent_server/confluent/core.py                           | 5 +----
 confluent_server/confluent/plugins/hardwaremanagement/pdu.py | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/confluent_server/confluent/core.py b/confluent_server/confluent/core.py
index 690886c6..fe6c4be4 100644
--- a/confluent_server/confluent/core.py
+++ b/confluent_server/confluent/core.py
@@ -360,10 +360,6 @@ def _init_core():
                 {'pluginattrs': ['hardwaremanagement.method'],
                  'default': 'ipmi'}),
         },
-        '_pdu': {
-            'outlets': PluginCollection(
-                {'pluginattrs': ['hardwaremanagement.method']}),
-        },
         'shell': {
             # another special case similar to console
             'sessions': PluginCollection({
@@ -462,6 +458,7 @@ def _init_core():
                 'default': 'ipmi',
             }),
             'inlets': PluginCollection({'handler': 'pdu'}),
+            'outlets': PluginCollection({'pluginattrs': ['hardwaremanagement.method']}),
             'reseat':  PluginRoute({'handler': 'enclosure'}),
         },
         'sensors': {
diff --git a/confluent_server/confluent/plugins/hardwaremanagement/pdu.py b/confluent_server/confluent/plugins/hardwaremanagement/pdu.py
index a1e82e8e..e7570b4d 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/pdu.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/pdu.py
@@ -40,7 +40,7 @@ def retrieve(nodes, element, configmanager, inputdata):
                 pdu = outlets[node][pgroup]['pdu']
                 outlet = outlets[node][pgroup]['outlet']
                 for rsp in core.handle_path(
-                        '/nodes/{0}/_pdu/outlets/{1}'.format(pdu, outlet),
+                        '/nodes/{0}/power/outlets/{1}'.format(pdu, outlet),
                         'retrieve', configmanager):
                     yield msg.KeyValueData({pgroup: rsp.kvpairs['state']['value']}, node)