From be220d3f5b500bd58afa93a05a53d793662766de Mon Sep 17 00:00:00 2001
From: Dan Jones <dan.jones@noc.ac.uk>
Date: Wed, 18 Jan 2023 11:19:06 +0000
Subject: [PATCH] test: update example messages to match new schema
---
.../mock/messages/Message_VehicleMission.json | 18 +++---
.../Message_VehicleMissionActions.json | 56 ++++++++++---------
test/mock/messages/Message_VehicleStatus.json | 24 ++++----
3 files changed, 52 insertions(+), 46 deletions(-)
diff --git a/test/mock/messages/Message_VehicleMission.json b/test/mock/messages/Message_VehicleMission.json
index 1036455..eeecae9 100644
--- a/test/mock/messages/Message_VehicleMission.json
+++ b/test/mock/messages/Message_VehicleMission.json
@@ -1,17 +1,19 @@
{
- "message_type": "VehicleMission",
"metadata": {
"source": "ae",
"destination": "soar.po.ecosub.eco1",
"delivery_type": "publish",
"message_id": "test"
},
- "operator_id": "po",
- "vehicle_id": "eco1",
- "coordinates": {
- "latitude": 59.234,
- "longitude": -10.432,
- "depth": 50,
- "projection": 4326
+ "payload": {
+ "message_type": "VehicleMission",
+ "operator_id": "po",
+ "vehicle_id": "eco1",
+ "coordinates": {
+ "latitude": 59.234,
+ "longitude": -10.432,
+ "depth": 50,
+ "projection": 4326
+ }
}
}
diff --git a/test/mock/messages/Message_VehicleMissionActions.json b/test/mock/messages/Message_VehicleMissionActions.json
index 921bf26..6435e44 100644
--- a/test/mock/messages/Message_VehicleMissionActions.json
+++ b/test/mock/messages/Message_VehicleMissionActions.json
@@ -1,37 +1,39 @@
{
- "message_type": "VehicleMission",
"metadata": {
"source": "ae",
"destination": "soar.po.ecosub.eco1",
"delivery_type": "publish",
"message_id": "test"
},
- "operator_id": "po",
- "vehicle_id": "eco1",
- "coordinates": {
- "latitude": 59.234,
- "longitude": -10.432,
- "depth": 50,
- "projection": 4326
- },
- "actions": [
- {
- "action_type": "GoToWaypoint",
- "coordinates": {
- "latitude": 59.234,
- "longitude": -10.432,
- "depth": 50,
- "projection": 4326
- }
+ "payload": {
+ "message_type": "VehicleMission",
+ "operator_id": "po",
+ "vehicle_id": "eco1",
+ "coordinates": {
+ "latitude": 59.234,
+ "longitude": -10.432,
+ "depth": 50,
+ "projection": 4326
},
- {
- "action_type": "DescendToAltitude",
- "coordinates": {
- "latitude": 59.234,
- "longitude": -10.432,
- "altitude": 50,
- "projection": 4326
+ "actions": [
+ {
+ "action_type": "GoToWaypoint",
+ "coordinates": {
+ "latitude": 59.234,
+ "longitude": -10.432,
+ "depth": 50,
+ "projection": 4326
+ }
+ },
+ {
+ "action_type": "DescendToAltitude",
+ "coordinates": {
+ "latitude": 59.234,
+ "longitude": -10.432,
+ "altitude": 50,
+ "projection": 4326
+ }
}
- }
- ]
+ ]
+ }
}
diff --git a/test/mock/messages/Message_VehicleStatus.json b/test/mock/messages/Message_VehicleStatus.json
index 5891bba..55cdd81 100644
--- a/test/mock/messages/Message_VehicleStatus.json
+++ b/test/mock/messages/Message_VehicleStatus.json
@@ -1,18 +1,20 @@
{
- "message_type": "VehicleStatus",
"metadata": {
"source": "ae",
"destination": "soar.po.ecosub.eco1",
"delivery_type": "publish",
"message_id": "test"
},
- "operator_id": "po",
- "vehicle_id": "eco1",
- "coordinates": {
- "latitude": 57.234,
- "longitude": -8.432,
- "depth": 50,
- "projection": 4326
- },
- "battery_percentage": 64
-}
+ "payload": {
+ "message_type": "VehicleStatus",
+ "operator_id": "po",
+ "vehicle_id": "eco1",
+ "coordinates": {
+ "latitude": 57.234,
+ "longitude": -8.432,
+ "depth": 50,
+ "projection": 4326
+ },
+ "battery_percentage": 64
+ }
+}
\ No newline at end of file
--
GitLab