Skip to content

GitLab

Commit 795b55a6 authored by Dan Jones's avatar Dan Jones
Browse files

Merge branch '73-mas-dt-update-version-in-header-to-allow-semver' into '67-mas-dt' 

Resolve "MAS-DT update version in header to allow semver"

See merge request !44
parents 52334de6 20e7a6b7
dev 80-add-informational-type-primitive 87-remove-comment-for-platform-status-state action-refactor-test master v2.0.0 v2.0.0-beta.11 v2.0.0-beta.10 v2.0.0-beta.9 v2.0.0-beta.8 v2.0.0-beta.7 v2.0.0-beta.6 v2.0.0-beta.5 v2.0.0-beta.4 v2.0.0-beta.3 v2.0.0-beta.2
3 merge requests!59Release v2.0.0,!44Resolve "MAS-DT update version in header to allow semver",!36Resolve "Create temporary mas-dt branch for initial schema refactor"
Pipeline #232085 passed with stages
in 2 minutes and 20 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 287 additions and 109 deletions
CHANGELOG.md
View file @ 795b55a6
...@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ...@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Changed ### Changed
- Updated header version to accept semver, branch or commit
- Store remote schemas as committed local files - Store remote schemas as committed local files
This prevents the live runtime loading untested changes This prevents the live runtime loading untested changes
- Refactored planning_configuration message definition - Refactored planning_configuration message definition
......
examples/mas-dt/platform_status_branch.json 0 → 100644
View file @ 795b55a6
{
"header":{
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd",
"timestamp": "2024-09-05T00:00:00Z",
"version": "dev",
"source": "noc-sfmc",
"destination": "mas-dt.noc.slocum.unit_xxx.from_platform.platform_status",
"delivery_type": "publish",
"encoded": false
},
"payload":{
"message_type": "platform_status",
"platform_ID": "unit_xxx",
"platform_timestamp": "2024-09-05T00:00:00Z",
"status_source": "onboard_platform",
"autonomy_engine_plan_ID": 1,
"mission_plan_ID": 1,
"mission_track_ID": 4,
"latitude": 78.2,
"longitude": -10.122,
"depth": 50.0,
"altitude": 20
}
}
examples/mas-dt/platform_status_commit.json 0 → 100644
View file @ 795b55a6
{
"header":{
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd",
"timestamp": "2024-09-05T00:00:00Z",
"version": "2bbede2412f9038c0b1ecd8c2965532ea97264a3",
"source": "noc-sfmc",
"destination": "mas-dt.noc.slocum.unit_xxx.from_platform.platform_status",
"delivery_type": "publish",
"encoded": false
},
"payload":{
"message_type": "platform_status",
"platform_ID": "unit_xxx",
"platform_timestamp": "2024-09-05T00:00:00Z",
"status_source": "onboard_platform",
"autonomy_engine_plan_ID": 1,
"mission_plan_ID": 1,
"mission_track_ID": 4,
"latitude": 78.2,
"longitude": -10.122,
"depth": 50.0,
"altitude": 20
}
}
examples/mas-dt/platform_status_semver.json 0 → 100644
View file @ 795b55a6
{
"header":{
"message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd",
"timestamp": "2024-09-05T00:00:00Z",
"version": "v2.0.0-beta.1",
"source": "noc-sfmc",
"destination": "mas-dt.noc.slocum.unit_xxx.from_platform.platform_status",
"delivery_type": "publish",
"encoded": false
},
"payload":{
"message_type": "platform_status",
"platform_ID": "unit_xxx",
"platform_timestamp": "2024-09-05T00:00:00Z",
"status_source": "onboard_platform",
"autonomy_engine_plan_ID": 1,
"mission_plan_ID": 1,
"mission_track_ID": 4,
"latitude": 78.2,
"longitude": -10.122,
"depth": 50.0,
"altitude": 20
}
}
formats/__init__.py
View file @ 795b55a6
...@@ -6,53 +6,3 @@ __all__ = [ ...@@ -6,53 +6,3 @@ __all__ = [
for x in os.listdir(os.path.dirname(__file__)) for x in os.listdir(os.path.dirname(__file__))
if x.endswith(".py") and x != "__init__.py" if x.endswith(".py") and x != "__init__.py"
] ]
message_header = {
"type": "object",
"discriminator": {
"propertyName": "message_type",
},
"properties": {
"message_ID": {
"type": "string",
"description": "An identifier for the type of message received.",
"example": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd",
},
"timestamp": {
"type": "string",
"format": "date-time",
"description": "Timestamp of message",
"example": "2022-11-16T00:00:00Z",
},
"version": {
"type": "number",
"format": "float",
"description": "Version of comms backbone message format protocol",
"example": 2.0,
},
"source": {
"type": "string",
"description": "The sender; Where is this message from",
"example": "autonomy_engine",
},
"destination": {
"type": "string",
"description": "Publisher topic; What is the destination"
+ " of this message",
"example": "ah1",
},
"encoded": {
"type": "boolean",
"description": "Indicate that message raw (encoded) or decoded. "
+ "Options: encoded=true, decoded=false",
"example": False,
},
"delivery_type": {
"type": "string",
"description": "To publish or broadcast this message.",
"enum": ["broadcast", "publish"],
"example": "publish",
"default": "publish",
},
},
}
formats/header.py 0 → 100644
View file @ 795b55a6
message_header = {
"type": "object",
"properties": {
"message_ID": {
"type": "string",
"description": "An identifier for the type of message received.",
"example": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd",
},
"timestamp": {
"type": "string",
"format": "date-time",
"description": "Timestamp of message",
"example": "2022-11-16T00:00:00Z",
},
"source": {
"type": "string",
"description": "The sender; Where is this message from",
"example": "autonomy_engine",
},
"destination": {
"type": "string",
"description": "Publisher topic; What is the destination"
+ " of this message",
"example": "ah1",
},
"encoded": {
"type": "boolean",
"description": "Indicate that message raw (encoded) or decoded. "
+ "Options: encoded=true, decoded=false",
"example": False,
},
"delivery_type": {
"type": "string",
"description": "To publish or broadcast this message.",
"enum": ["broadcast", "publish"],
"example": "publish",
"default": "publish",
},
},
"oneOf": [
{
# semver pattern https://semver.org/
# https://regex101.com/r/Ly7O1x/3/
# + optionally include 'v' prefix
# escape backslashes get doubled so use char groups
# simplify to planned variants
"type": "object",
"properties": {
"version": {
"type": "string",
"pattern": "^(v{0,1}(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)"
+ "(?:-(alpha|beta)[.](0|[1-9][0-9]*))?)$",
}
},
"required": ["version"],
},
{
# commit ref
"type": "object",
"properties": {
"version": {
"type": "string",
"pattern": "^([0-9a-f]+)$",
}
},
"required": ["version"],
},
{
# reserved word
"type": "object",
"properties": {
"version": {
"type": "string",
"enum": ["dev", "master", "latest"],
}
},
"required": ["version"],
},
{
# existing float version
"type": "object",
"properties": {
"version": {
"type": "number",
"format": "float",
"example": 2.0,
}
},
"required": ["version"],
},
],
"required": [
"message_ID",
"timestamp",
"source",
"destination",
"delivery_type",
"encoded",
],
}
formats/message.py 0 → 100644
View file @ 795b55a6
message_schema = {
"type": "object",
"description": "Full message definition with"
+ " message-metadata in `header` and different"
+ " message type schemas under `payload`",
"properties": {
"header": {
"$ref": "#/components/schemas/header",
},
"payload": {"$ref": "#/components/schemas/payload"},
},
"required": ["header", "payload"],
}
formats/payload.py 0 → 100644
View file @ 795b55a6
payload_schema = {
"discriminator": {
"propertyName": "message_type",
"mapping": {
"alert": "#/components/schemas/alert",
"mission_plan": "#/components/schemas/mission_plan",
"mission_plan_encoded": "#/components/schemas/" + "mission_plan_encoded",
"observation": "#/components/schemas/observation",
"observation_encoded": "#/components/schemas/" + "observation_encoded",
"planning_configuration": "#/components/schemas/"
+ "planning_configuration",
"platform_status": "#/components/schemas/platform_status",
"platform_status_encoded": "#/components/schemas/"
+ "platform_status_encoded",
"acknowledgement": "#/components/schemas/acknowledgement",
"survey": "#/components/schemas/survey",
"survey_encoded": "#/components/schemas/" + "survey_encoded",
},
},
"oneOf": [
{"$ref": "#/components/schemas/alert"},
{"$ref": "#/components/schemas/acknowledgement"},
{"$ref": "#/components/schemas/mission_plan"},
{"$ref": "#/components/schemas/mission_plan_encoded"},
{"$ref": "#/components/schemas/observation"},
{"$ref": "#/components/schemas/observation_encoded"},
{"$ref": "#/components/schemas/planning_configuration"},
{"$ref": "#/components/schemas/platform_status"},
{"$ref": "#/components/schemas/platform_status_encoded"},
{"$ref": "#/components/schemas/survey"},
{"$ref": "#/components/schemas/survey_encoded"},
],
}
generate_schema_config.py
View file @ 795b55a6
from formats import message_header from formats.header import message_header
from formats.message import message_schema
from formats.mission_plan import mission_plan_schema from formats.mission_plan import mission_plan_schema
from formats.mission_plan_encoded import mission_plan_encoded_schema from formats.mission_plan_encoded import mission_plan_encoded_schema
from formats.observation import observation_schema from formats.observation import observation_schema
from formats.observation_encoded import observation_encoded_schema from formats.observation_encoded import observation_encoded_schema
from formats.payload import payload_schema
from formats.planning_configuration import planning_configuration_schema from formats.planning_configuration import planning_configuration_schema
from formats.platform_status import platform_status_schema from formats.platform_status import platform_status_schema
from formats.platform_status_encoded import platform_status_encoded_schema from formats.platform_status_encoded import platform_status_encoded_schema
...@@ -55,56 +57,9 @@ def get_swagger_config(reload=False): ...@@ -55,56 +57,9 @@ def get_swagger_config(reload=False):
"paths": {}, "paths": {},
"components": { "components": {
"schemas": { "schemas": {
"MESSAGE": { "MESSAGE": message_schema,
"type": "object",
"description": "Full message definition with"
+ " message-metadata in `header` and different"
+ " message type schemas under `payload`",
"properties": {
"header": {
"$ref": "#/components/schemas/header",
},
"payload": {"$ref": "#/components/schemas/payload"},
},
"required": ["header", "payload"],
},
"payload": {
"discriminator": {
"propertyName": "message_type",
"mapping": {
"alert": "#/components/schemas/alert",
"mission_plan": "#/components/schemas/mission_plan",
"mission_plan_encoded": "#/components/schemas/"
+ "mission_plan_encoded",
"observation": "#/components/schemas/observation",
"observation_encoded": "#/components/schemas/"
+ "observation_encoded",
"planning_configuration": "#/components/schemas/"
+ "planning_configuration",
"platform_status": "#/components/schemas/platform_status",
"platform_status_encoded": "#/components/schemas/"
+ "platform_status_encoded",
"acknowledgement": "#/components/schemas/acknowledgement",
"survey": "#/components/schemas/survey",
"survey_encoded": "#/components/schemas/"
+ "survey_encoded",
},
},
"oneOf": [
{"$ref": "#/components/schemas/alert"},
{"$ref": "#/components/schemas/acknowledgement"},
{"$ref": "#/components/schemas/mission_plan"},
{"$ref": "#/components/schemas/mission_plan_encoded"},
{"$ref": "#/components/schemas/observation"},
{"$ref": "#/components/schemas/observation_encoded"},
{"$ref": "#/components/schemas/planning_configuration"},
{"$ref": "#/components/schemas/platform_status"},
{"$ref": "#/components/schemas/platform_status_encoded"},
{"$ref": "#/components/schemas/survey"},
{"$ref": "#/components/schemas/survey_encoded"},
],
},
"header": message_header, "header": message_header,
"payload": payload_schema,
"mission_plan": mission_plan_schema, "mission_plan": mission_plan_schema,
"mission_plan_encoded": mission_plan_encoded_schema, "mission_plan_encoded": mission_plan_encoded_schema,
"observation": observation_schema, "observation": observation_schema,
......
project/soar/swagger.json
View file @ 795b55a6
...@@ -1343,9 +1343,61 @@ ...@@ -1343,9 +1343,61 @@
"type": "object" "type": "object"
}, },
"header": { "header": {
"discriminator": { "oneOf": [
"propertyName": "message_type" {
}, "properties": {
"version": {
"pattern": "^(v{0,1}(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)(?:-(alpha|beta)[.](0|[1-9][0-9]*))?)$",
"type": "string"
}
},
"required": [
"version"
],
"type": "object"
},
{
"properties": {
"version": {
"pattern": "^([0-9a-f]+)$",
"type": "string"
}
},
"required": [
"version"
],
"type": "object"
},
{
"properties": {
"version": {
"enum": [
"dev",
"master",
"latest"
],
"type": "string"
}
},
"required": [
"version"
],
"type": "object"
},
{
"properties": {
"version": {
"example": 2.0,
"format": "float",
"type": "number"
}
},
"required": [
"version"
],
"type": "object"
}
],
"properties": { "properties": {
"delivery_type": { "delivery_type": {
"default": "publish", "default": "publish",
...@@ -1382,14 +1434,16 @@ ...@@ -1382,14 +1434,16 @@
"example": "2022-11-16T00:00:00Z", "example": "2022-11-16T00:00:00Z",
"format": "date-time", "format": "date-time",
"type": "string" "type": "string"
},
"version": {
"description": "Version of comms backbone message format protocol",
"example": 2.0,
"format": "float",
"type": "number"
} }
}, },
"required": [
"message_ID",
"timestamp",
"source",
"destination",
"delivery_type",
"encoded"
],
"type": "object" "type": "object"
}, },
"mission_plan": { "mission_plan": {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment