Commit Graph

2417 Commits

Author SHA1 Message Date
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
5a7caa33f0 Merged PR 609: fix instantiation of network nodes 2025-02-18 11:05:16 +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
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
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
Charlie Crane
4f0e612608 Merged PR 604: #3060 - Adding version to YAML files within PrimAITE
## Summary
Configuration YAML's updated to include the version of PrimAITE for which they were written for

## 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

Related work items: #3060
2025-02-17 10:22:49 +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
dadf93bc7f #3060 - Address some missed pre-commit errors 2025-02-11 14:59:25 +00:00
Charlie Crane
56e81a020c #3060 - Adding version to YAML files within PrimAITE 2025-02-11 10:53:41 +00:00
Marek Wolan
e288572e0b Merged PR 601: Fix action schema for change password 2025-02-10 15:28:44 +00:00
Marek Wolan
fc66e125d6 Fix action schema for change password 2025-02-07 10:08:18 +00:00
Marek Wolan
0d1edf0362 Merged PR 598: Make Node schemas stricter
## Summary
- Add extra="forbid" to the node ConfigSchema to prevent future bugs.
- Temporarily add dummy variables that are used by the from_config method of nodes until we refactor them out of the codebase.

## Test process
Yes the tests run correctly.

## 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-06 09:09:18 +00:00
Marek Wolan
09bdfa3ae1 bugfix - Restore wireless networks so they're not broken 2025-02-05 15:11:04 +00:00
Marek Wolan
c1abbfe58c bugfix - Make node schemas stricter 2025-02-05 15:04:41 +00:00
Marek Wolan
01bf052cc4 Merged PR 597: Standardise discriminator (f.k.a. identifiers) naming convention.
## Summary
I mean I don't expect reviewers to go through every single change. It was painful enough to make all the changes myself, I had to write a script and regex the $*!+ out of the codebase to get this change through

## Test process
Tests pass. Searching through the codebase with regex queries to check for compliant strings.

## 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

Related work items: #3062
2025-02-05 10:49:40 +00:00
Marek Wolan
4a472c5c75 #3062 - Remove discriminators from abstract classes and fix remaining old discriminator names 2025-02-05 10:12:13 +00:00
Marek Wolan
0a6b604afd Merge remote-tracking branch 'origin/4.0.0a1-dev' into feature/3062-discriminators 2025-02-04 15:20:56 +00:00
Marek Wolan
f0326f4051 Merge remote-tracking branch 'origin/feature/2887-Align_Node_Types' into feature/3062-discriminators 2025-02-04 15:20:48 +00:00
Charlie Crane
0708c836a3 Merged PR 591: Extensible Nodes
## Summary
Refactor of Node classes within PrimAITE to align with the `ConfigSchema` and `from_config` design implemented for PrimAITE v4.0.
Updates to tests to use the new `from_config` method when creating nodes.
Additional documentation page for how to implement custom Node classes

## Test process
WIP - Updating tests to still pass and prevent regression.

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

Related work items: #2887
2025-02-04 15:15:28 +00:00
Charlie Crane
24161bb3fc #2887 - Removal of commented out code 2025-02-04 15:06:23 +00:00
Charlie Crane
51bb3f5b07 #2887 - Removal of un-necessary print statement that was used for debugging 2025-02-04 14:26:55 +00:00
Charlie Crane
99e38fbbc2 #2887 - Removal of un-necessary code and cleanup following review comments 2025-02-04 14:25:26 +00:00
Marek Wolan
7ebe7fa4ef Merge '2887-Align_Node_Types' into 3062-discriminators 2025-02-04 14:04:40 +00:00
Charlie Crane
05946431ca #2887 - Correct type in documentation 2025-02-04 11:19:13 +00:00
Charlie Crane
961136fb42 #2887 - Updates to extensible_nodes.rst 2025-02-04 10:41:51 +00:00
Charlie Crane
c1a5a26ffc #2887 - Actioning review comments 2025-02-04 10:21:56 +00:00
Marek Wolan
a310fb3b64 #3062 - Discriminator bugfixes 2025-02-03 16:29:27 +00:00
Marek Wolan
abccf4afc5 #3062 - First pass at unifying naming convention for discriminators (still errors) [skip ci] 2025-02-03 16:24:03 +00:00
Charlie Crane
f3bbfffe7f #2887 - Update CHANGELOG.md 2025-02-03 14:03:21 +00:00
Charlie Crane
0920ec5f5b #2887 - Remove debug print statements 2025-02-03 11:32:07 +00:00
Charlie Crane
3d01f52eea #2887 - Merge in changes on dev to resolve conflicts. All tests should now pass 2025-02-03 11:18:34 +00:00
Charlie Crane
d1e932a57c #2887 - Merge in changes on dev to resolve conflicts. All tests should now pass 2025-02-03 11:16:34 +00:00
Charlie Crane
d806391625 #2887 - Test fixes 2025-01-31 18:46:02 +00:00
Marek Wolan
055c853b0f #3062 - rename identifier to discriminator 2025-01-31 16:00:32 +00:00
Marek Wolan
8feb2db954 Fix properties 2025-01-31 15:29:10 +00:00
Marek Wolan
20e5177544 Merged PR 593: Core bugfixes in support of extension tests.
## Summary
- Corrected some validation in observations and actions to use strings (in alignment with 'describe_state' methods.)
- Fixed bug where periodic agent would start on step 0 instead of on the configured start step
- Improved validations on network node adder
- Added database password to config schema of database service
- DNS client lookup no longer requires a DNS server address to be configured if the requested domain exists in the client cache
- DNS client can now inherit the parent node's DNS server address

## Test process
Unit tests and tests against the extension

## Checklist
- [X] PR is linked to a **work item**
- [X] **acceptance criteria** of linked ticket are met
- [X] 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
- [X] updated the **change log**
- [X] ran **pre-commit** checks for code style
- [ ] attended to any **TO-DOs** left in the code

#3029 - Add string-ip validator, improve validation, fix minor bugs in pulling schema data

Related work items: #3029
2025-01-31 14:47:16 +00:00
Marek Wolan
a77fa65c39 #3029 - Remove old initialisation of dns server attr that caused a bug 2025-01-31 14:46:43 +00:00
Marek Wolan
3260e1f30b #3029 - make new config items properties as per PR comments 2025-01-31 14:41:49 +00:00
Marek Wolan
037dd8278b #3029 - update changelog 2025-01-31 12:30:08 +00:00
Marek Wolan
4fb54c9492 #3029 - Add string-ip validator, improve validation, fix minor bugs in pulling schema data 2025-01-31 12:18:52 +00:00
Charlie Crane
3d47b9c863 #2887 - Further fixes to unit tests 2025-01-30 17:33:00 +00:00