python-ipmi 0.5.5__tar.gz → 0.5.8__tar.gz

{python-ipmi-0.5.5/python_ipmi.egg-info → python_ipmi-0.5.8}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-ipmi
-Version: 0.5.5
+Version: 0.5.8
 Summary: Pure python IPMI library
 Home-page: https://github.com/kontron/python-ipmi
-Download-URL: https://github.com/kontron/python-ipmi/tarball/0.5.5
+Download-URL: https://github.com/kontron/python-ipmi/tarball/0.5.8
 Author: Michael Walle, Heiko Thiery
 Author-email: michael.walle@kontron.com, heiko.thiery@kontron.com
 License: LGPLv2+
@@ -20,9 +20,20 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 License-File: COPYING
 License-File: AUTHORS
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: platform
+Dynamic: summary
 
 Pure Python IPMI Library
 ========================
@@ -105,6 +116,7 @@ Example with lan interface:
 
     connection.session.set_session_type_rmcp('10.0.0.1', port=623)
     connection.session.set_auth_type_user('admin', 'admin')
+    connection.session.set_priv_level("ADMINISTRATOR")
     connection.session.establish()
 
     connection.get_device_id()
@@ -113,7 +125,7 @@ ipmitool command:
 
 .. code:: shell
 
-    ipmitool -I lan -H 10.0.0.1 -p 623 -U "admin" -P "admin" -t 0x82 -b 0 -l 0 raw 0x06 0x01
+    ipmitool -I lan -H 10.0.0.1 -p 623 -L "ADMINISTRATOR" -U "admin" -P "admin" -t 0x82 -b 0 -l 0 raw 0x06 0x01
 
 
 Example with serial interface:

{python-ipmi-0.5.5 → python_ipmi-0.5.8}/README.rst

@@ -79,6 +79,7 @@ Example with lan interface:
 
     connection.session.set_session_type_rmcp('10.0.0.1', port=623)
     connection.session.set_auth_type_user('admin', 'admin')
+    connection.session.set_priv_level("ADMINISTRATOR")
     connection.session.establish()
 
     connection.get_device_id()
@@ -87,7 +88,7 @@ ipmitool command:
 
 .. code:: shell
 
-    ipmitool -I lan -H 10.0.0.1 -p 623 -U "admin" -P "admin" -t 0x82 -b 0 -l 0 raw 0x06 0x01
+    ipmitool -I lan -H 10.0.0.1 -p 623 -L "ADMINISTRATOR" -U "admin" -P "admin" -t 0x82 -b 0 -l 0 raw 0x06 0x01
 
 
 Example with serial interface:

{python-ipmi-0.5.5 → python_ipmi-0.5.8}/pyipmi/__init__.py

@@ -48,11 +48,7 @@ except ImportError:
 def create_connection(interface):
     session = Session()
     session.interface = interface
-    ipmi = Ipmi()
-    ipmi.interface = interface
-    ipmi.session = session
-    ipmi.requester = NullRequester()
-    return ipmi
+    return Ipmi(interface=interface, session=session)
 
 
 class Requester(object):
@@ -164,14 +160,41 @@ class Ipmi(bmc.Bmc, chassis.Chassis, dcmi.Dcmi, fru.Fru, picmg.Picmg, hpm.Hpm,
            sdr.Sdr, sensor.Sensor, event.Event, sel.Sel, lan.Lan,
            messaging.Messaging):
 
-    def __init__(self):
-        self._interface = None
-        self._session = None
-        self._target = None
+    def __init__(self, interface=None, target=None, session=Session(),
+                 requester=NullRequester()):
+        self._interface = interface
+
+        # we need a session, set if not passed
+        if session is None:
+            session = Session()
+        self._session = session
+        # session needs an interface
+        self._session.interface = interface
+
+        self._target = target
+        self.requester = requester
 
         for base in Ipmi.__bases__:
             base.__init__(self)
 
+    def __enter__(self):
+        self.open()
+        return self
+
+    def __exit__(self, exception_type, exception_value, traceback):
+        self.close()
+        return False
+
+    def open(self):
+        self.interface.open()
+        if self.session is not None:
+            self.session.establish()
+
+    def close(self):
+        if self.session is not None:
+            self.session.close()
+        self.interface.close()
+
     def is_ipmc_accessible(self):
         return self.interface.is_ipmc_accessible(self.target)
 

{python-ipmi-0.5.5 → python_ipmi-0.5.8}/pyipmi/bmc.py

