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
  • !42

Merged
Created 8 months ago by Dan Jones@danjonOwner

Resolve "MAS-DT define instruction set and instructions"

  • Overview 16
  • Commits 9
  • Pipelines 13
  • Changes 8
1 unresolved thread

Closes #62 (closed)

Edited 8 months ago by Dan Jones
  • Dan Jones @danjon changed milestone to %CB-2024W35 8 months ago

    changed milestone to %CB-2024W35

  • Dan Jones @danjon added Partner::NOC Project::MAS-DT Status::Sprint Priority Weight::3 labels 8 months ago

    added Partner::NOC Project::MAS-DT Status::Sprint Priority Weight::3 labels

  • Dan Jones @danjon removed Status::Sprint Priority label 8 months ago

    removed Status::Sprint Priority label

  • Dan Jones @danjon added Status::In Progress label 8 months ago

    added Status::In Progress label

  • Dan Jones @danjon added 2 commits 8 months ago

    added 2 commits

    • 1f8b9b01 - feat: instruction_set payload schema and example
    • 16b4dd1a - chore: lint with black

    Compare with previous version

  • Dan Jones @danjon added 2 commits 8 months ago

    added 2 commits

    • 1701c174 - feat: add instructions to planning_configuration
    • 158c7f72 - chore: lint with black

    Compare with previous version

  • Dan Jones @danjon marked this merge request as ready 8 months ago

    marked this merge request as ready

  • Dan Jones @danjon added 2 commits 8 months ago

    added 2 commits

    • d2171080 - feat: add parameter values to instruction set
    • e67d303e - chore: lint with black.

    Compare with previous version

  • Dan Jones
    Dan Jones @danjon started a thread on the diff 8 months ago
    Resolved by Trishna Saeharaseelan 7 months ago
  • Dan Jones @danjon deleted the 70-refactor-geojson-loading-for-serving-from-nucleus branch. This merge request now targets the 67-mas-dt branch 8 months ago

    deleted the 70-refactor-geojson-loading-for-serving-from-nucleus branch. This merge request now targets the 67-mas-dt branch

  • Dan Jones @danjon added 34 commits 8 months ago

    added 34 commits

    • e67d303e...52334de6 - 28 commits from branch 67-mas-dt
    • 9717d7b8 - feat: instruction_set payload schema and example
    • f5f01deb - chore: lint with black
    • 41b3bbd9 - feat: add instructions to planning_configuration
    • 50defa33 - chore: lint with black
    • cd46d487 - feat: add parameter values to instruction set
    • bc796ed1 - chore: lint with black.

    Compare with previous version

    Toggle commit list
  • Dan Jones @danjon added 1 commit 8 months ago

    added 1 commit

    • 9f75c458 - refactor: update configuration with primitives

    Compare with previous version

  • Dan Jones @danjon added 10 commits 7 months ago

    added 10 commits

    • 9f75c458...795b55a6 - 3 commits from branch 67-mas-dt
    • 5c3376af - feat: instruction_set payload schema and example
    • 36e656e2 - chore: lint with black
    • e13334ba - feat: add instructions to planning_configuration
    • 8fc55010 - chore: lint with black
    • f204618e - feat: add parameter values to instruction set
    • 3a798223 - chore: lint with black.
    • b2d333af - refactor: update configuration with primitives

    Compare with previous version

    Toggle commit list
  • Dan Jones @danjon added 1 commit 7 months ago

    added 1 commit

    • 3d721254 - docs: add changelog for instruction set message

    Compare with previous version

  • Dan Jones @danjon added 1 commit 7 months ago

    added 1 commit

    • b0bea3fa - chore: update soar swagger compiled schema

    Compare with previous version

  • Trishna Saeharaseelan
    Trishna Saeharaseelan @trishna started a thread on the diff 7 months ago
    Resolved by Trishna Saeharaseelan 7 months ago
  • Trishna Saeharaseelan
    Trishna Saeharaseelan @trishna started a thread on the diff 7 months ago
    Resolved by Trishna Saeharaseelan 7 months ago
  • Trishna Saeharaseelan
    Trishna Saeharaseelan @trishna started a thread on the diff 7 months ago
    Resolved by Trishna Saeharaseelan 7 months ago
  • Dan Jones @danjon added 14 commits 7 months ago

    added 14 commits

    • b0bea3fa...eec6dc80 - 5 commits from branch 67-mas-dt
    • a428a7c8 - feat: instruction_set payload schema and example
    • bd027561 - chore: lint with black
    • d962cb1c - feat: add instructions to planning_configuration
    • 8c7e0a4a - chore: lint with black
    • 2ef724e7 - feat: add parameter values to instruction set
    • 096141f3 - chore: lint with black.
    • d2d74785 - refactor: update configuration with primitives
    • da17d70c - docs: add changelog for instruction set message
    • 27ab11cb - chore: update soar swagger compiled schema

    Compare with previous version

    Toggle commit list
  • Dan Jones @danjon added 12 commits 7 months ago

    added 12 commits

    • 27ab11cb...ee5e43ba - 3 commits from branch 67-mas-dt
    • 370ed1a8 - feat: instruction_set payload schema and example
    • 4c464dde - chore: lint with black
    • d6da9ae8 - feat: add instructions to planning_configuration
    • 43e19e45 - chore: lint with black
    • 71fc6f3d - feat: add parameter values to instruction set
    • e6fe49a8 - chore: lint with black.
    • ca63ff17 - refactor: update configuration with primitives
    • f0d0b460 - docs: add changelog for instruction set message
    • b33bb4f7 - chore: update soar swagger compiled schema

    Compare with previous version

    Toggle commit list
  • Dan Jones @danjon added 1 commit 7 months ago

    added 1 commit

    • 30e1c2bc - chore: update example planning_configuration

    Compare with previous version

  • Dan Jones @danjon added 12 commits 7 months ago

    added 12 commits

    • 30e1c2bc...95cfc66d - 3 commits from branch 67-mas-dt
    • 0a22a2ac - feat: instruction_set payload schema and example
    • 46d5c8b7 - chore: lint with black
    • f06083bb - feat: add instructions to planning_configuration
    • 521d103e - chore: lint with black
    • 7fc0da98 - feat: add parameter values to instruction set
    • ff28e576 - chore: lint with black.
    • 5e33d5a4 - docs: add changelog for instruction set message
    • aeea18c8 - chore: update soar swagger compiled schema
    • da426240 - chore: update example planning_configuration

    Compare with previous version

    Toggle commit list
  • Ashley Morris :potato: @ashmorr requested review from @trishna 7 months ago

    requested review from @trishna

  • Trishna Saeharaseelan @trishna resolved all threads 7 months ago

    resolved all threads

  • Trishna Saeharaseelan @trishna approved this merge request 7 months ago

    approved this merge request

  • Dan Jones @danjon mentioned in commit 4fd9f7f1 7 months ago

    mentioned in commit 4fd9f7f1

  • Dan Jones @danjon merged 7 months ago

    merged

  • Owain Jones
    Owain Jones @owanes started a thread on the diff 7 months ago
    Last updated by Dan Jones 7 months ago
    examples/mas-dt/instruction_set.json
    1 {
    2 "header": {
    3 "message_ID": "b427003c-0000-11aa-a1eb-bvcdfghjgfdd",
    4 "timestamp": "2024-09-03T00:00:00Z",
    5 "version": 1,
    6 "source": "ori",
    7 "destination": "internal.noc.slocum.unit_111.to_platform.instruction_set",
    8 "delivery_type": "publish",
    9 "encoded": false
    10 },
    11 "payload": {
    • Owain Jones
      Owain Jones @owanes · 7 months ago
      Owner

      Ah! I don't know how I missed this before, but there's no platform_ID in the payload like there is with mission plans! In testing I was adding my own platform_ID to the messages without thinking of the fact it's not there.......

      It's implied from the destination topic, slocum.unit_111 -- so I can work around that in sfmc-adapter (extract from destination when platform_ID is missing) for now but I think these messages probably do need platform_ID

    • Dan Jones
      Dan Jones @danjon · 7 months ago
      Owner

      Oh crap yeah. That's not right is it? I was hoping that they could just send the instruction set payload from the planning_configuration unaltered which kinda makes sense for MAS-DT/MOGli where there is only one glider but doesn't work in the general case.

    • Dan Jones
      Dan Jones @danjon · 7 months ago
      Owner

      We could make the instruction_set a sub-schema within something like a platform_instruction_set message so they build the message payload with the platform_ID and then just attach the pre-defined instruction_set?

    • Owain Jones
      Owain Jones @owanes · 7 months ago
      Owner

      So:

      {
       "payload": {
        "message_type": "platform_instruction_set",
        "platform_ID": "unit_111",
        "instruction_set": {...}
       }
      }

      ?

      That'd work. imo I think it's simpler to just add platform_ID to the instruction sets themselves, it's not onerous to add a field to a bit of JSON being sent. Plus they still need to build up the destination string when publishing the message, right? (So already doing the work of knowing what glider to send it to etc)

      Up to you. If you stick to the structure above I can quickly add in some code on sfmc-adapter side to handle platform_instruction_set. Alternatively, if adding platform_ID to instruction_set as-is, I've already updated it to handle that, and falling back to getting platform ID from the destination topic when that doesn't exist. So it'll work as-is as long as they publish to the right channel.

      Edited by Owain Jones 7 months ago
    • Dan Jones
      Dan Jones @danjon · 7 months ago
      Owner

      I think the reason I was thinking about the sub-schema is that we can't specify the platform_ID in the version we send in the planning_configuration.instructions so if it's the same thing then the platform_ID can't be required. Whereas if I make it a section within the message payload then the platform_ID in the message can be a required field.

    • Please register or sign in to reply
  • 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 14
    30e1c2bc
    7 months ago

  • version 13
    b33bb4f7
    7 months ago

  • version 12
    27ab11cb
    7 months ago

  • version 11
    b0bea3fa
    7 months ago

  • version 10
    3d721254
    7 months ago

  • version 9
    b2d333af
    7 months ago

  • version 8
    9f75c458
    8 months ago

  • version 7
    bc796ed1
    8 months ago

  • version 6
    e67d303e
    8 months ago

  • version 5
    e67d303e
    8 months ago

  • version 4
    e67d303e
    8 months ago

  • version 3
    158c7f72
    8 months ago

  • version 2
    16b4dd1a
    8 months ago

  • version 1
    16b4dd1a
    8 months ago

  • 67-mas-dt (base)

and
  • latest version
    da426240
    9 commits, 7 months ago

  • version 14
    30e1c2bc
    10 commits, 7 months ago

  • version 13
    b33bb4f7
    9 commits, 7 months ago

  • version 12
    27ab11cb
    9 commits, 7 months ago

  • version 11
    b0bea3fa
    9 commits, 7 months ago

  • version 10
    3d721254
    8 commits, 7 months ago

  • version 9
    b2d333af
    7 commits, 7 months ago

  • version 8
    9f75c458
    7 commits, 8 months ago

  • version 7
    bc796ed1
    6 commits, 8 months ago

  • version 6
    e67d303e
    23 commits, 8 months ago

  • version 5
    e67d303e
    23 commits, 8 months ago

  • version 4
    e67d303e
    23 commits, 8 months ago

  • version 3
    158c7f72
    21 commits, 8 months ago

  • version 2
    16b4dd1a
    19 commits, 8 months ago

  • version 1
    16b4dd1a
    2 commits, 8 months ago

Assignee
Dan Jones's avatar
Dan Jones
@danjon
Assign to
Reviewer
Trishna Saeharaseelan's avatar
@trishna
Request review from
CB-2024W35
Milestone
CB-2024W35 (Past due)
Assign milestone
None
Time tracking
No estimate or time spent
4
Labels
Partner::NOC Project::MAS-DT Status::In Progress Weight::3
Assign labels
  • No matching results
  • Manage project labels
Lock merge request
Unlocked
4
4 participants
user avatar
user avatar
user avatar
user avatar
Reference: communications-backbone-system/backbone-message-format!42
Source branch: 62-mas-dt-define-instruction-set-and-instructions

    0 pending comments