Commit Graph

1718 Commits

Author SHA1 Message Date
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
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
2b04695c2e Apply suggestions from code review 2025-02-27 10:07:17 +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
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
Archer Bowen
5ffde8a426 Merge branch '4.0.0a1-dev' into feature/3087-TAP-core-migration 2025-02-26 15:32:43 +00:00
Marek Wolan
9bb4442bbe Merge remote-tracking branch 'origin/dev' into 4.0.0-dev 2025-02-26 15:20:05 +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
Charlie Crane
a426cf567b Merged PR 606: Regression Testing Fixes
## Summary
Changes to PrimAITE to resolve bugs found during regression testing.

- Addressed hardcoding of "abstract_agent" as the name used in logging. This should now use the agent's `ref` from config.
- Fixed some failing terminal tests that were attempting to pass through a remote IP for actions where this wasn't needed.
- Corrected some old uses of `self.hostname` instead of `self.config.hostname` following refactoring.
- Removal of `node_types_map` when calling `network.show` to resolve issues with extensability.

## Test process
Tests pass when ran locally.

## Checklist
- [ ] PR is linked to a **work item**
- [ ] **acceptance criteria** of linked ticket are met
- [ ] performed **self-review** of the code
- [ ] 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
2025-02-18 10:33:50 +00:00
Charlie Crane
22b197a79a Removal of leftover comment from software.py 2025-02-18 09:13:33 +00:00
Marek Wolan
de88974332 Fix airspace hello 2025-02-17 18:14:07 +00:00
Marek Wolan
3651d033d6 fix instantiation of network nodes 2025-02-17 17:34:22 +00:00
Archer Bowen
9768a931ab #3087 - TAP001/003 Added - **No tests or notebooks migrated** 2025-02-17 17:26:50 +00:00
Nick Todd
5f076ba225 #3075: Fix pre-commit errors 2025-02-17 15:12:12 +00:00
Nick Todd
7e82de919c #3075: Markdown changes. 2025-02-17 14:19:56 +00:00
Nick Todd
486c797d60 #3075: Change duplicate application_name in config file. 2025-02-17 11:54:13 +00:00
Nick Todd
a3e6bcace0 Merge branch '4.0.0a1-dev' into feature/3075_Migrate_notebooks_to_MilPac_(Core_changes) 2025-02-17 10:48:28 +00:00
Charlie Crane
bf30b70bd2 #3060 - Removal of un-necessary check in game.py 2025-02-17 10:09:39 +00:00
Charlie Crane
2830a2aef5 #3060 - Amendment to new version tag in configuration yaml. Now under the metadata tag 2025-02-14 12:36:23 +00:00
Charlie Crane
7b80d15d81 # Pre-commit actions 2025-02-14 11:39:25 +00:00
Charlie Crane
7e138d1d61 #Bug and test fixes 2025-02-14 11:38:15 +00:00
Charlie Crane
56699d2377 Resolve hardcoding of Agent Logger having agent_name as abstract_agent 2025-02-12 16:18:50 +00:00
Charlie Crane
70fc11f4f1 #3060 - Correct change in game.py that caused test failures 2025-02-11 16:20:11 +00:00
Charlie Crane
56e81a020c #3060 - Adding version to YAML files within PrimAITE 2025-02-11 10:53:41 +00:00
Marek Wolan
96549e68aa Merge remote-tracking branch 'origin/dev' into 4.0.0-dev 2025-02-10 14:39:28 +00:00
Marek Wolan
fc66e125d6 Fix action schema for change password 2025-02-07 10:08:18 +00:00
Nick Todd
1a8c3b9471 #3075: Fix notebooks after test changes. 2025-02-06 16:42:26 +00:00
Nick Todd
0d8672cdba Merge branch '4.0.0a1-dev' into feature/3075_Migrate_notebooks_to_MilPac_(Core_changes) 2025-02-06 09:17:34 +00:00