From 9ee9c579eac1b3e5fc55a8326976770fb70edd58 Mon Sep 17 00:00:00 2001
From: Dan Jones <dan.jones@noc.ac.uk>
Date: Thu, 2 Mar 2023 11:55:05 +0000
Subject: [PATCH] fix: update publish topics
The destination field contains a publish topic
You don't send to the autonomy engine
You publish a message on a topic that the autonomy engine
is subscribed to.
The send/receive field is confusing.
The aim was to give clients the option to subscribe to
all messages from platforms or all messages to platforms
but it's unclear how to use this for things like the
configuration message.
---
examples/autonomy_engine_adapter/acknowledgement.json | 2 +-
examples/autonomy_engine_adapter/mission_plan_HYDROSURV.json | 2 +-
examples/autonomy_engine_adapter/planning_configuration.json | 2 +-
.../platform_status-from_usbl_example.json | 2 +-
examples/autonomy_engine_adapter/platform_status.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 | 2 +-
examples/hydrosurv_adapter/acknowledgement.json | 4 ++--
examples/hydrosurv_adapter/mission_plan.json | 2 +-
examples/hydrosurv_adapter/platform_status.json | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/examples/autonomy_engine_adapter/acknowledgement.json b/examples/autonomy_engine_adapter/acknowledgement.json
index 817898a..799381d 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.rhul.autonomy-engine.ae-1.send.acknowledgement",
+ "destination": "soar.hydrosurv.reav.reav1.receive.acknowledgement",
"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 c72adef..30f9e9c 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.hydrosurv.usv.reav-60.send.mission_plan",
+ "destination": "soar.hydrosurv.reav-60.reav-60-1.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 69420fe..5e5b4b3 100644
--- a/examples/autonomy_engine_adapter/planning_configuration.json
+++ b/examples/autonomy_engine_adapter/planning_configuration.json
@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "gui",
- "destination": "soar.rhul.autonomy-engine.ae-1.send.planning_configuration",
+ "destination": "soar.all.all.all.receive.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 e93d741..63c1591 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": "soar.rhul.autonomy-engine.ae-1.send.platform_status",
+ "destination": "soar.planet-ocean.ecosub.ecosub-5.receive.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 215d538..64da5c2 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": "soar.rhul.autonomy-engine.ae-1.send.platform_status",
+ "destination": "soar.planet-ocean.ecosub.ecosub-2.receive.platform_status",
"delivery_type": "publish",
"encoded": false
},
diff --git a/examples/ecosub_adapter/observation.json b/examples/ecosub_adapter/observation.json
index d4886df..43d7ef9 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": "soar.rhul.autonomy-engine.ae-1.send.observation",
+ "destination": "soar.planet-ocean.ecosub.ecosub-2.receive.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 e93d741..63c1591 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": "soar.rhul.autonomy-engine.ae-1.send.platform_status",
+ "destination": "soar.planet-ocean.ecosub.ecosub-5.receive.platform_status",
"delivery_type": "publish",
"encoded": false
},
diff --git a/examples/ecosub_adapter/platform_status.json b/examples/ecosub_adapter/platform_status.json
index 215d538..64da5c2 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": "soar.rhul.autonomy-engine.ae-1.send.platform_status",
+ "destination": "soar.planet-ocean.ecosub.ecosub-2.receive.platform_status",
"delivery_type": "publish",
"encoded": false
},
diff --git a/examples/gui_adapter/planning_configuration.json b/examples/gui_adapter/planning_configuration.json
index baf854c..a5da880 100644
--- a/examples/gui_adapter/planning_configuration.json
+++ b/examples/gui_adapter/planning_configuration.json
@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "gui",
- "destination": "soar.rhul.autonomy-engine.ae-1.send.planning_configuration",
+ "destination": "soar.all.all.all.receive.planning_configuration",
"delivery_type": "publish",
"encoded": false
},
diff --git a/examples/hydrosurv_adapter/acknowledgement.json b/examples/hydrosurv_adapter/acknowledgement.json
index 817898a..ed735ae 100644
--- a/examples/hydrosurv_adapter/acknowledgement.json
+++ b/examples/hydrosurv_adapter/acknowledgement.json
@@ -4,14 +4,14 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 1,
"source": "hydrosurv_adapter",
- "destination": "soar.rhul.autonomy-engine.ae-1.send.acknowledgement",
+ "destination": "soar.hydrosurv.reav-60.reav-60-1.receive.acknowledgement",
"delivery_type": "publish",
"encoded": false
},
"payload":{
"message_type": "acknowledgement",
"autonomy_engine_plan_ID": 1,
- "platform_ID": "reav-x-1",
+ "platform_ID": "reav-60-1",
"approved": false
}
}
\ No newline at end of file
diff --git a/examples/hydrosurv_adapter/mission_plan.json b/examples/hydrosurv_adapter/mission_plan.json
index c72adef..623b1c3 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": "soar.hydrosurv.usv.reav-60.send.mission_plan",
+ "destination": "soar.hydrosurv.raev-60.reav-60-1.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 f6e38e0..8175fae 100644
--- a/examples/hydrosurv_adapter/platform_status.json
+++ b/examples/hydrosurv_adapter/platform_status.json
@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "hydrosurv_adapter",
- "destination": "soar.rhul.autonomy-engine.ae-1.send.platform_status",
+ "destination": "soar.hydrosurv.reav-60.reav-60-1.receive.platform_status",
"delivery_type": "publish",
"encoded": false
},
--
GitLab