diff --git a/CHANGELOG.md b/CHANGELOG.md index 83a61de67c7a792f5ca2c60452f05329c0ccfa25..cc770547bab73a880c2ab7ac39988f3ba8b87bdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added +- Route to header schema which shows the list of client_IDs relaying the message from the true source of message to final destination of it. - New message type "autonomy_engine_control". Long term plan is to integrate this as an object into the planning configuration schema, where if an operation has autonomy, the metadata, configurations, any instructions / default settings shall be within this message structure section. - Additional_data field to platform_status to input any other data from a platform to be published - Goal object in mission_plan message that consists of a GeoJSON feature (representing the part of primitive that is currently the goal of the given mission plan). diff --git a/examples/mas-dt/mission_plan.json b/examples/mas-dt/mission_plan.json index 0899a5d524097641a7614973bcbc17f457fe6285..7129de901cf55bb9f04f58d1d27fb6a6b6d9877e 100644 --- a/examples/mas-dt/mission_plan.json +++ b/examples/mas-dt/mission_plan.json @@ -5,6 +5,7 @@ "version": 2, "source": "autonomy_engine", "destination": "soar.noc.autosub.alr-52.to_platform.mission_plan", + "route": ["proj-x-relay", "internal-relay"], "delivery_type": "publish", "encoded": false }, diff --git a/examples/mas-dt/planning_configuration.json b/examples/mas-dt/planning_configuration.json index 82445417e26772c3f794261aa4e5d9268c474cfe..256bb323b8e016059657e05d6542b75e58e3bb9a 100644 --- a/examples/mas-dt/planning_configuration.json +++ b/examples/mas-dt/planning_configuration.json @@ -5,6 +5,7 @@ "version": 2, "source": "noc-c2", "destination": "", + "route": ["proj-x-relay", "internal-relay"], "delivery_type": "broadcast", "encoded": false }, diff --git a/examples/mas-dt/platform_instruction_set.json b/examples/mas-dt/platform_instruction_set.json index c3b95d4f69eb70a1f0d7e3b74d37891c00db0d24..3c6f508dc4e3bc1db5f8c8918fb1738c80caac0f 100644 --- a/examples/mas-dt/platform_instruction_set.json +++ b/examples/mas-dt/platform_instruction_set.json @@ -5,6 +5,7 @@ "version": 1, "source": "ori", "destination": "mas-dt.noc.slocum.unit_111.to_platform.platform_instruction_set", + "route": ["proj-x-relay", "internal-relay"], "delivery_type": "publish", "encoded": false }, diff --git a/examples/mas-dt/platform_status_branch.json b/examples/mas-dt/platform_status_branch.json index e21356d3daff0c6687d6c8d2f83e7a4a7f36ab4e..ad793df4b0464f52ad2bb2d1e57e1fac7d9d8842 100644 --- a/examples/mas-dt/platform_status_branch.json +++ b/examples/mas-dt/platform_status_branch.json @@ -5,6 +5,7 @@ "version": "dev", "source": "noc-sfmc", "destination": "mas-dt.noc.slocum.unit_xxx.from_platform.platform_status", + "route": ["proj-x-relay", "internal-relay"], "delivery_type": "publish", "encoded": false }, diff --git a/examples/mas-dt/platform_status_commit.json b/examples/mas-dt/platform_status_commit.json index 27e0e5cc371860635f1f7cddfd1859f50bfc91d8..c6cb45b4f371e30ad037a1c53d56a4c93ee2b499 100644 --- a/examples/mas-dt/platform_status_commit.json +++ b/examples/mas-dt/platform_status_commit.json @@ -5,6 +5,7 @@ "version": "2bbede2412f9038c0b1ecd8c2965532ea97264a3", "source": "noc-sfmc", "destination": "mas-dt.noc.slocum.unit_xxx.from_platform.platform_status", + "route": ["mas-dt-relay", "internal-relay"], "delivery_type": "publish", "encoded": false }, diff --git a/examples/mas-dt/platform_status_semver.json b/examples/mas-dt/platform_status_semver.json index a620dae98fc2ac8a8fcd9761b480e8b688b9dab7..b04d33d969a27ae5ec73b6f66a3308a9b692916b 100644 --- a/examples/mas-dt/platform_status_semver.json +++ b/examples/mas-dt/platform_status_semver.json @@ -5,6 +5,7 @@ "version": "v2.0.0-beta.9", "source": "noc-sfmc", "destination": "mas-dt.noc.slocum.unit_xxx.from_platform.platform_status", + "route": ["proj-x-relay", "internal-relay"], "delivery_type": "publish", "encoded": false }, diff --git a/examples/mas-dt/waypoints_geojson.json b/examples/mas-dt/waypoints_geojson.json index 534b619c33aedb0f663ac92cdf7123b6b0131866..c3a00cf0a79f05686e3d9d4ee6fb8d70f88d80fd 100644 --- a/examples/mas-dt/waypoints_geojson.json +++ b/examples/mas-dt/waypoints_geojson.json @@ -5,6 +5,7 @@ "version": "v2.0.0-beta.1", "source": "noc-sfmc", "destination": "mas-dt.noc.slocum.unit_xxx.from_platform.waypoints", + "route": ["proj-x-relay", "internal-relay"], "delivery_type": "publish", "encoded": false }, diff --git a/examples/mas-dt/waypoints_props.json b/examples/mas-dt/waypoints_props.json index 3f210b3f42770a5c01a4a4be118bd1f67b258eb7..7d42809aaed42eed309c6464d36234484fb253fe 100644 --- a/examples/mas-dt/waypoints_props.json +++ b/examples/mas-dt/waypoints_props.json @@ -5,6 +5,7 @@ "version": "v2.0.0-beta.1", "source": "noc-sfmc", "destination": "mas-dt.noc.slocum.unit_xxx.from_platform.waypoints", + "route": ["proj-x-relay", "internal-relay"], "delivery_type": "publish", "encoded": false }, diff --git a/formats/header.py b/formats/header.py index d20f698305cf209bb185720d67abcc216d088ca4..1dbbb0ddead2caf07ba9cd0930af3f80f87af634 100644 --- a/formats/header.py +++ b/formats/header.py @@ -1,3 +1,9 @@ +route_clients = { + "type": "string", + "description": "Client-ID", + "example": "proj-x-relay", +} + message_header = { "type": "object", "properties": { @@ -25,6 +31,11 @@ message_header = { + " of this message", "example": "ah1", }, + "route": { + "type": "array", + "items": route_clients, + "description": "Client-IDs of adapter between forwarding the message between the source adapter and destination adapter", + }, "encoded": { "type": "boolean", "description": "Indicate that message raw (encoded) or decoded. " diff --git a/project/soar/swagger.json b/project/soar/swagger.json index bc8ec364dbb3ae76a88c89607ee3bda39a81c7c0..881cface3cda30b304312e3e19a65107d6cfcab5 100644 --- a/project/soar/swagger.json +++ b/project/soar/swagger.json @@ -1502,6 +1502,15 @@ "pattern": "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", "type": "string" }, + "route": { + "description": "Client-IDs of adapter between forwarding the message between the source adapter and destination adapter", + "items": { + "description": "Client-ID", + "example": "proj-x-relay", + "type": "string" + }, + "type": "array" + }, "source": { "description": "The sender; Where is this message from", "example": "autonomy_engine",