Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
backbone-message-format backbone-message-format
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 29
    • Issues 29
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge requests 5
    • Merge requests 5
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Metrics
    • Incidents
    • Environments
  • Packages & Registries
    • Packages & Registries
    • Package Registry
  • Analytics
    • Analytics
    • CI/CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Communications Backbone System
  • backbone-message-formatbackbone-message-format
  • Merge requests
  • !29

Merged
Created 1 year ago by Dan Jones@danjonOwner

Resolve "SPINE Support"

  • Overview 6
  • Commits 4
  • Pipelines 3
  • Changes 9
3 unresolved threads

Closes #43 (closed)

Edited 1 year ago by Dan Jones
  • Dan Jones @danjon added 2 commits 1 year ago

    added 2 commits

    • e6b6c33c - feat: add spine alert message and status fields
    • 0bc01bdd - test: remove empty definitions from swagger.json

    Compare with previous version

  • Dan Jones @danjon added 1 commit 1 year ago

    added 1 commit

    • 9bf07ff3 - lint: run black

    Compare with previous version

  • Dan Jones @danjon marked this merge request as ready 1 year ago

    marked this merge request as ready

  • Dan Jones @danjon added Status::In Review label 1 year ago

    added Status::In Review label

  • Trishna Saeharaseelan
    Trishna Saeharaseelan @trishna started a thread on an old version of the diff 1 year ago
    Resolved by Trishna Saeharaseelan 1 year ago
  • Dan Jones @danjon added 1 commit 1 year ago

    added 1 commit

    • 7785a061 - fix: remove placeholder comments

    Compare with previous version

  • Trishna Saeharaseelan
    Trishna Saeharaseelan @trishna started a thread on the diff 1 year ago
    tests/fixtures/schemas.py
    591 592 "description": "Battery remaining % provided by respective C2",
    592 593 "example": 80.2,
    593 594 },
    595 # Battery power (kw / float)
    596 "battery_output": { # changed from battery_power
    597 "type": "number",
    598 "format": "float",
    599 "description": "Battery output in kW",
    600 "example": 80.2,
    601 },
    602 # Bunkers remaining capacity (litres, float)
    603 # Bunkers percentage full (percentage, float)
    604 # battery_remaining_capacity is % full if we want both these fields
    605 # these names are going to cause confusion
    • Trishna Saeharaseelan
      Trishna Saeharaseelan @trishna · 1 year ago
      Owner

      Sorry Dan, I meant all the comments. This as well

    • Please register or sign in to reply
  • Trishna Saeharaseelan
    Trishna Saeharaseelan @trishna started a thread on the diff 1 year ago
    tests/fixtures/schemas.py
    648 "type": "integer",
    649 "description": "Alert code",
    650 "example": 345,
    651 },
    652 "platform_ID": {
    653 "type": "string",
    654 "description": "Unique identifier for this platform",
    655 "example": "usvdecibel",
    656 },
    657 "platform_timestamp": {
    658 "type": "string",
    659 "format": "date-time",
    660 "description": "Timestamp for onboard platform status message",
    661 "example": "2022-12-21T00:00:00Z",
    662 },
    663 "subsystem": { # changed from suggested "source" could be device / subsystem or something
    • Trishna Saeharaseelan
      Trishna Saeharaseelan @trishna · 1 year ago
      Owner

      Comment to be removed

    • Please register or sign in to reply
  • Trishna Saeharaseelan
    Trishna Saeharaseelan @trishna started a thread on the diff 1 year ago
    tests/fixtures/schemas.py
    602 634 "longitude",
    603 635 ],
    604 636 }
    637
    638 alert_schema = {
    639 "type": "object",
    640 "properties": {
    641 "message_type": {
    642 "type": "string",
    643 "description": "Type of message",
    644 "example": "alert",
    645 "enum": ["alert"],
    646 },
    647 "code": { # changed from alert_ID because reasons
    • Trishna Saeharaseelan
      Trishna Saeharaseelan @trishna · 1 year ago
      Owner

      Comment to be removed

    • Please register or sign in to reply
  • Trishna Saeharaseelan
    Trishna Saeharaseelan @trishna · 1 year ago
    Owner

    MR looks good to me. Once comments that are removed, feel free to merge it!

  • Trishna Saeharaseelan @trishna approved this merge request 1 year ago

    approved this merge request

  • Dan Jones @danjon merged 1 year ago

    merged

  • Dan Jones @danjon mentioned in commit a0d9c041 1 year ago

    mentioned in commit a0d9c041

  • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
Please register or sign in to reply
Compare
  • version 2
    9bf07ff3
    1 year ago

  • version 1
    0bc01bdd
    1 year ago

  • dev (base)

and
  • latest version
    7785a061
    4 commits, 1 year ago

  • version 2
    9bf07ff3
    3 commits, 1 year ago

  • version 1
    0bc01bdd
    2 commits, 1 year ago

3 files
+ 17
- 21
Show latest version
    File browser
    Compare changes
for‎mats‎
aler‎t.py‎ +5 -5
platform_‎status.py‎ +3 -5
tests/f‎ixtures‎
schem‎as.py‎ +9 -11
formats/alert.py
+ 5
- 5
  • View file @ 9bf07ff3

  • Edit in single-file editor

  • Edit in Web IDE


Files with large changes are collapsed by default.

Show all unchanged lines Show 20 lines
"example": "alert",
"enum": ["alert"],
},
"code": { # changed from alert_ID because reasons
"code": { # changed from alert_ID because reasons
"type": "integer",
"description": "Alert code",
"example": 345,
Show 20 lines Show all unchanged lines Show 20 lines
"description": "Timestamp for onboard platform status message",
"example": "2022-12-21T00:00:00Z",
},
"subsystem": { # changed from suggested "source" could be device / subsystem or something
"subsystem": { # changed from suggested "source" could be device / subsystem or something
"type": "string",
"description": "System that generated the alert",
"example": "Onboard Fault Monitor",
"example": "Onboard Fault Monitor",
},
"summary": {
"type": "string",
Show 20 lines Show all unchanged lines Show 20 lines
"details": {
"type": "string",
"description": "Detailed reason for the alert ",
"example": "Discrepancy between rudder and actuator positions" +
" : Rudder Pos=10.31°, Steering Actuator Pos=28.65°, Discrepancy=18.33°",
"example": "Discrepancy between rudder and actuator positions"
+ " : Rudder Pos=10.31°, Steering Actuator Pos=28.65°, Discrepancy=18.33°",
},
"severity": {
"type": "string",
Show 20 lines Show all unchanged lines
formats/platform_status.py
+ 3
- 5
  • View file @ 9bf07ff3

  • Edit in single-file editor

  • Edit in Web IDE


Files with large changes are collapsed by default.

Show all unchanged lines Show 20 lines
"description": "Battery remaining % provided by respective C2",
"example": 80.2,
},
# Battery power (kw / float)
"battery_output": { # changed from battery_power
"battery_output": { # changed from battery_power
"type": "number",
"format": "float",
"description": "Battery output in kW",
Show 20 lines Show all unchanged lines Show 20 lines
},
# Bunkers remaining capacity (litres, float)
# Bunkers percentage full (percentage, float)
# battery_remaining_capacity is % full if we want both these fields
# battery_remaining_capacity is % full if we want both these fields
# these names are going to cause confusion
"fuel_remaining_capacity": {
"type": "number",
Show 20 lines Show all unchanged lines Show 20 lines
"endurance": {
"type": "number",
"format": "float",
"description": "Estimate of hours of operation remaining "
"description": "Estimate of hours of operation remaining "
+ "based on present output or performance",
"example": 7.4,
},
"sensor_config": sensor_schema,
},
"required": [
Show 20 lines Show all unchanged lines
tests/fixtures/schemas.py
+ 9
- 11
  • View file @ 9bf07ff3

  • Edit in single-file editor

  • Edit in Web IDE


Files with large changes are collapsed by default.

Show all unchanged lines Show 20 lines
"description": "Battery remaining % provided by respective C2",
"example": 80.2,
},
# Battery power (kw / float)
"battery_output": { # changed from battery_power
"battery_output": { # changed from battery_power
"type": "number",
"format": "float",
"description": "Battery output in kW",
Show 20 lines Show all unchanged lines Show 20 lines
},
# Bunkers remaining capacity (litres, float)
# Bunkers percentage full (percentage, float)
# battery_remaining_capacity is % full if we want both these fields
# battery_remaining_capacity is % full if we want both these fields
# these names are going to cause confusion
"fuel_remaining_capacity": {
"type": "number",
Show 20 lines Show all unchanged lines Show 20 lines
"endurance": {
"type": "number",
"format": "float",
"description": "Estimate of hours of operation remaining "
"description": "Estimate of hours of operation remaining "
+ "based on present output or performance",
"example": 7.4,
},
"sensor_config": sensor_schema,
},
"required": [
Show 20 lines Show all unchanged lines Show 20 lines
"example": "alert",
"enum": ["alert"],
},
"code": { # changed from alert_ID because reasons
"code": { # changed from alert_ID because reasons
"type": "integer",
"description": "Alert code",
"example": 345,
Show 20 lines Show all unchanged lines Show 20 lines
"description": "Timestamp for onboard platform status message",
"example": "2022-12-21T00:00:00Z",
},
"subsystem": { # changed from suggested "source" could be device / subsystem or something
"subsystem": { # changed from suggested "source" could be device / subsystem or something
"type": "string",
"description": "System that generated the alert",
"example": "Onboard Fault Monitor",
"example": "Onboard Fault Monitor",
},
"summary": {
"type": "string",
Show 20 lines Show all unchanged lines Show 20 lines
"details": {
"type": "string",
"description": "Detailed reason for the alert ",
"example": "Discrepancy between rudder and actuator positions" +
" : Rudder Pos=10.31°, Steering Actuator Pos=28.65°, Discrepancy=18.33°",
"example": "Discrepancy between rudder and actuator positions"
+ " : Rudder Pos=10.31°, Steering Actuator Pos=28.65°, Discrepancy=18.33°",
},
"severity": {
"type": "string",
Show 20 lines Show all unchanged lines Show 20 lines
"code",
"severity",
],
}
\ No newline at end of file
}
Assignee
Dan Jones's avatar
Dan Jones
@danjon
Assign to
0 Reviewers
None
Request review from
None
Milestone
None
Assign milestone
None
Time tracking
No estimate or time spent
1
Labels
Status::In Review
Assign labels
  • No matching results
  • Manage project labels
Lock merge request
Unlocked
2
2 participants
user avatar
user avatar
Reference: communications-backbone-system/backbone-message-format!29
Source branch: 43-spine-support

    0 pending comments