Merge pull request redhat-cne#62 from jzding/hp

Lock dependence with sushy 4.0.0

Author: openshift-merge-robot

hw-event-proxy/cmd/main.go

@@ -219,10 +219,12 @@ func parseMessage(m redfish.EventRecord) (redfish.EventRecord, error) {
 	}
 
 	resp, err := client.Parse(context.Background(), req)
+	if resp.Message == "unknown" {
+		err = fmt.Errorf("unable to find message in Redfish Registries")
+	}
 	if err != nil {
 		return redfish.EventRecord{}, err
 	}
-
 	m.Message = resp.Message
 	m.Severity = resp.Severity
 	m.Resolution = resp.Resolution

message-parser/requirements.txt

@@ -1,3 +1,3 @@
 grpcio>=1.29.0
 protobuf>=3.17.3
-sushy>=3.8.0
+sushy==4.0.0

message-parser/server.py

@@ -11,6 +11,7 @@
 import sys
 from sushy import auth
 from sushy.resources import base
+from sushy.resources import constants
 from sushy.resources.registry import message_registry
 
 # disable InsecureRequestWarning: Unverified HTTPS request is being made to host
@@ -65,22 +66,28 @@ def __init__(self):
 
     def Parse(self, request, context):
         logging.debug('request message_id: %s', request.message_id)
-        logging.debug('request %d message_args', len(request.message_args))
-        for a in request.message_args:
-            logging.debug('found message arg %s', a)
 
         m = base.MessageListField('Message')
         m.message_id = request.message_id
         m.message_args = request.message_args
         m.severity = None
         m.resolution = None
+        m.message = None
 
-        message_registry.parse_message(self.registries, m)
-        resp = ParserResponse(message=m.message, severity=m.severity, resolution=m.resolution)
+        m_parsed = message_registry.parse_message(self.registries, m)
+
+        # Unable to find message for registry
+        if m_parsed.message == 'unknown':
+            m_parsed.severity = 'unknown'
+            m_parsed.resolution = 'unknown'
+
+        if isinstance(m_parsed.severity, constants.Health):
+            m_parsed.severity = m_parsed.severity.value
+
+        resp = ParserResponse(message=m_parsed.message, severity=m_parsed.severity, resolution=m_parsed.resolution)
         logging.debug('resp: %s', resp)
         return resp
 
-
 if __name__ == '__main__':
     l = os.environ.get('LOG_LEVEL', 'DEBUG')
     log_level= get_log_level(l)