some improvements

Signed-off-by: Heiko Thiery <[email protected]>

Author: hthiery

pyipmi/__init__.py

@@ -35,6 +35,7 @@
 from . import msgs
 
 from .errors import IpmiTimeoutError, CompletionCodeError, RetryError
+from .logger import log
 from .msgs.registry import create_request_by_name
 from .session import Session
 from .utils import check_rsp_completion_code, is_string
@@ -213,6 +214,8 @@ def send_message(self, req, retry=3):
         req.requester = self.requester
         rsp = None
 
+        log().debug(f'>> Msg Req: {req}')
+
         while retry > 0:
             retry -= 1
             try:
@@ -224,6 +227,8 @@ def send_message(self, req, retry=3):
         else:
             raise RetryError()
 
+        log().debug(f'<< Msg Rsp: {rsp}')
+
         return rsp
 
     def send_message_with_name(self, name, *args, **kwargs):

pyipmi/interfaces/rmcp.py

@@ -22,20 +22,20 @@
 import random
 import threading
 from array import array
-from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+from cryptography.hazmat.primitives.ciphers import (algorithms, Cipher, modes)
 from queue import Queue
 
 from .. import Target
 from ..session import Session
 from ..msgs import (create_message, create_request_by_name, create_response_by_name,
                     encode_message, decode_message, constants)
 from ..messaging import ChannelAuthenticationCapabilities
-from ..errors import DecodingError, NotSupportedError, RetryError
+from ..errors import (DecodingError, NotSupportedError, RetryError)
 from ..logger import log
 from ..interfaces.ipmb import (IpmbHeaderReq, encode_ipmb_msg,
                                encode_bridged_message, decode_bridged_message,
                                rx_filter)
-from ..utils import (check_rsp_completion_code, py3_array_tobytes)
+from ..utils import check_rsp_completion_code
 
 
 CLASS_NORMAL_MSG = 0x00
@@ -300,7 +300,7 @@ def pack(self, sdu):
         else:
             raise NotSupportedError('authentication type %s' % auth_type)
 
-        pdu += py3_array_tobytes(array('B', [data_len]))
+        pdu += array('B', [data_len]).tobytes()
 
         if sdu is not None:
             pdu += sdu
@@ -410,11 +410,11 @@ def pack(self, sdu, payload_type):
                           )
 
         if sdu is None:
-            pdu += py3_array_tobytes(array('B', list(data_len.to_bytes(2, 'little'))))
+            pdu += array('B', list(data_len.to_bytes(2, 'little'))).tobytes()
             return pdu
 
         if self.session is None or self.session.is_encrypted is False:
-            pdu += py3_array_tobytes(array('B', list(data_len.to_bytes(2, 'little'))))
+            pdu += array('B', list(data_len.to_bytes(2, 'little'))).tobytes()
             pdu += sdu
             return pdu
 
@@ -443,7 +443,7 @@ def pack(self, sdu, payload_type):
         ct = encryptor.update(sdu) + encryptor.finalize()
 
         data_len = len(initialization_vector + ct)
-        pdu += py3_array_tobytes(array('B', list(data_len.to_bytes(2, 'little'))))
+        pdu += array('B', list(data_len.to_bytes(2, 'little'))).tobytes()
         pdu += initialization_vector + ct
 
         # Now add the Session trailer
@@ -610,12 +610,12 @@ def _receive_asf_msg(self, cls):
 
     def ping(self):
         ping = AsfPing()
-        self._send_asf_msg(ping)
-        self._receive_asf_msg(AsfPong)
+        with self.transaction_lock:
+            self._send_asf_msg(ping)
+            self._receive_asf_msg(AsfPong)
 
     def _get_channel_auth_cap(self, session):
         CHANNEL_NUMBER_FOR_THIS = 0xe
-        # get channel auth cap
         req = create_request_by_name('GetChannelAuthenticationCapabilities')
         req.target = self.host_target
         req.channel.number = CHANNEL_NUMBER_FOR_THIS
@@ -985,6 +985,10 @@ def establish_session(self, session):
         self._session = session
         log().debug("Session Opened")
 
+        if self.keep_alive_interval:
+            self._stop_keep_alive = call_repeatedly(
+                    self.keep_alive_interval, self._get_device_id)
+
     def _send_and_receive(self, target, lun, netfn, cmdid, payload):
         self._inc_sequence_number()
 

pyipmi/messaging.py

@@ -156,6 +156,7 @@ def _from_response(self, rsp):
             self.ipmi_1_5 = True
 
         for function in self._functions.keys():
+            print(rsp.support)
             if hasattr(rsp.support, function):
                 if getattr(rsp.support, function):
                     self.auth_types.append(function)

pyipmi/msgs/fru.py

@@ -33,6 +33,11 @@ class GetFruInventoryAreaInfoReq(Message):
         UnsignedInt('fru_id', 1, 0),
     )
 
+    def __str__(self):
+        s = super().__str__()
+        s = s + f'[fru_id={self.fru_id}]'
+        return s
+
 
 @register_message_class
 class GetFruInventoryAreaInfoRsp(Message):
@@ -57,6 +62,11 @@ class ReadFruDataReq(Message):
         UnsignedInt('count', 1),
     )
 
+    def __str__(self):
+        s = super().__str__()
+        s = s + f'[fru_id={self.fru_id}, offset={self.offset}, count={self.count}]'
+        return s
+
 
 @register_message_class
 class ReadFruDataRsp(Message):

pyipmi/msgs/message.py

@@ -353,7 +353,7 @@ def _set_field(self, name, value):
         # TODO walk along the properties..
 
     def __str__(self):
-        return '{} [netfn={}, cmd={}, grp={}]'.format(type(self).__name__, self.netfn, self.cmdid, self.group_extension)
+        return f'{type(self).__name__} [netfn={self.netfn}, cmd={self.cmdid}, grp={self.group_extension}]'
 
     def _create_fields(self):
         for field in self.__fields__:

pyipmi/session.py

@@ -169,7 +169,7 @@ def __str__(self):
         string += '  Host: %s:%s\n' % (self._rmcp_host, self._rmcp_port)
         string += '  Auth.: %s\n' % self.auth_type
         string += '  User: %s\n' % self._auth_username
-        string += '  Password: %s\n' % self._auth_password
+        string += '  Password: %s\n' % '*******'
         string += '\n'
         return string