Skip to content

GitLab

Commit ab272781 authored by Ashley Morris's avatar Ashley Morris :potato:
Browse files

Merge branch '19-refactor-tests' into 'dev' 

Resolve "Refactor test to not allow schema validation for additional properties & examples"

Closes #19

See merge request !9
parents 50676c6d c7e310ae
dev 21-fix-git-raw-swagger-url 26-add-battery-endurance-for-platform-schema-in-planning-configuration 41-add-optional-operating_area-as-a-wider-zone-outside-region_of_interest 42-add-event-details-and-status-to-acknowledgement-schema 66-tag-current-dev-as-version-1 76-should-depth-and-altitude-be-coordinates 80-add-informational-type-primitive 87-remove-comment-for-platform-status-state 87-remove-todo-comment-from-platform-state action-refactor-test ci-js-test master missionmonitor 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 v2.0.0-beta.1 v1.0.0 v0.2.0 v0.1.0
2 merge requests!16Resolve "Release v0.1",!9Resolve "Refactor test to not allow schema validation for additional properties & examples"
Pipeline #109159 passed with stages
in 1 minute and 48 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 54 deletions
.gitignore
View file @ ab272781
formats/__pycache__
__pycache__/
*.pyc
__init__.py
View file @ ab272781
......@@ -4,6 +4,8 @@ from flask import Flask
__all__ = [
"formats",
"examples",
"projects",
"tests",
]
app = Flask(__name__)
......
examples/__init__.py 0 → 100644
View file @ ab272781
examples/autonomy_engine_adapter/acknowledgement.json
View file @ ab272781
......@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 1,
"source": "hydrosurv_adapter",
"destination": "autonomy_engine",
"destination": "soar.hydrosurv.reav.reav1.receive.acknowledgement",
"delivery_type": "publish",
"encoded": false
},
......
examples/autonomy_engine_adapter/mission_plan_AH1.json
View file @ ab272781
......@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "autonomy_engine",
"destination": "noc_c2",
"destination": "soar.noc.autosub.alr-52.send.mission_plan",
"delivery_type": "publish",
"encoded": false
},
......
examples/autonomy_engine_adapter/mission_plan_ECOSUB.json
View file @ ab272781
......@@ -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
},
......
examples/autonomy_engine_adapter/mission_plan_HYDROSURV.json
View file @ ab272781
......@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "autonomy_engine",
"destination": "hydrosurv_adapter",
"destination": "soar.hydrosurv.reav-60.reav-60-1.send.mission_plan",
"delivery_type": "publish",
"encoded": false
},
......@@ -14,20 +14,14 @@
"autonomy_engine_plan_ID": 1,
"plan": [
{
"start_point_latitude": -4.007143188645706,
"start_point_longitude": 50.37072283932642,
"target_waypoint_latitude": -4.187143188645706,
"target_waypoint_longitude": 50.37072283932642
},
{
"start_point_latitude": -4.187143188645706,
"start_point_longitude": 50.37072283932642,
"target_waypoint_latitude": -3.187143188645706,
"target_waypoint_longitude": 51.37072283932642
},
{
"start_point_latitude": -3.187143188645706,
"start_point_longitude": 51.37072283932642,
"target_waypoint_latitude": -3.237143188645706,
"target_waypoint_longitude": 52.37072283932642
}
......
examples/autonomy_engine_adapter/planning_configuration.json
View file @ ab272781
......@@ -3,13 +3,13 @@
"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.all.all.all.receive.planning_configuration",
"delivery_type": "publish",
"encoded": false
},
"payload":{
"message_type": "platform_status",
"message_type": "planning_configuration",
"planning_config_ID": 3,
"exclusion_zones": [
{
......@@ -126,8 +126,7 @@
"swath_width": 10
}
}
],
"region_of_interest": {}
]
},
{
"squad_ID": 3,
......@@ -153,8 +152,7 @@
"scan_type": "MBES"
}
}
],
"region_of_interest": {}
]
}
]
}
......
examples/autonomy_engine_adapter/platform_status-from_usbl_example.json
View file @ ab272781
......@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "hermes",
"destination": "autonomy_engine",
"destination": "soar.planet-ocean.ecosub.ecosub-5.receive.platform_status",
"delivery_type": "publish",
"encoded": false
},
......
examples/autonomy_engine_adapter/platform_status.json
View file @ ab272781
......@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "ecosub_c2",
"destination": "autonomy_engine",
"destination": "soar.planet-ocean.ecosub.ecosub-2.receive.platform_status",
"delivery_type": "publish",
"encoded": false
},
......@@ -15,7 +15,6 @@
"status_source": "onboard_platform",
"autonomy_engine_plan_ID": 1,
"battery_remaining_capacity": 80.2,
"active": true,
"platform_state": "ABORT",
"mission_plan_ID": 1,
"mission_track_ID": 4,
......@@ -30,8 +29,7 @@
"usbl_fix_seconds_ago": 0,
"range_to_go": 124.3,
"sensor_config": {
"sensor_ID": 22,
"serial": "sidescan-2x",
"sensor_serial": "sidescan-2x",
"sensor_on": true,
"additional_data": {
"whiskers_on": true
......
examples/ecosub_adapter/mission_plan.json
View file @ ab272781
......@@ -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
},
......
examples/ecosub_adapter/observation.json
View file @ ab272781
......@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "ecosub_c2",
"destination": "autonomy_engine",
"destination": "soar.planet-ocean.ecosub.ecosub-2.receive.observation",
"delivery_type": "publish",
"encoded": false
},
......@@ -22,7 +22,6 @@
"longitude": -11.122,
"quality_of_point": 0.50
}
],
"region_surveyed": ""
]
}
}
\ No newline at end of file
examples/ecosub_adapter/platform_status-from_usbl_example.json
View file @ ab272781
......@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "hermes",
"destination": "autonomy_engine",
"destination": "soar.planet-ocean.ecosub.ecosub-5.receive.platform_status",
"delivery_type": "publish",
"encoded": false
},
......
examples/ecosub_adapter/platform_status.json
View file @ ab272781
......@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "ecosub_c2",
"destination": "autonomy_engine",
"destination": "soar.planet-ocean.ecosub.ecosub-2.receive.platform_status",
"delivery_type": "publish",
"encoded": false
},
......@@ -15,7 +15,6 @@
"status_source": "onboard_platform",
"autonomy_engine_plan_ID": 1,
"battery_remaining_capacity": 80.2,
"active": true,
"platform_state": "ABORT",
"mission_plan_ID": 1,
"mission_track_ID": 4,
......@@ -30,8 +29,7 @@
"usbl_fix_seconds_ago": 0,
"range_to_go": 124.3,
"sensor_config": {
"sensor_ID": 22,
"serial": "sidescan-2x",
"sensor_serial": "sidescan-2x",
"sensor_on": true,
"additional_data": {
"whiskers_on": true
......
examples/gui_adapter/planning_configuration.json
View file @ ab272781
......@@ -3,13 +3,13 @@
"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.all.all.all.receive.planning_configuration",
"delivery_type": "publish",
"encoded": false
},
"payload":{
"message_type": "platform_status",
"message_type": "planning_configuration",
"planning_config_ID": 3,
"exclusion_zones": [
{
......@@ -47,7 +47,6 @@
"platform_ID": "reav-60-1",
"serial": "reav-60",
"emergency": {
"additional_data": {},
"target_waypoint_latitude": -7.432,
"target_waypoint_longitude": 50.365,
"safe_command": "go_home",
......@@ -55,8 +54,7 @@
},
"max_velocity": 0.9,
"min_altitude": 15.2,
"min_velocity": 0.1,
"additional_data": {}
"min_velocity": 0.1
}
],
"region_of_interest": {
......@@ -93,7 +91,6 @@
"serial": "ecosub-2",
"model": "ecosub",
"emergency": {
"additional_data": {},
"target_waypoint_latitude": -7.432,
"target_waypoint_longitude": 50.365,
"safe_command": "go_home",
......@@ -126,8 +123,7 @@
"swath_width": 10
}
}
],
"region_of_interest": {}
]
},
{
"squad_ID": 3,
......@@ -153,8 +149,7 @@
"scan_type": "MBES"
}
}
],
"region_of_interest": {}
]
}
]
}
......
examples/hydrosurv_adapter/acknowledgement.json
View file @ ab272781
......@@ -4,14 +4,14 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 1,
"source": "hydrosurv_adapter",
"destination": "autonomy_engine",
"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
examples/hydrosurv_adapter/mission_plan.json
View file @ ab272781
......@@ -4,7 +4,7 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "autonomy_engine",
"destination": "hydrosurv_adapter",
"destination": "soar.hydrosurv.reav-60.reav-60-1.send.mission_plan",
"delivery_type": "publish",
"encoded": false
},
......@@ -14,20 +14,14 @@
"autonomy_engine_plan_ID": 1,
"plan": [
{
"start_point_latitude": -4.007143188645706,
"start_point_longitude": 50.37072283932642,
"target_waypoint_latitude": -4.187143188645706,
"target_waypoint_longitude": 50.37072283932642
},
{
"start_point_latitude": -4.187143188645706,
"start_point_longitude": 50.37072283932642,
"target_waypoint_latitude": -3.187143188645706,
"target_waypoint_longitude": 51.37072283932642
},
{
"start_point_latitude": -3.187143188645706,
"start_point_longitude": 51.37072283932642,
"target_waypoint_latitude": -3.237143188645706,
"target_waypoint_longitude": 52.37072283932642
}
......
examples/hydrosurv_adapter/platform_status.json
View file @ ab272781
......@@ -4,14 +4,13 @@
"timestamp": "2022-11-16T00:00:00Z",
"version": 2,
"source": "hydrosurv_adapter",
"destination": "autonomy_engine",
"destination": "soar.hydrosurv.reav-60.reav-60-1.receive.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,
......
formats/acknowledgement.py
View file @ ab272781
......@@ -9,6 +9,7 @@ acknowledgement_schema = {
"type": "string",
"description": "Type of message",
"example": "acknowledgement",
"enum": ["acknowledgement"],
},
"autonomy_engine_plan_ID": {
"type": "integer",
......
formats/mission_plan.py
View file @ ab272781
......@@ -81,6 +81,7 @@ mission_plan_schema = {
"type": "string",
"description": "Type of message",
"example": "mission_plan",
"enum": ["mission_plan"],
},
"autonomy_engine_plan_ID": {
"type": "integer",
......
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