From d553ab864bbcc3da82db8a316b825aa76b133014 Mon Sep 17 00:00:00 2001
From: tkucherera <tkucherera@lenovo.com>
Date: Thu, 12 Sep 2024 10:27:05 -0400
Subject: [PATCH] resolve merge conflicts

---
 confluent_server/confluent/core.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/confluent_server/confluent/core.py b/confluent_server/confluent/core.py
index 55456453..ec62c57d 100644
--- a/confluent_server/confluent/core.py
+++ b/confluent_server/confluent/core.py
@@ -70,6 +70,7 @@ import eventlet.green.socket as socket
 import struct
 import sys
 import uuid
+import yaml
 
 pluginmap = {}
 dispatch_plugins = (b'ipmi', u'ipmi', b'redfish', u'redfish', b'tsmsol', u'tsmsol', b'geist', u'geist', b'deltapdu', u'deltapdu', b'eatonpdu', u'eatonpdu', b'affluent', u'affluent', b'cnos', u'cnos')
@@ -160,7 +161,7 @@ def _merge_dict(original, custom):
 
 
 rootcollections = ['deployment/', 'discovery/', 'events/', 'networking/',
-                   'noderange/', 'nodes/', 'nodegroups/', 'usergroups/' ,
+                   'noderange/', 'nodes/', 'nodegroups/', 'storage/', 'usergroups/' ,
                    'users/', 'uuid', 'version', 'staging/']