Update Mock Service to Version 4.0

eclipse-velocitas · Mar 27, 2024 · be5331f · be5331f
1 parent 8fd1df5
commit be5331f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/mock.py b/mock.py
@@ -16,11 +16,12 @@
 from lib.dsl import (
     create_animation_action,
     create_behavior,
+    create_event_trigger,
     create_set_action,
     get_datapoint_value,
     mock_datapoint,
 )
-from lib.trigger import ClockTrigger, EventTrigger, EventType
+from lib.trigger import ClockTrigger, EventType
 
 mock_datapoint(
     path="Vehicle.Speed",
@@ -42,7 +43,7 @@
     initial_value=0,
     behaviors=[
         create_behavior(
-            trigger=EventTrigger(EventType.ACTUATOR_TARGET),
+            trigger=create_event_trigger(EventType.ACTUATOR_TARGET),
             action=create_animation_action(
                 duration=10.0,
                 values=["$self", "$event.value"],
@@ -56,7 +57,7 @@
     initial_value="STOP_HOLD",
     behaviors=[
         create_behavior(
-            trigger=EventTrigger(EventType.ACTUATOR_TARGET),
+            trigger=create_event_trigger(EventType.ACTUATOR_TARGET),
             action=create_set_action("$event.value"),
         )
     ],
@@ -67,7 +68,7 @@
     initial_value=0,
     behaviors=[
         create_behavior(
-            trigger=EventTrigger(EventType.ACTUATOR_TARGET),
+            trigger=create_event_trigger(EventType.ACTUATOR_TARGET),
             action=create_set_action("$event.value"),
         )
     ],
@@ -78,15 +79,15 @@
     initial_value=0,
     behaviors=[
         create_behavior(
-            trigger=EventTrigger(EventType.ACTUATOR_TARGET),
+            trigger=create_event_trigger(EventType.ACTUATOR_TARGET),
             condition=lambda ctx: get_datapoint_value(
                 ctx, "Vehicle.Body.Windshield.Front.Wiping.System.Mode"
             )
             == "EMERGENCY_STOP",
             action=create_set_action(0),
         ),
         create_behavior(
-            trigger=EventTrigger(EventType.ACTUATOR_TARGET),
+            trigger=create_event_trigger(EventType.ACTUATOR_TARGET),
             condition=lambda ctx: get_datapoint_value(
                 ctx, "Vehicle.Body.Windshield.Front.Wiping.System.Mode"
             )
@@ -100,7 +101,7 @@
             ),
         ),
         create_behavior(
-            trigger=EventTrigger(EventType.ACTUATOR_TARGET),
+            trigger=create_event_trigger(EventType.ACTUATOR_TARGET),
             condition=lambda ctx: get_datapoint_value(
                 ctx, "Vehicle.Body.Windshield.Front.Wiping.System.Mode"
             )
@@ -121,7 +122,8 @@
     initial_value=False,
     behaviors=[
         create_behavior(
-            EventTrigger(EventType.ACTUATOR_TARGET), create_set_action("$event.value")
+            create_event_trigger(EventType.ACTUATOR_TARGET),
+            create_set_action("$event.value"),
         )
     ],
 )
diff --git a/runtime.json b/runtime.json
@@ -177,19 +177,19 @@
         "config": [
             {
                 "key": "image",
-                "value": "ghcr.io/boschglobal/kuksa.val.services/mock_service:latest"
+                "value": "ghcr.io/eclipse-kuksa/kuksa-mock-provider/mock-provider:0.4.0"
             },
             {
                 "key": "env",
                 "value": "VDB_ADDRESS=127.0.0.1:55555"
             },
             {
                 "key": "mount",
-                "value": "$pathInWorkspaceOrPackage( ${{ mockFilePath }} ):/mock.py"
+                "value": "$pathInWorkspaceOrPackage( ${{ mockFilePath }} ):/mock/mock.py"
             },
             {
                 "key": "start-pattern",
-                "value": ".*[cC]onnected to data broker.*"
+                "value": ".*Databroker connected!*"
             }
         ]
     }

diff --git a/runtime_kanto/src/runtime/deployment/mockservice.json b/runtime_kanto/src/runtime/deployment/mockservice.json
@@ -1,11 +1,11 @@
 {
     "container_name": "mockservice",
     "image": {
-        "name": "ghcr.io/boschglobal/kuksa.val.services/mock_service:latest"
+        "name": "ghcr.io/eclipse-kuksa/kuksa-mock-provider/mock-provider:0.4.0"
     },
     "mount_points": [
         {
-            "destination": "mock.py",
+            "destination": "/mock/mock.py",
             "source": "/workspaces/vehicle-app-python-template/mock.py",
             "propagation_mode": "rprivate"
         }