[fi] OTFIOtbn: Use OTFITest

Author: aewag

target/communication/fi_otbn_commands.py

@@ -10,71 +10,27 @@
 from typing import Optional
 
 
-from otfi import OTFI
+from target.communication.otfi import OTFI
+from target.communication.otfi_test import OTFITest
 
 
 class OTFIOtbn(OTFI):
+    TESTS = [
+        OTFITest("char_unrolled_reg_op_loop"),
+        OTFITest("char_unrolled_dmem_op_loop"),
+        OTFITest("char_hardware_reg_op_loop"),
+        OTFITest("char_hardware_dmem_op_loop"),
+        OTFITest("key_sideload"),
+        OTFITest("load_integrity"),
+    ]
+
     def __init__(self, target) -> None:
         super().__init__(target, "Otbn")
 
     def init(self, test: Optional[str] = "") -> None:
         self.init_keymgr(test)
         super().init(test)
 
-    def otbn_char_unrolled_reg_op_loop(self) -> None:
-        """ Starts the otbn.fi.char.unrolled.reg.op.loop test.
-        """
-        # OtbnFi command.
-        self._ujson_fi_cmd()
-        # CharUnrolledRegOpLoop command.
-        time.sleep(0.01)
-        self.target.write(json.dumps("CharUnrolledRegOpLoop").encode("ascii"))
-
-    def otbn_char_unrolled_dmem_op_loop(self) -> None:
-        """ Starts the otbn.fi.char.unrolled.dmem.op.loop test.
-        """
-        # OtbnFi command.
-        self._ujson_fi_cmd()
-        # CharUnrolledDmemOpLoop command.
-        time.sleep(0.01)
-        self.target.write(json.dumps("CharUnrolledDmemOpLoop").encode("ascii"))
-
-    def otbn_char_hardware_reg_op_loop(self) -> None:
-        """ Starts the otbn.fi.char.hardware.reg.op.loop test.
-        """
-        # OtbnFi command.
-        self._ujson_fi_cmd()
-        # CharHardwareRegOpLoop command.
-        time.sleep(0.01)
-        self.target.write(json.dumps("CharHardwareRegOpLoop").encode("ascii"))
-
-    def otbn_char_hardware_dmem_op_loop(self) -> None:
-        """ Starts the otbn.fi.char.hardware.dmem.op.loop test.
-        """
-        # OtbnFi command.
-        self._ujson_fi_cmd()
-        # CharMemOpLoop command.
-        time.sleep(0.01)
-        self.target.write(json.dumps("CharHardwareDmemOpLoop").encode("ascii"))
-
-    def otbn_key_sideload(self) -> None:
-        """ Starts the otbn.fi.key_sideload test.
-        """
-        # OtbnFi command.
-        self._ujson_fi_cmd()
-        # KeySideload command.
-        time.sleep(0.01)
-        self.target.write(json.dumps("KeySideload").encode("ascii"))
-
-    def otbn_load_integrity(self) -> None:
-        """ Starts the otbn.fi.load_integrity test.
-        """
-        # OtbnFi command.
-        self._ujson_fi_cmd()
-        # LoadIntegrity command.
-        time.sleep(0.01)
-        self.target.write(json.dumps("LoadIntegrity").encode("ascii"))
-
     def init_keymgr(self, test: str) -> None:
         """ Initialize the key manager on the chip.
         Args: