[orchestrator] Handle targets with different ott interface

hyper310 has been renamed cw310 on master but the opentitantool
interface named remains hyper310. Therefore the orchestrator needs
to be aware that the interface names may not match the target name.

Signed-off-by: Amaury Pouly <[email protected]>

Author: pamaury

sw/host/provisioning/orchestrator/src/orchestrator.py

@@ -94,7 +94,7 @@ def main(args_in):
     )
     parser.add_argument(
         "--fpga",
-        choices=["hyper310", "cw340"],
+        choices=["cw310", "cw340"],
         help="Run flow on FPGA (instead of silicon).",
     )
     parser.add_argument(

sw/host/provisioning/orchestrator/src/ot_dut.py

@@ -19,11 +19,17 @@
 # FPGA bitstream.
 _FPGA_UNIVERSAL_SPLICE_BITSTREAM = "hw/bitstream/universal/splice.bit"
 
+# Opentitantool interface
+_OTT_FPGA_INTERFACE = {
+    "cw310": "hyper310",
+    "cw340": "cw340",
+}
+
 # CP and FT shared flags.
 _OPENOCD_BIN = "third_party/openocd/build_openocd/bin/openocd"
 _OPENOCD_ADAPTER_CONFIG = "external/openocd/tcl/interface/cmsis-dap.cfg"
 _BASE_PROVISIONING_FLAGS = """
-    --interface={target} \
+    --interface={ott_intf} \
     --openocd={openocd_bin} \
     --openocd-adapter-config={openocd_cfg} \
 """
@@ -106,6 +112,7 @@ def run_cp(self) -> None:
         if self.fpga:
             # Set host flags and device binary for FPGA DUT.
             host_flags = host_flags.format(target=self.fpga,
+                                           ott_intf=_OTT_FPGA_INTERFACE[self.fpga],
                                            openocd_bin=openocd_bin,
                                            openocd_cfg=openocd_cfg)
             host_flags += " --clear-bitstream"
@@ -117,6 +124,7 @@ def run_cp(self) -> None:
         else:
             # Set host flags and device binary for Silicon DUT.
             host_flags = host_flags.format(target="teacup",
+                                           ott_intf="teacup",
                                            openocd_bin=openocd_bin,
                                            openocd_cfg=openocd_cfg)
             host_flags += " --disable-dft-on-reset"
@@ -194,6 +202,7 @@ def run_ft(self) -> None:
             # No need to load another bitstream, we will take over where CP
             # stage above left off.
             host_flags = host_flags.format(target=self.fpga,
+                                           ott_intf=_OTT_FPGA_INTERFACE[self.fpga],
                                            openocd_bin=openocd_bin,
                                            openocd_cfg=openocd_cfg)
             individ_elf = individ_elf.format(
@@ -211,6 +220,7 @@ def run_ft(self) -> None:
         else:
             # Set host flags and device binaries for Silicon DUT.
             host_flags = host_flags.format(target="teacup",
+                                           ottf_intf="teacup",
                                            openocd_bin=openocd_bin,
                                            openocd_cfg=openocd_cfg)
             host_flags += " --disable-dft-on-reset"

sw/host/provisioning/orchestrator/tests/BUILD

@@ -66,7 +66,7 @@ sh_test(
         "PYTHON": "$(location @python3//:python3)",
     },
     tags = [
-        "hyper310",
+        "cw310",
         "manuf",
     ],
 )

sw/host/provisioning/orchestrator/tests/e2e.sh

@@ -21,6 +21,6 @@ $PYTHON ${ORCHESTRATOR_PATH} \
   --sku-config=sw/host/provisioning/orchestrator/configs/skus/emulation.hjson \
   --test-unlock-token="0x11111111_11111111_11111111_11111111" \
   --test-exit-token="0x22222222_22222222_22222222_22222222" \
-  --fpga=hyper310 \
+  --fpga=cw310 \
   --non-interactive \
   --db-path=$TEST_TMPDIR/registry.sqlite