oxbrbtx/PrimAITE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,603 Commits 3 Branches 10 Tags
65dee930b191031e39950b6925eedbdfd9f3b722
Commit Graph

1738 Commits

Author SHA1 Message Date
Marek Wolan
fd2ad45059 Merge remote-tracking branch 'origin/dev' into feature/Updated-How-To-Guides 2025-03-07 13:41:12 +00:00
Archer Bowen
dd5571359a Merged PR 612: #2925 Use Case 7 Scenario Modelling 
## Summary
This PR contains the entirety of the #2925 UC7 implementation and updated to work with 4.0.0.

Specifically, this PR contains the following:

- New UC7 Scenario config (#2483)
- New UC7 TAP001 Config #2909
- New UC7 TAP003 Config #2910
- New UC7 default blue agent #3070
- New UC7 green agent POL #3067
- Multiple UC7 detailed diagrams #3068
- Multiple new UC7 notebooks #3069

## Test process

Pre-existing tests have been re-modelled to use UC7 as well as a few more new UC7 specific tests that ensure all of the expected default behaviour is working.

Additionally, multiple notebooks exist which utilise a large amount of the UC7 scenario and thus also act as tests.

## Checklist
- [X] PR is linked to a **work item**
- [X] **acceptance criteria** of linked ticket are met
- [ ] performed **self-review** of the code
- [X] written **tests** for any new functionality added with this PR
- [ ] updated the **documentation** if this PR changes or adds functionality
- [ ] written/updated **design docs** if this PR implements new functionality
- [ ] updated the **change log**
- [ ] ran **pre-commit** checks for code style
- [ ] attended to any **TO-DOs** left in the code

Related work items: #2483, #2909, #2910, #3067, #3068, #3069, #3070, #3071, #3086
 2025-03-07 13:41:12 +00:00
Archer Bowen
83c9a90c0a #20925 fixing failing notebook pipeline. 2025-03-07 13:41:12 +00:00
Archer Bowen
7b928696f6 #2725 Remove borked reload 2025-03-07 13:41:12 +00:00
Archer Bowen
be51d039c2 Moved red_scan_countdown into node class attributes. ( 2025-03-07 13:41:12 +00:00
Marek Wolan
f3cc4e8409 Fix red scan not happening 2025-03-07 13:41:12 +00:00
Archer Bowen
7f3d166de0 #2925 Replace try catch logic with a more elegant solution. 2025-03-07 13:41:12 +00:00
Archer Bowen
f532b5e0da #2925 Fixed TAP003 error and failing tests. 2025-03-07 13:41:12 +00:00
Marek Wolan
908dbe4722 fix show history 2025-03-07 13:41:12 +00:00
Archer Bowen
4e03d436ac Merge remote-tracking branch 'origin/dev' into UC7-migration 2025-03-07 13:41:12 +00:00
Archer Bowen
0b7cdd451b Merge branch 'dev' into UC7-migration 2025-03-07 13:41:12 +00:00
Archer Bowen
2662540965 Reviewing PR comments - #2925 !612 2025-03-07 13:41:12 +00:00
Archer Bowen
e45c2742cc #2925 Responding to a few more pr comments (general notebook clean up and improvement). 2025-03-07 13:41:12 +00:00
Archer Bowen
eec73deae7 #2925 Responding to PR comments. 2025-03-07 13:41:12 +00:00
Archer Bowen
43d58a7ca6 #2925 General Config fixes and node-os-scan bug fix implemented in the UC7-E2E-Demo notebook. 2025-03-07 13:41:12 +00:00
Marek Wolan
da60833abd Fix os scan action 2025-03-07 13:41:12 +00:00
Archer Bowen
d8b52012f5 #2925 Addressing PR comments. General config clean up and typos. 2025-03-07 13:41:12 +00:00
Archer Bowen
f6a6c3dde5 #2483 Addressed inconsistent naming schema. Now all some tech networks will be referenced using a underscore. E.g "ST-PROJ-A-PRV-PC-1" has now been changed to "ST_PROJ-A-PRV-PC-1". 2025-03-07 13:41:12 +00:00
Archer Bowen
80be1d5418 #2483- Slight updates to UC7 config and e2e notebook 2025-03-07 13:41:12 +00:00
Archer Bowen
6769bc917f Merge branch '4.0.0a1-dev' into UC7-migration 2025-03-07 13:41:12 +00:00
Marek Wolan
d8c8aa40a4 3086 UC7 Migration - All YAMLS, tests and notebooks. A few lingering issues such as the OS-SCAN not working and agent logs not appearing. 2025-03-07 13:40:50 +00:00
Marek Wolan
92af387e56 Remove buggy autoreload from notebook 2025-02-28 15:35:06 +00:00
Marek Wolan
75eb1050c9 Merged PR 621: Change acl observations to be less confusing 
Related work items: #2869, #2887, #3029, #3060, #3062, #3075, #3089
 2025-02-28 11:28:14 +00:00
Charlie Crane
110fc9243f Merge in updates from dev 2025-02-27 18:21:43 +00:00
Charlie Crane
1f6f007941 Updates to documentation and inclusion of how-to guides 2025-02-27 18:16:45 +00:00
Archer Bowen
3b4fb2d27f #3087 Addressing docustring TODO's and a few minor spelling mistakes. 2025-02-27 14:03:18 +00:00
Archer Bowen
f0c46cd90e Merge branch 'dev' into feature/3087-TAP-core-migration 2025-02-27 11:36:38 +00:00
Marek Wolan
98914ecdbb Merge remote-tracking branch 'origin/dev' into bugfix/3089-obs-index 2025-02-27 11:31:02 +00:00
Marek Wolan
2b04695c2e Apply suggestions from code review 2025-02-27 10:07:17 +00:00
Marek Wolan
a19ceada2c Change ACL observation to 0-index and remove weird off-by-one offset 2025-02-26 19:31:43 +00:00
Marek Wolan
bab4060378 Fix agent config in terminal processing notebook 2025-02-26 18:26:54 +00:00
Marek Wolan
8c399c4f61 Fix mismerge of c2 e2e notebook 2025-02-26 18:11:42 +00:00
Marek Wolan
b4b0f99c23 Fix mismerge of agent show_history method 2025-02-26 17:57:23 +00:00
Charlie Crane
891467d1d3 Revert changes to Command & control and Privilege jupyter notebooks 2025-02-26 15:44:06 +00:00
Marek Wolan
2bf118abc9 Merge remote-tracking branch 'origin/4.0.0a1-dev' into 4.0.0-dev 2025-02-26 15:33:50 +00:00
Charlie Crane
6b796608df Revert commit of output in Command and Control notebook 2025-02-26 15:32:50 +00:00
Archer Bowen
5ffde8a426 Merge branch '4.0.0a1-dev' into feature/3087-TAP-core-migration 2025-02-26 15:32:43 +00:00
Charlie Crane
7fe4915f42 Revisions to make the how-to guides show in navigation pane 2025-02-26 15:31:03 +00:00
Marek Wolan
9bb4442bbe Merge remote-tracking branch 'origin/dev' into 4.0.0-dev 2025-02-26 15:20:05 +00:00
Charlie Crane
0d93981ef8 Updates to documentation pages 2025-02-26 12:03:00 +00:00
Charlie Crane
7ec664ae67 Merge branch '4.0.0a1-dev' into feature/Updated-How-To-Guides 2025-02-26 11:02:51 +00:00
Charlie Crane
4268e387c4 Add custom how-to guides to documentation, additional notebook around how to use dev cli 2025-02-26 11:02:00 +00:00
Nick Todd
ea2c018b82 Merge branch 'feature/3075_Migrate_notebooks_to_MilPac_(Core_changes)' of ssh.dev.azure.com:v3/ma-dev-uk/PrimAITE/PrimAITE into feature/3075_Migrate_notebooks_to_MilPac_(Core_changes) 2025-02-25 14:28:17 +00:00
Nick Todd
892cdb82b9 #3075: Code review changes. 2025-02-25 14:25:27 +00:00
Archer Bowen
f5cfaeedab #3075 Cleaned up yaml snippets that were rendering as a strings. It seems that adding '...' to yaml snippets seems to end up causing the snippets to render as strings rather than actual yaml. 2025-02-21 14:57:48 +00:00
Nick Todd
72f80e55da #3075: Move demo notebook to correct folder. 2025-02-18 11:51:35 +00:00
Nick Todd
f7f46a2a3b Merge branch '4.0.0a1-dev' into feature/3075_Migrate_notebooks_to_MilPac_(Core_changes) 2025-02-18 11:48:26 +00:00
Nick Todd
8c7f8cd0ec #3075: Fix final two demo notebooks 2025-02-18 11:36:22 +00:00
Marek Wolan
46240e49a4 update tests and make office lan creation work like previously 2025-02-17 18:46:09 +00:00
Marek Wolan
cc9e73530c Merge remote-tracking branch 'origin/4.0.0a1-dev' into bugfix/network-setup 2025-02-17 18:16:21 +00:00