@@ -24,6 +24,9 @@ class Bmc(object):
     def get_device_id(self):
         return DeviceId(self.send_message_with_name('GetDeviceId'))
 
+    def get_device_guid(self):
+        return DeviceGuid(self.send_message_with_name('GetDeviceGuid'))
+
     def cold_reset(self):
         self.send_message_with_name('ColdReset')
 
@@ -86,7 +89,7 @@ class Watchdog(State):
     TIMEOUT_ACTION_POWER_CYCLE = 3
 
     __properties__ = [
-        # (propery, description)
+        # (property, description)
         ('timer_use', ''),
         ('dont_stop', ''),
         ('is_running', ''),
@@ -121,6 +124,7 @@ class DeviceId(State):
         string += ' ipmi: %s' % self.ipmi_version
         string += ' manufacturer: %d' % self.manufacturer_id
         string += ' product: %d' % self.product_id
+        string += ' functions: %s' % ','.join(self.supported_functions)
         return string
 
     def supports_function(self, name):
@@ -164,3 +168,14 @@ class DeviceId(State):
         self.aux = None
         if rsp.auxiliary is not None:
             self.aux = list(rsp.auxiliary)
+
+
+class DeviceGuid(State):
+    def __str__(self):
+        return 'Device GUID: %s' % self.device_guid_string
+
+    def _from_response(self, rsp):
+        self.device_guid = rsp.device_guid
+        self.device_guid_string = \
+            '%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-' \
+            '%02x%02x%02x%02x%02x%02x' % tuple(reversed(self.device_guid))

{python-ipmi-0.5.5 → python_ipmi-0.5.8}/pyipmi/errors.py

@@ -69,7 +69,7 @@ class DescriptionError(Exception):
 
 
 class RetryError(Exception):
-    """Maxium number of retries exceeded."""
+    """Maximum number of retries exceeded."""
     pass
 
 
@@ -90,3 +90,21 @@ class IpmiConnectionError(Exception):
 
     def __str__(self):
         return "{}".format(self.msg)
+
+
+class IpmiLongPasswordError(Exception):
+    """Password longer than 20 bytes."""
+    def __init__(self, msg=None):
+        self.msg = msg
+
+    def __str__(self):
+        return "{}".format(self.msg)
+
+
+class AuthenticationError(Exception):
+    """Authentication error."""
+    def __init__(self, msg=None):
+        self.msg = msg
+
+    def __str__(self):
+        return "{}".format(self.msg)

{python-ipmi-0.5.5 → python_ipmi-0.5.8}/pyipmi/fields.py

@@ -64,7 +64,7 @@ def _unpack6bitascii(data):
 
 class TypeLengthString(object):
     """
-    This is the TYPE/LENGTH BYTE FORMAT field represenation according the
+    This is the TYPE/LENGTH BYTE FORMAT field representation according the
     Platform Management FRU Information Storage Definition v1.0.
 
     In addition the difference to the 'FRU Information Storage Definition' to

{python-ipmi-0.5.5 → python_ipmi-0.5.8}/pyipmi/fru.py

@@ -88,9 +88,9 @@ class Fru(object):
     def read_fru_data_full(self, fru_id=0):
         return self.read_fru_data(fru_id=fru_id)
 
-    def get_fru_inventory_header(self, fru_id=0):
+    def get_fru_inventory_header(self, fru_id=0, ignore_checksum=False):
         data = self.read_fru_data(offset=0, count=8, fru_id=fru_id)
-        return InventoryCommonHeader(data)
+        return InventoryCommonHeader(data, ignore_checksum=ignore_checksum)
 
     def _read_fru_area(self, offset, fru_id=0):
         # read the area header
@@ -99,26 +99,30 @@ class Fru(object):
         count = data[1] * 8
         return self.read_fru_data(offset=offset, count=count, fru_id=fru_id)
 
-    def get_fru_chassis_area(self, fru_id=0):
-        header = self.get_fru_inventory_header(fru_id=fru_id)
+    def get_fru_chassis_area(self, fru_id=0, ignore_checksum=False):
+        header = self.get_fru_inventory_header(fru_id=fru_id,
+                                               ignore_checksum=ignore_checksum)
         data = self._read_fru_area(offset=header.chassis_info_area_offset,
                                    fru_id=fru_id)
-        return InventoryChassisInfoArea(data)
+        return InventoryChassisInfoArea(data, ignore_checksum=ignore_checksum)
 
-    def get_fru_board_area(self, fru_id=0):
-        header = self.get_fru_inventory_header(fru_id=fru_id)
+    def get_fru_board_area(self, fru_id=0, ignore_checksum=False):
+        header = self.get_fru_inventory_header(fru_id=fru_id,
+                                               ignore_checksum=ignore_checksum)
         data = self._read_fru_area(offset=header.board_info_area_offset,
                                    fru_id=fru_id)
-        return InventoryBoardInfoArea(data)
+        return InventoryBoardInfoArea(data, ignore_checksum=ignore_checksum)
 
-    def get_fru_product_area(self, fru_id=0):
-        header = self.get_fru_inventory_header(fru_id=fru_id)
+    def get_fru_product_area(self, fru_id=0, ignore_checksum=False):
+        header = self.get_fru_inventory_header(fru_id=fru_id,
+                                               ignore_checksum=ignore_checksum)
         data = self._read_fru_area(offset=header.product_info_area_offset,
                                    fru_id=fru_id)
-        return InventoryProductInfoArea(data)
+        return InventoryProductInfoArea(data, ignore_checksum=ignore_checksum)
 
-    def get_fru_multirecord_area(self, fru_id=0):
-        header = self.get_fru_inventory_header(fru_id=fru_id)
+    def get_fru_multirecord_area(self, fru_id=0, ignore_checksum=False):
+        header = self.get_fru_inventory_header(fru_id=fru_id,
+                                               ignore_checksum=ignore_checksum)
 
         # we have to determine the length of the area first
         offset = header.multirecord_area_offset
@@ -137,31 +141,47 @@ class Fru(object):
         # now read the full area
         offset = header.multirecord_area_offset
         data = self.read_fru_data(offset=offset, count=count)
-        return InventoryMultiRecordArea(data)
+        return InventoryMultiRecordArea(data, ignore_checksum=ignore_checksum)
 
-    def get_fru_inventory(self, fru_id=0):
+    def get_fru_inventory(self, fru_id=0, ignore_checksum=False):
         """
         Get the full parsed FRU inventory data.
         """
         fru = FruInventory()
-        header = self.get_fru_inventory_header(fru_id=fru_id)
+
+        header = self.get_fru_inventory_header(
+            fru_id=fru_id,
+            ignore_checksum=ignore_checksum
+        )
 
         if header.chassis_info_area_offset:
-            fru.chassis_info_area = self.get_fru_chassis_area(fru_id=fru_id)
+            fru.chassis_info_area = self.get_fru_chassis_area(
+                fru_id=fru_id,
+                ignore_checksum=ignore_checksum
+            )
 
         if header.board_info_area_offset:
-            fru.board_info_area = self.get_fru_board_area(fru_id=fru_id)
+            fru.board_info_area = self.get_fru_board_area(
+                fru_id=fru_id,
+                ignore_checksum=ignore_checksum
+            )
 
         if header.product_info_area_offset:
-            fru.product_info_area = self.get_fru_product_area(fru_id=fru_id)
+            fru.product_info_area = self.get_fru_product_area(
+                fru_id=fru_id,
+                ignore_checksum=ignore_checksum
+            )
 
         if header.multirecord_area_offset:
-            fru.multirecord_area = self.get_fru_multirecord_area(fru_id=fru_id)
+            fru.multirecord_area = self.get_fru_multirecord_area(
+                fru_id=fru_id,
+                ignore_checksum=ignore_checksum
+            )
 
         return fru
 
 
-def get_fru_inventory_from_file(filename):
+def get_fru_inventory_from_file(filename, ignore_checksum=False):
     try:
         file = open(filename, "rb")
     except IOError:
@@ -173,7 +193,7 @@ def get_fru_inventory_from_file(filename):
     file_data = file.read(file_size)
     data = array.array('B', file_data)
     file.close()
-    return FruInventory(data)
+    return FruInventory(data, ignore_checksum=ignore_checksum)
 
 
 CUSTOM_FIELD_END = 0xc1
@@ -190,18 +210,18 @@ def _decode_custom_fields(data):
 
 
 class FruData(object):
-    def __init__(self, data=None):
+    def __init__(self, data=None, ignore_checksum=False):
         if data:
             if isinstance(data, str):
                 data = [ord(c) for c in data]
             self.data = data
             if hasattr(self, '_from_data'):
-                self._from_data(data)
+                self._from_data(data, ignore_checksum=ignore_checksum)
 
 
 class InventoryCommonHeader(FruData):
-    def _from_data(self, data):
-        if len(data) != 8:
+    def _from_data(self, data, ignore_checksum=False):
+        if len(data) < 8:
             raise DecodingError('InventoryCommonHeader length != 8')
         self.format_version = data[0] & 0x0f
         self.internal_use_area_offset = data[1] * 8 or None
@@ -209,18 +229,18 @@ class InventoryCommonHeader(FruData):
         self.board_info_area_offset = data[3] * 8 or None
         self.product_info_area_offset = data[4] * 8 or None
         self.multirecord_area_offset = data[5] * 8 or None
-        if sum(data) % 256 != 0:
-            raise DecodingError('InventoryCommonHeader checksum failed')
+        if sum(data[:8]) % 256 != 0 and ignore_checksum is False:
+            raise DecodingError(f'InventoryCommonHeader checksum failed {sum(data) % 0x10}')
 
 
 class CommonInfoArea(FruData):
-    def _from_data(self, data):
+    def _from_data(self, data, ignore_checksum=False):
         self.format_version = data[0] & 0x0f
         if self.format_version != 1:
             raise DecodingError('unsupported format version (%d)' %
                                 self.format_version)
         self.length = data[1] * 8
-        if sum(data[:self.length]) % 256 != 0:
+        if sum(data[:self.length]) % 256 != 0 and ignore_checksum is False:
             raise DecodingError('checksum failed')
 
 
@@ -249,7 +269,7 @@ class InventoryChassisInfoArea(CommonInfoArea):
     TYPE_RAID_CHASSIS = 22
     TYPE_RACK_MOUNT_CHASSIS = 23
 
-    def _from_data(self, data):
+    def _from_data(self, data, ignore_checksum=False):
         CommonInfoArea._from_data(self, data)
         self.type = data[2]
         offset = 3
@@ -261,8 +281,8 @@ class InventoryChassisInfoArea(CommonInfoArea):
 
 
 class InventoryBoardInfoArea(CommonInfoArea):
-    def _from_data(self, data):
-        CommonInfoArea._from_data(self, data)
+    def _from_data(self, data, ignore_checksum=False):
+        CommonInfoArea._from_data(self, data, ignore_checksum=ignore_checksum)
         self.language_code = data[2]
         minutes = data[5] << 16 | data[4] << 8 | data[3]
         self.mfg_date = (datetime.datetime(1996, 1, 1)
@@ -282,7 +302,7 @@ class InventoryBoardInfoArea(CommonInfoArea):
 
 
 class InventoryProductInfoArea(CommonInfoArea):
-    def _from_data(self, data):
+    def _from_data(self, data, ignore_checksum=False):
         CommonInfoArea._from_data(self, data)
         self.language_code = data[2]
         offset = 3
@@ -318,17 +338,17 @@ class FruDataMultiRecord(FruData):
         return '%02x: %s' % (self.record_type_id,
                              ' '.join('%02x' % b for b in self.raw))
 
-    def _from_data(self, data):
+    def _from_data(self, data, ignore_checksum=False):
         if len(data) < 5:
             raise DecodingError('data too short')
         self.record_type_id = data[0]
         self.format_version = data[1] & 0x0f
         self.end_of_list = bool(data[1] & 0x80)
         self.length = data[2]
-        if sum(data[:5]) % 256 != 0:
+        if sum(data[:5]) % 256 != 0 and ignore_checksum is False:
             raise DecodingError('FruDataMultiRecord header checksum failed')
         self.raw = data[5:5+self.length]
-        if (sum(self.raw) + data[3]) % 256 != 0:
+        if (sum(self.raw) + data[3]) % 256 != 0 and ignore_checksum is False:
             raise DecodingError('FruDataMultiRecord record checksum failed')
 
     @staticmethod
@@ -386,11 +406,11 @@ class FruPicmgRecord(FruDataMultiRecord):
 
         return FruPicmgRecord(data)
 
-    def _from_data(self, data):
+    def _from_data(self, data, ignore_checksum=False):
         if len(data) < 10:
             raise DecodingError('data too short')
         data = array.array('B', data)
-        FruDataMultiRecord._from_data(self, data)
+        FruDataMultiRecord._from_data(self, data, ignore_checksum=ignore_checksum)
         self.manufacturer_id = \
             data[5] | data[6] << 8 | data[7] << 16
         self.picmg_record_type_id = data[8]
@@ -398,7 +418,7 @@ class FruPicmgRecord(FruDataMultiRecord):
 
 
 class FruPicmgPowerModuleCapabilityRecord(FruPicmgRecord):
-    def _from_data(self, data):
+    def _from_data(self, data, ignore_checksum=False):
         if len(data) < 12:
             raise DecodingError('data too short')
         FruPicmgRecord._from_data(self, data)
@@ -407,11 +427,11 @@ class FruPicmgPowerModuleCapabilityRecord(FruPicmgRecord):
 
 
 class InventoryMultiRecordArea(object):
-    def __init__(self, data):
+    def __init__(self, data, ignore_checksum=False):
         if data:
             self._from_data(data)
 
-    def _from_data(self, data):
+    def _from_data(self, data, ignore_checksum=False):
         self.records = list()
         offset = 0
         while True:
@@ -423,31 +443,35 @@ class InventoryMultiRecordArea(object):
 
 
 class FruInventory(object):
-    def __init__(self, data=None):
+    def __init__(self, data=None, ignore_checksum=False):
         self.chassis_info_area = None
         self.board_info_area = None
         self.product_info_area = None
         self.multirecord_area = None
 
         if data:
-            self._from_data(data)
+            self._from_data(data, ignore_checksum=ignore_checksum)
 
-    def _from_data(self, data):
+    def _from_data(self, data, ignore_checksum=False):
         self.raw = data
         self.common_header = InventoryCommonHeader(data[:8])
 
         if self.common_header.chassis_info_area_offset:
             self.chassis_info_area = InventoryChassisInfoArea(
-                data[self.common_header.chassis_info_area_offset:])
+                data[self.common_header.chassis_info_area_offset:],
+                ignore_checksum=ignore_checksum)
 
         if self.common_header.board_info_area_offset:
             self.board_info_area = InventoryBoardInfoArea(
-                data[self.common_header.board_info_area_offset:])
+                data[self.common_header.board_info_area_offset:],
+                ignore_checksum=ignore_checksum)
 
         if self.common_header.product_info_area_offset:
             self.product_info_area = InventoryProductInfoArea(
-                data[self.common_header.product_info_area_offset:])
+                data[self.common_header.product_info_area_offset:],
+                ignore_checksum=ignore_checksum)
 
         if self.common_header.multirecord_area_offset:
             self.multirecord_area = InventoryMultiRecordArea(
-                data[self.common_header.multirecord_area_offset:])
+                data[self.common_header.multirecord_area_offset:],
+                ignore_checksum=ignore_checksum)

{python-ipmi-0.5.5 → python_ipmi-0.5.8}/pyipmi/helper.py

@@ -85,7 +85,7 @@ def get_sdr_data_helper(reserve_fn, get_fn, record_id, reservation_id=None):
             (next_id, data) = get_fn(reservation_id, record_id, offset, length)
         except CompletionCodeError as e:
             if e.cc == constants.CC_CANT_RET_NUM_REQ_BYTES:
-                # reduce max lenght
+                # reduce max length
                 max_req_len -= 4
                 if max_req_len <= 0:
                     retry = 0

{python-ipmi-0.5.5 → python_ipmi-0.5.8}/pyipmi/hpm.py

@@ -314,7 +314,7 @@ class Hpm(object):
         # tbd check version
 
         ####################################################
-        # compare current revision with upgrade image earlist comp rev
+        # compare current revision with upgrade image earliest comp rev
         targetCap = self.get_target_upgrade_capabilities()
         # tbd check version
 

{python-ipmi-0.5.5 → python_ipmi-0.5.8}/pyipmi/interfaces/aardvark.py

@@ -44,23 +44,32 @@ class Aardvark(object):
                                'use this interface.')
 
         self.slave_address = slave_address
+        self.port = port
+        self.serial_number = serial_number
+        self.i2c_pullups = enable_i2c_pullups
+        self.target_power = enable_target_power
+        self.fastmode = enable_fastmode
         self.timeout = 0.25
         self.max_retries = 3
         self.next_sequence_number = 0
 
-        self._dev = pyaardvark.open(port, serial_number)
+    def open(self):
+        self._dev = pyaardvark.open(self.port, self.serial_number)
         self._dev.enable_i2c_slave(self.slave_address >> 1)
 
-        if enable_i2c_pullups:
-            self.enable_pullups(enable_i2c_pullups)
-        if enable_target_power:
-            self.enable_target_power(enable_target_power)
+        if self.i2c_pullups:
+            self.enable_pullups(self.i2c_pullups)
+        if self.target_power:
+            self.enable_target_power(self.target_power)
 
-        if enable_fastmode is not None:
-            self.enable_fastmode(enable_fastmode)
+        if self.fastmode is not None:
+            self.enable_fastmode(self.fastmode)
         else:
             self.enable_fastmode(False)
 
+    def close(self):
+        self._dev.close()
+
     def enable_pullups(self, enabled):
         self._dev.i2c_pullups = enabled
 
@@ -77,11 +86,10 @@ class Aardvark(object):
         self._dev.i2c_master_write(address, data)
 
     def establish_session(self, session):
-        # just remember session parameters here
-        self._session = session
+        pass
 
     def close_session(self):
-        self._dev.close()
+        pass
 
     def is_ipmc_accessible(self, target):
         header = IpmbHeaderReq()

{python-ipmi-0.5.5 → python_ipmi-0.5.8}/pyipmi/interfaces/ipmb.py

@@ -45,10 +45,6 @@ class IpmbHeader(object):
     *-------*--------------*----------*-------*---------------*-------*
     """
 
-    def __init__(self, data=None):
-        if data:
-            self.decode(data)
-
     rs_sa = None
     rs_lun = None
     rq_sa = None
@@ -58,6 +54,17 @@ class IpmbHeader(object):
     cmdid = None
     checksum = None
 
+    def __init__(self, data=None):
+        if data:
+            self.decode(data)
+
+    def __str__(self):
+        return f'rs_sa=0x{self.rs_sa:02x}, rs_lun={self.rs_lun}, ' \
+               f'rq_sa=0x{self.rq_sa:02x}, rq_lun={self.rq_lun}, ' \
+               f'rq_seq={self.rq_seq}, ' \
+               f'netfn=0x{self.netfn:02x}, ' \
+               f'cmdid=0x{self.cmdid:02x}'
+
 
 class IpmbHeaderReq(IpmbHeader):
     """Representation of the IPMI request message header."""
@@ -142,7 +149,7 @@ def encode_ipmb_msg(header, data):
 
 
 def encode_send_message(payload, rq_sa, rs_sa, channel, seq, tracking=1):
-    """Encode a send message command and embedd the message to be send.
+    """Encode a send message command and embed the message to be send.
 
     payload: the message to be send as bytestring
     rq_sa: the requester source address
@@ -171,7 +178,7 @@ def encode_send_message(payload, rq_sa, rs_sa, channel, seq, tracking=1):
 
 
 def encode_bridged_message(routing, header, payload, seq):
-    """Encode a (multi-)bridged command and embedd the message to be send.
+    """Encode a (multi-)bridged command and embed the message to be send.
 
     routing:
     payload: the message to be send as bytestring
@@ -214,7 +221,8 @@ def decode_bridged_message(rx_data):
     return rx_data
 
 
-def rx_filter(header, data):
+def rx_filter(header, data, rq_sa=False, rs_sa=False, rq_lun=False,
+              rs_lun=True, rq_seq=True):
     """Check if the message in rx_data matches to the information in header.
 
     The following checks are done:
@@ -234,15 +242,26 @@ def rx_filter(header, data):
     checks = [
         (checksum(data[0:3]), 0, 'Header checksum failed'),
         (checksum(data[3:]), 0, 'payload checksum failed'),
-        # rsp_header.rq_sa, header.rq_sa, 'slave address mismatch'),
         (rsp_header.netfn, header.netfn | 1, 'NetFn mismatch'),
-        # rsp_header.rs_sa, header.rs_sa, 'target address mismatch'),
-        # rsp_header.rq_lun, header.rq_lun, 'request LUN mismatch'),
-        (rsp_header.rs_lun, header.rs_lun, 'responder LUN mismatch'),
-        (rsp_header.rq_seq, header.rq_seq, 'sequence number mismatch'),
         (rsp_header.cmdid, header.cmdid, 'command id mismatch'),
     ]
 
+    # optional checks
+    if rq_sa:
+        checks.append((rsp_header.rq_sa, header.rq_sa, 'slave address mismatch'))
+
+    if rs_sa:
+        checks.append((rsp_header.rs_sa, header.rs_sa, 'target address mismatch'))
+
+    if rq_lun:
+        checks.append((rsp_header.rq_lun, header.rq_lun, 'request LUN mismatch'))
+
+    if rs_lun:
+        checks.append((rsp_header.rs_lun, header.rs_lun, 'responder LUN mismatch'))
+
+    if rq_seq:
+        checks.append((rsp_header.rq_seq, header.rq_seq, 'sequence number mismatch'))
+
     match = True
 
     for left, right, msg in checks: