From 7419dbcf71f70eb874ff17dbba7774f3b001242a Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Fri, 28 Mar 2025 09:26:41 -0400
Subject: [PATCH] Fix unpatched imports of webclient

---
 confluent_server/confluent/networking/nxapi.py               | 5 +++--
 confluent_server/confluent/plugins/console/openbmc.py        | 2 +-
 .../confluent/plugins/hardwaremanagement/cooltera.py         | 2 +-
 .../confluent/plugins/hardwaremanagement/eatonpdu.py         | 3 ++-
 .../confluent/plugins/hardwaremanagement/enlogic.py          | 2 +-
 .../confluent/plugins/hardwaremanagement/geist.py            | 3 ++-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/confluent_server/confluent/networking/nxapi.py b/confluent_server/confluent/networking/nxapi.py
index c42a997c..19e841dd 100644
--- a/confluent_server/confluent/networking/nxapi.py
+++ b/confluent_server/confluent/networking/nxapi.py
@@ -1,8 +1,8 @@
 
-import pyghmi.util.webclient as webclient
 import confluent.util as util
 import time
-from pprint import pprint
+import eventlet
+webclient = eventlet.import_patched('pyghmi.util.webclient')
 
 _healthmap = {
     'normal': 'ok',
@@ -222,6 +222,7 @@ class NxApiClient:
 if __name__ == '__main__':
     import sys
     import os
+    from pprint import pprint
     myuser = os.environ['SWITCHUSER']
     mypass = os.environ['SWITCHPASS']
     na = NxApiClient(sys.argv[1], myuser, mypass, None)
diff --git a/confluent_server/confluent/plugins/console/openbmc.py b/confluent_server/confluent/plugins/console/openbmc.py
index e4b00bd3..56535c52 100644
--- a/confluent_server/confluent/plugins/console/openbmc.py
+++ b/confluent_server/confluent/plugins/console/openbmc.py
@@ -25,9 +25,9 @@ import confluent.log as log
 import confluent.util as util
 import pyghmi.exceptions as pygexc
 import pyghmi.redfish.command as rcmd
-import pyghmi.util.webclient as webclient
 import eventlet
 import eventlet.green.ssl as ssl
+webclient = eventlet.import_patched('pyghmi.util.webclient')
 try:
     websocket = eventlet.import_patched('websocket')
     wso = websocket.WebSocket
diff --git a/confluent_server/confluent/plugins/hardwaremanagement/cooltera.py b/confluent_server/confluent/plugins/hardwaremanagement/cooltera.py
index c6e4b070..80265878 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/cooltera.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/cooltera.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 from xml.etree.ElementTree import fromstring as rfromstring
-import pyghmi.util.webclient as wc
 import confluent.util as util
 import confluent.messages as msg
 import confluent.exceptions as exc
@@ -21,6 +20,7 @@ import eventlet.green.time as time
 import eventlet.green.socket as socket
 import eventlet.greenpool as greenpool
 import eventlet
+wc = eventlet.import_patched('pyghmi.util.webclient')
 try:
     import Cookie
     httplib = eventlet.import_patched('httplib')
diff --git a/confluent_server/confluent/plugins/hardwaremanagement/eatonpdu.py b/confluent_server/confluent/plugins/hardwaremanagement/eatonpdu.py
index 4c3d4654..5ef16311 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/eatonpdu.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/eatonpdu.py
@@ -18,13 +18,14 @@ import confluent.messages as msg
 import confluent.exceptions as exc
 import eventlet
 import eventlet.green.socket as socket
-import pyghmi.util.webclient as wc
+wc = eventlet.import_patched('pyghmi.util.webclient')
 import confluent.util as util
 import re
 import hashlib
 import json
 import time
 
+
 def simplify_name(name):
     return name.lower().replace(' ', '_').replace('/', '-').replace(
         '_-_', '-')
diff --git a/confluent_server/confluent/plugins/hardwaremanagement/enlogic.py b/confluent_server/confluent/plugins/hardwaremanagement/enlogic.py
index 196b79df..de9b13d5 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/enlogic.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/enlogic.py
@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import pyghmi.util.webclient as wc
 import confluent.util as util
 import confluent.messages as msg
 import confluent.exceptions as exc
 import eventlet.green.time as time
 import eventlet
 import eventlet.greenpool as greenpool
+wc = eventlet.import_patched('pyghmi.util.webclient')
 
 
 
diff --git a/confluent_server/confluent/plugins/hardwaremanagement/geist.py b/confluent_server/confluent/plugins/hardwaremanagement/geist.py
index 3f086115..f2e0418c 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/geist.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/geist.py
@@ -12,13 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import pyghmi.util.webclient as wc
+
 import confluent.util as util
 import confluent.messages as msg
 import confluent.exceptions as exc
 import eventlet.green.time as time
 import eventlet
 import eventlet.greenpool as greenpool
+wc = eventlet.import_patched('pyghmi.util.webclient')