[fi] OTFI: Use OTFITest

Author: aewag

target/communication/otfi.py

@@ -7,21 +7,26 @@
 from typing import Optional
 
 
+from target.communication.otfi_test import OTFITest
+
+
 class OTFI:
-    IP = ["Ibex", "Otbn", "Crypto"]
+    TESTS = []
+    IP = ["Ibex", "Otbn", "Crypto", "Rng"]
+
     def __init__(self, target, ip) -> None:
         self.target = target
         self.ip = ip
 
-        assert self.ip in OTFI.IP, "ip ({self.ip} not in OTFI.IP ({OTFI.IP})"
+        assert self.ip in OTFI.IP, f"ip ({self.ip} not in OTFI.IP ({OTFI.IP})"
 
     def _ujson_fi_cmd(self) -> None:
         time.sleep(0.01)
         self.target.write(json.dumps(f"{self.ip}Fi").encode("ascii"))
         time.sleep(0.01)
 
     def init(self, test: Optional[str] = "") -> None:
-        """ Initialize the FI code on the chip.
+        """Initialize the FI code on the chip.
         Returns:
             The device ID of the device.
         """
@@ -33,20 +38,38 @@ def init(self, test: Optional[str] = "") -> None:
         # Read back device ID from device.
         return self.read_response(max_tries=30)
 
-    def start_test(self, cfg: dict) -> None:
-        """ Start the selected test.
+    def start_test(
+        self, cfg: Optional[dict] = {}, testname: Optional[str] = ""
+    ) -> None:
+        """Start the selected test.
 
         Call the function selected in the config file. Uses the getattr()
         construct to call the function.
 
         Args:
             cfg: Config dict containing the selected test.
         """
-        test_function = getattr(self, cfg["test"]["which_test"])
-        test_function()
+        if cfg != {}:
+            testname = cfg["test"]["which_test"]
+        testname = testname.replace(f"{self.ip}_", "", 1)
+        tests = [test for test in self.TESTS if test.name == testname]
+        assert not len(tests) == 0, f"{testname} not found in {self.TESTS}"
+        assert len(tests) == 1, f"Test duplicates with name {testname}"
+        self._run_test(tests[0])
+
+    def _run_test(self, test: OTFITest) -> None:
+        # OTFIx Fi command.
+        self._ujson_fi_cmd()
+        # Test command.
+        time.sleep(0.01)
+        self.target.write(json.dumps(test.cmd).encode("ascii"))
+        # Test mode.
+        if test.mode is not None:
+            time.sleep(0.01)
+            self.target.write(json.dumps(test.mode).encode("ascii"))
 
     def read_response(self, max_tries: Optional[int] = 1) -> str:
-        """ Read response from Crypto FI framework.
+        """Read response from Crypto FI framework.
         Args:
             max_tries: Maximum number of attempts to read from UART.