refactor(primitives): Unified output of primitives

Fraunhofer-AISEC · Nov 27, 2023 · 9ec885c · 9ec885c
1 parent 0a70ade
commit 9ec885c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/src/gallia/commands/primitive/uds/read_by_identifier.py b/src/gallia/commands/primitive/uds/read_by_identifier.py
@@ -47,11 +47,8 @@ async def main(self, args: Namespace) -> None:
         if isinstance(resp, NegativeResponse):
             logger.error(resp)
         else:
-            logger.info("Positive response:")
+            logger.result("Positive response:")
             data = resp.data_record
-            logger.info(f"hex: {data.hex()}")
-            logger.info(f"raw: {repr(data)}")
-            logger.result(
-                f"{self.ecu.transport.target.raw} responds to {args.DID:#06x} with {data.hex()}"
-            )
+            logger.result(f"hex: {data.hex()}")
+            logger.result(f"raw: {repr(data)}")
             self.result = data
diff --git a/src/gallia/commands/primitive/uds/rtcl.py b/src/gallia/commands/primitive/uds/rtcl.py
@@ -152,6 +152,6 @@ async def main(self, args: Namespace) -> None:
             if isinstance(resp, NegativeResponse):
                 logger.error(f"request_routine_results: {resp}")
             else:
-                logger.result("[get result] Positive response:")
+                logger.result("[results] Positive response:")
                 logger.result(f"hex: {resp.routine_status_record.hex()}")
                 logger.result(f"raw: {resp.routine_status_record!r}")
diff --git a/src/gallia/commands/primitive/uds/send_pdu.py b/src/gallia/commands/primitive/uds/send_pdu.py
@@ -79,4 +79,4 @@ async def main(self, args: Namespace) -> None:
             if isinstance(response, RawResponse):
                 logger.warning("Could not parse the response pdu")
 
-            logger.notice(f"Received {response}")
+            logger.result(f"Received {response}")
diff --git a/src/gallia/commands/primitive/uds/write_by_identifier.py b/src/gallia/commands/primitive/uds/write_by_identifier.py
@@ -69,4 +69,4 @@ async def main(self, args: Namespace) -> None:
         if isinstance(resp, NegativeResponse):
             logger.error(resp)
         else:
-            logger.info("Positive response")
+            logger.result("Success")