tests: mctpenv: allow parsing VDMTypes from a dbus response, use for comparisons

Now that we have a VDM type, construct a set from dbus responses, and
use this to copmpare against expected values.

Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>

Author: jk-ozlabs

tests/mctpenv/__init__.py

@@ -357,6 +357,11 @@ class VDMType:
         TYPE_PCI: ("PCI", FORMAT_PCI, 2),
         TYPE_IANA: ("IANA", FORMAT_IANA, 4),
     }
+    # format to (type, dbus type)
+    fmt_map = {
+        FORMAT_PCI: (TYPE_PCI, 'q'),
+        FORMAT_IANA: (TYPE_IANA, 'u'),
+    }
 
     def __init__(self, msgtype, vdmtype, subtype=0):
         self.msgtype = msgtype
@@ -367,6 +372,15 @@ def __repr__(self):
         (name, _, _) = self.type_map.get(self.msgtype)
         return f"<VDMType {name}: {self.vdmtype:x} {self.subtype:x}>"
 
+    def _key(self):
+        return (self.msgtype, self.vdmtype, self.subtype)
+
+    def __eq__(self, value):
+        return self._key() == value._key()
+
+    def __hash__(self):
+        return hash(self._key())
+
     def format(self):
         """Convert to the Get Vendor Defined Message Support response format"""
         (_, vid_fmt, vid_size) = self.type_map.get(self.msgtype)
@@ -377,6 +391,17 @@ def format(self):
             + self.subtype.to_bytes(2, 'big')
         )
 
+    @classmethod
+    def parse_dbus(cls, dbus_res):
+        """Convert from a dbus GetVendorDefinedMessageTypes reply"""
+        types = []
+        for t in dbus_res:
+            fmt, var, subtype = t
+            (msgtype, dbus_type) = cls.fmt_map.get(fmt)
+            assert var.signature == dbus_type
+            types.append(cls(msgtype, var.value, subtype))
+        return types
+
 
 class Endpoint:
     def __init__(

tests/test_mctpd.py

@@ -660,25 +660,9 @@ async def test_query_vdm_types(dbus, mctpd):
 
     ep_obj = await mctpd_mctp_endpoint_common_obj(dbus, path)
 
-    # Query VendorDefinedMessageTypes property
-    vdm_types = list(await ep_obj.get_vendor_defined_message_types())
-
-    # Verify we got 2 VDM types
-    assert len(vdm_types) == 2
-
-    # Verify first VDM type: PCIe format (0), VID 0x1234, cmd_set 0x5678
-    assert vdm_types[0][0] == 0  # format: PCIe
-    assert (
-        vdm_types[0][1].value == 0x1234
-    )  # vendor_id (variant containing uint16)
-    assert vdm_types[0][2] == 0x5678  # cmd_set
-
-    # Verify second VDM type: IANA format (1), VID 0xabcdef12, cmd_set 0x3456
-    assert vdm_types[1][0] == 1  # format: IANA
-    assert (
-        vdm_types[1][1].value == 0xABCDEF12
-    )  # vendor_id (variant containing uint32)
-    assert vdm_types[1][2] == 0x3456  # cmd_set
+    r = await ep_obj.get_vendor_defined_message_types()
+    ret_vdm_types = VDMType.parse_dbus(r)
+    assert set(vdm_types) == set(ret_vdm_types)
 
 
 class InvalidVDMEndpointBase(Endpoint):