Fix test cases

Also removing links to the obsolete vehicle-model-python repository Fixes things that seems to be obviously wrong, resulting in that "velocitas init" fail or that Removing dead config
eclipse-velocitas · Sep 6, 2024 · 8a0c4f7 · 8a0c4f7
1 parent bb166e5
commit 8a0c4f7
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 50 deletions.
diff --git a/examples/array-datatype/src/main.py b/examples/array-datatype/src/main.py
@@ -18,7 +18,7 @@
 import logging
 import signal
 
-from sdv_model import Vehicle, vehicle  # type: ignore
+from vehicle import Vehicle, vehicle  # type: ignore
 
 from velocitas_sdk.vdb.subscriptions import DataPointReply
 from velocitas_sdk.vehicle_app import VehicleApp

diff --git a/examples/atomic-set/AppManifest.json b/examples/atomic-set/AppManifest.json
@@ -27,7 +27,7 @@
                     "vehicleapp/setValue/request"
                 ],
                 "writes": [
-                    "vehicleapp/setValue/response",
+                    "vehicleapp/setValue/response"
                 ]
             }
         }

diff --git a/examples/atomic-set/src/main.py b/examples/atomic-set/src/main.py
@@ -17,7 +17,7 @@
 import logging
 import signal
 
-from sdv_model import Vehicle, vehicle  # type: ignore
+from vehicle import Vehicle, vehicle  # type: ignore
 
 from velocitas_sdk.vdb.subscriptions import DataPointReply
 from velocitas_sdk.vehicle_app import VehicleApp, subscribe_topic

diff --git a/examples/datapoint-set/AppManifest.json b/examples/datapoint-set/AppManifest.json
@@ -28,7 +28,7 @@
                     "vehicleapp/setSensor/request"
                 ],
                 "writes": [
-                    "vehicleapp/setValue/response",
+                    "vehicleapp/setValue/response"
                 ]
             }
         }

diff --git a/examples/datapoint-set/src/main.py b/examples/datapoint-set/src/main.py
@@ -17,7 +17,7 @@
 import logging
 import signal
 
-from sdv_model import Vehicle, vehicle  # type: ignore
+from vehicle import Vehicle, vehicle  # type: ignore
 
 from velocitas_sdk.vdb.subscriptions import DataPointReply
 from velocitas_sdk.vehicle_app import VehicleApp, subscribe_topic

diff --git a/examples/dog-mode/AppManifest.json b/examples/dog-mode/AppManifest.json
@@ -2,44 +2,6 @@
     "manifestVersion": "v3",
     "name": "dogmode",
     "interfaces": [
-        {
-            "type": "vehicle-signal-interface",
-            "config": {
-                "src": "https://github.com/COVESA/vehicle_signal_specification/releases/download/v3.0/vss_rel_3.0.json",
-                "datapoints": {
-                    "required": [
-                        {
-                            "path": "Vehicle.Cabin.AmbientAirTemperature",
-                            "access": "read"
-                        },
-                        {
-                            "path": "Vehicle.Cabin.DogMode",
-                            "access": "read"
-                        },
-                        {
-                            "path": "Vehicle.Cabin.DogModeTemperature",
-                            "access": "read"
-                        },
-                        {
-                            "path": "Vehicle.Powertrain.Battery.StateOfCharge.Current",
-                            "access": "read"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "type": "grpc-interface",
-            "config": {
-                "src": "https://github.com/eclipse/kuksa.val.services/blob/v0.2.0/hvac_service/proto/sdv/edge/comfort/hvac/v1/hvac.proto",
-                "required": {
-                    "methods": [
-                        "SetAcStatus",
-                        "SetTemperature"
-                    ]
-                }
-            }
-        },
         {
             "type": "pubsub",
             "config": {

diff --git a/examples/dynamic-rule/src/main.py b/examples/dynamic-rule/src/main.py
@@ -20,7 +20,7 @@
 import logging
 import signal
 
-from sdv_model import Vehicle, vehicle  # type: ignore
+from vehicle import Vehicle, vehicle  # type: ignore
 
 from velocitas_sdk import config
 from velocitas_sdk.config import Config, MiddlewareType

diff --git a/examples/performance-subscribe/src/main.py b/examples/performance-subscribe/src/main.py
@@ -18,7 +18,7 @@
 import signal
 from datetime import datetime
 
-from sdv_model import Vehicle, vehicle  # type: ignore
+from vehicle import Vehicle, vehicle  # type: ignore
 
 from velocitas_sdk.model import DataPoint
 from velocitas_sdk.util.log import (  # type: ignore

diff --git a/examples/static-rule/AppManifest.json b/examples/static-rule/AppManifest.json
@@ -15,6 +15,6 @@
                     ]
                 }
             }
-        },
+        }
     ]
 }
diff --git a/examples/static-rule/src/main.py b/examples/static-rule/src/main.py
@@ -18,7 +18,7 @@
 import logging
 import signal
 
-from sdv_model import Vehicle, vehicle  # type: ignore
+from vehicle import Vehicle, vehicle  # type: ignore
 
 from velocitas_sdk.vdb.subscriptions import DataPointReply
 from velocitas_sdk.vehicle_app import VehicleApp, subscribe_data_points

diff --git a/examples/vdb-queries/AppManifest.json b/examples/vdb-queries/AppManifest.json
@@ -19,6 +19,6 @@
                     ]
                 }
             }
-        },
+        }
     ]
 }
diff --git a/examples/vdb-queries/src/main.py b/examples/vdb-queries/src/main.py
@@ -16,7 +16,7 @@
 import logging
 import signal
 
-from sdv_model import Vehicle, vehicle  # type: ignore
+from vehicle import Vehicle, vehicle  # type: ignore
 
 from velocitas_sdk.vdb.subscriptions import DataPointReply
 from velocitas_sdk.vehicle_app import VehicleApp

diff --git a/requirements-links.txt b/requirements-links.txt
@@ -1 +1 @@
-git+https://github.com/eclipse-velocitas/vehicle-model-python.git@v0.3.0
+# Pip dependencies specified by github links
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,6 @@ @@
                         ]
                     }
                 }
-            },
+            }
         ]
     }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		git+https://github.com/eclipse-velocitas/vehicle-model-python.git@v0.3.0
		# Pip dependencies specified by github links