From 66d3ad4dca50fcce432eab84fb2dd946660feefb Mon Sep 17 00:00:00 2001
From: Trishna Saeharaseelan <trishna.saeharaseelan@noc.ac.uk>
Date: Wed, 1 Mar 2023 12:02:47 +0000
Subject: [PATCH] fix: examples and update destination topics
---
.gitignore | 4 +++-
examples/autonomy_engine_adapter/acknowledgement.json | 2 +-
examples/autonomy_engine_adapter/mission_plan_AH1.json | 2 +-
examples/autonomy_engine_adapter/mission_plan_ECOSUB.json | 2 +-
examples/autonomy_engine_adapter/mission_plan_HYDROSURV.json | 2 +-
examples/autonomy_engine_adapter/planning_configuration.json | 4 ++--
.../platform_status-from_usbl_example.json | 2 +-
examples/autonomy_engine_adapter/platform_status.json | 4 ++--
examples/ecosub_adapter/mission_plan.json | 2 +-
examples/ecosub_adapter/observation.json | 2 +-
.../ecosub_adapter/platform_status-from_usbl_example.json | 2 +-
examples/ecosub_adapter/platform_status.json | 2 +-
examples/gui_adapter/planning_configuration.json | 4 ++--
examples/hydrosurv_adapter/acknowledgement.json | 2 +-
examples/hydrosurv_adapter/mission_plan.json | 2 +-
examples/hydrosurv_adapter/platform_status.json | 3 +--
16 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/.gitignore b/.gitignore
index e9d6e9c..41e951a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-formats/__pycache__
+__pycache__/
+*.pyc
+
diff --git a/examples/autonomy_engine_adapter/acknowledgement.json b/examples/autonomy_engine_adapter/acknowledgement.json
index 11bbc8d..817898a 100644
--- a/examples/autonomy_engine_adapter/acknowledgement.json
+++ b/examples/autonomy_engine_adapter/acknowledgement.json
@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 1,
"source": "hydrosurv_adapter",
- "destination": "soar.#",
+ "destination": "soar.rhul.autonomy-engine.ae-1.send.acknowledgement",
"delivery_type": "publish",
"encoded": false
},
diff --git a/examples/autonomy_engine_adapter/mission_plan_AH1.json b/examples/autonomy_engine_adapter/mission_plan_AH1.json
index e9d96b5..2c7d2dd 100644
--- a/examples/autonomy_engine_adapter/mission_plan_AH1.json
+++ b/examples/autonomy_engine_adapter/mission_plan_AH1.json
@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "autonomy_engine",
- "destination": "soar.#",
+ "destination": "soar.noc.autosub.alr-52.send.mission_plan",
"delivery_type": "publish",
"encoded": false
},
diff --git a/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json b/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json
index 716746c..a3828b1 100644
--- a/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json
+++ b/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json
@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "autonomy_engine",
- "destination": "soar.#",
+ "destination": "soar.planetocean.ecosub.ecosub-1.send.mission_plan",
"delivery_type": "publish",
"encoded": false
},
diff --git a/examples/autonomy_engine_adapter/mission_plan_HYDROSURV.json b/examples/autonomy_engine_adapter/mission_plan_HYDROSURV.json
index 18a51ce..c72adef 100644
--- a/examples/autonomy_engine_adapter/mission_plan_HYDROSURV.json
+++ b/examples/autonomy_engine_adapter/mission_plan_HYDROSURV.json
@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "autonomy_engine",
- "destination": "soar.#",
+ "destination": "soar.hydrosurv.usv.reav-60.send.mission_plan",
"delivery_type": "publish",
"encoded": false
},
diff --git a/examples/autonomy_engine_adapter/planning_configuration.json b/examples/autonomy_engine_adapter/planning_configuration.json
index 476e56e..11868c5 100644
--- a/examples/autonomy_engine_adapter/planning_configuration.json
+++ b/examples/autonomy_engine_adapter/planning_configuration.json
@@ -3,8 +3,8 @@
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd",
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
- "source": "ecosub_c2",
- "destination": "soar.#",
+ "source": "gui",
+ "destination": "soar.rhul.autonomy-engine.ae-1.send.planning_configuration",
"delivery_type": "publish",
"encoded": false
},
diff --git a/examples/autonomy_engine_adapter/platform_status-from_usbl_example.json b/examples/autonomy_engine_adapter/platform_status-from_usbl_example.json
index 6a506d9..e93d741 100644
--- a/examples/autonomy_engine_adapter/platform_status-from_usbl_example.json
+++ b/examples/autonomy_engine_adapter/platform_status-from_usbl_example.json
@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "hermes",
- "destination": "autonomy_engine",
+ "destination": "soar.rhul.autonomy-engine.ae-1.send.platform_status",
"delivery_type": "publish",
"encoded": false
},
diff --git a/examples/autonomy_engine_adapter/platform_status.json b/examples/autonomy_engine_adapter/platform_status.json
index 7c1c5c2..215d538 100644
--- a/examples/autonomy_engine_adapter/platform_status.json
+++ b/examples/autonomy_engine_adapter/platform_status.json
@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "ecosub_c2",
- "destination": "autonomy_engine",
+ "destination": "soar.rhul.autonomy-engine.ae-1.send.platform_status",
"delivery_type": "publish",
"encoded": false
},
@@ -29,7 +29,7 @@
"usbl_fix_seconds_ago": 0,
"range_to_go": 124.3,
"sensor_config": {
- "serial": "sidescan-2x",
+ "sensor_serial": "sidescan-2x",
"sensor_on": true,
"additional_data": {
"whiskers_on": true
diff --git a/examples/ecosub_adapter/mission_plan.json b/examples/ecosub_adapter/mission_plan.json
index 3ba5aac..a3828b1 100644
--- a/examples/ecosub_adapter/mission_plan.json
+++ b/examples/ecosub_adapter/mission_plan.json
@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "autonomy_engine",
- "destination": "ecosub_c2",
+ "destination": "soar.planetocean.ecosub.ecosub-1.send.mission_plan",
"delivery_type": "publish",
"encoded": false
},
diff --git a/examples/ecosub_adapter/observation.json b/examples/ecosub_adapter/observation.json
index 8eb0571..335ccdd 100644
--- a/examples/ecosub_adapter/observation.json
+++ b/examples/ecosub_adapter/observation.json
@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "ecosub_c2",
- "destination": "autonomy_engine",
+ "destination": "soar.rhul.autonomy-engine.ae-1.send.observation",
"delivery_type": "publish",
"encoded": false
},
diff --git a/examples/ecosub_adapter/platform_status-from_usbl_example.json b/examples/ecosub_adapter/platform_status-from_usbl_example.json
index 6a506d9..e93d741 100644
--- a/examples/ecosub_adapter/platform_status-from_usbl_example.json
+++ b/examples/ecosub_adapter/platform_status-from_usbl_example.json
@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "hermes",
- "destination": "autonomy_engine",
+ "destination": "soar.rhul.autonomy-engine.ae-1.send.platform_status",
"delivery_type": "publish",
"encoded": false
},
diff --git a/examples/ecosub_adapter/platform_status.json b/examples/ecosub_adapter/platform_status.json
index 84bc416..215d538 100644
--- a/examples/ecosub_adapter/platform_status.json
+++ b/examples/ecosub_adapter/platform_status.json
@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "ecosub_c2",
- "destination": "autonomy_engine",
+ "destination": "soar.rhul.autonomy-engine.ae-1.send.platform_status",
"delivery_type": "publish",
"encoded": false
},
diff --git a/examples/gui_adapter/planning_configuration.json b/examples/gui_adapter/planning_configuration.json
index e5d0f12..d2f15b6 100644
--- a/examples/gui_adapter/planning_configuration.json
+++ b/examples/gui_adapter/planning_configuration.json
@@ -3,8 +3,8 @@
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd",
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
- "source": "ecosub_c2",
- "destination": "autonomy_engine",
+ "source": "gui",
+ "destination": "soar.rhul.autonomy-engine.ae-1.send.planning_configuration",
"delivery_type": "publish",
"encoded": false
},
diff --git a/examples/hydrosurv_adapter/acknowledgement.json b/examples/hydrosurv_adapter/acknowledgement.json
index 1787704..817898a 100644
--- a/examples/hydrosurv_adapter/acknowledgement.json
+++ b/examples/hydrosurv_adapter/acknowledgement.json
@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 1,
"source": "hydrosurv_adapter",
- "destination": "autonomy_engine",
+ "destination": "soar.rhul.autonomy-engine.ae-1.send.acknowledgement",
"delivery_type": "publish",
"encoded": false
},
diff --git a/examples/hydrosurv_adapter/mission_plan.json b/examples/hydrosurv_adapter/mission_plan.json
index deff464..c72adef 100644
--- a/examples/hydrosurv_adapter/mission_plan.json
+++ b/examples/hydrosurv_adapter/mission_plan.json
@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "autonomy_engine",
- "destination": "hydrosurv_adapter",
+ "destination": "soar.hydrosurv.usv.reav-60.send.mission_plan",
"delivery_type": "publish",
"encoded": false
},
diff --git a/examples/hydrosurv_adapter/platform_status.json b/examples/hydrosurv_adapter/platform_status.json
index 4873199..f6e38e0 100644
--- a/examples/hydrosurv_adapter/platform_status.json
+++ b/examples/hydrosurv_adapter/platform_status.json
@@ -4,14 +4,13 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "hydrosurv_adapter",
- "destination": "autonomy_engine",
+ "destination": "soar.rhul.autonomy-engine.ae-1.send.platform_status",
"delivery_type": "publish",
"encoded": false
},
"payload":{
"message_type": "platform_status",
"autonomy_engine_plan_ID": 1,
- "active": true,
"status_source": "onboard_platform",
"battery_remaining_capacity": 80.2,
"heading": 310.0,
--
GitLab