Charlie Crane
fbef78db51
#2887 - Resolve conflicts from merge
2025-01-23 09:17:27 +00:00
Charlie Crane
3957142afd
#2887 - Updates to Node components to use rom_config and allow for extensibility. Router and Firewall continue to have custom from_config. Some test fixes to reflect changes to functionality.
2025-01-22 17:20:38 +00:00
Marek Wolan
d2d09abcb1
Merged PR 590: Backport 3.3.1 fixes into Core
...
this was already reviewed as part of 3.3.1 release process
2025-01-21 14:42:05 +00:00
Marek Wolan
94ee16afa6
Remove todo comments that have been completed
2025-01-21 13:39:06 +00:00
Marek Wolan
66daab3baf
Backport 3.3.1 fixes into Core
2025-01-21 13:08:36 +00:00
Marek Wolan
c521528a0a
Merge remote-tracking branch 'origin/4.0.0a1-dev' into feature/2869-Marek
2025-01-20 10:39:20 +00:00
Marek Wolan
858406c4a3
update more tests to new actions schema
2025-01-17 14:38:59 +00:00
Nick Todd
dff976b336
#2888 : Fix merge test failures.
2025-01-16 16:32:55 +00:00
Marek Wolan
03cab0fcec
Update configs to new action naming schema and remove redundant agent config
2025-01-16 15:18:13 +00:00
Charlie Crane
70d9fe2fd9
#2887 - End of day commit. Updates to ConfigSchema inheritance, and some initials changes to Router to remove the custom from_config method
2025-01-15 16:33:11 +00:00
Nick Todd
1fe0aea48d
Merge remote-tracking branch 'origin/4.0.0a1-dev' into feature/2888_Align_core_software_with_registry
2025-01-15 14:53:46 +00:00
Charlie Crane
582e7cfec7
#2887 - Initial commit of Node refactor for extensibility in version 4.0.0. Addition of ConfigSchema and changes to how Nodes are generated within Game.py
2025-01-15 11:21:18 +00:00
Marek Wolan
fb5242bd78
Merge agents and actions branches + fix import / subclass errors
2025-01-14 11:34:01 +00:00
Charlie Crane
3cca3d4a5c
#2912 - Actioning review comments. Identifiers have been removed from AbstractActions, _legacy folder has been deleted and correction to IPV4Address type hints
2025-01-13 16:12:16 +00:00
Nick Todd
ea9c13b5f4
#2888 : self.X -> self.config.X
2025-01-13 15:38:11 +00:00
Nick Todd
0203a8699a
#2888 : Fixed C2Beacon test failures.
2025-01-07 14:21:07 +00:00
Nick Todd
cb4e10921e
#2888 : Use fixing_duration from ConfigSchema.
2025-01-06 16:33:57 +00:00
Marek Wolan
632201681b
#2888 - fix software config issues
2025-01-06 10:08:32 +00:00
Marek Wolan
30d8f14251
#2888 - Put software configuration items in the ConfigSchema
2025-01-03 16:26:12 +00:00
Charlie Crane
e653afaa4c
#2912 - Merge in changes on target branch
2025-01-03 14:48:18 +00:00
Charlie Crane
ab2dd6ca27
Revert " #2912 - Actioning Review Comments"
...
This reverts commit b11678a128
2025-01-03 14:41:45 +00:00
Charlie Crane
b11678a128
#2912 - Actioning Review Comments
2025-01-03 14:40:00 +00:00
Marek Wolan
c481847b01
#2888 - Software: align identifiers, tidy up schemas
2025-01-03 13:39:58 +00:00
Marek Wolan
66ca72be79
Merge branch '4.0.0a1-dev' into feature/2888_Align_core_software_with_registry
2025-01-03 12:11:46 +00:00
Marek Wolan
c5f81708ce
Merge remote-tracking branch 'origin/4.0.0a1-dev' into feature/2913_Extensible_Rewards
2025-01-02 15:11:25 +00:00
Marek Wolan
491de6fc47
Revert pre-commit deleting files
2025-01-02 15:11:02 +00:00
Marek Wolan
41dc7b5b29
Merge remote-tracking branch 'origin/4.0.0a1-dev' into feature/2913_Extensible_Rewards
2025-01-02 15:05:35 +00:00
Marek Wolan
bf32271ddd
Change copyright to 2025
2025-01-02 15:05:06 +00:00
Nick Todd
4a52054ed6
#2888 : Initialise ConfigSchema's and fix type names.
2024-12-12 14:58:48 +00:00
Nick Todd
2ecc142c28
#2888 : Changes to Applications and Services previously missed.
2024-12-11 16:50:43 +00:00
Charlie Crane
e40fd053f7
#2912 - Removing print statements left in from debugging
2024-12-11 10:32:15 +00:00
Nick Todd
4050bd9e85
#2888 : Add identifier keyword to services.
2024-12-11 10:12:50 +00:00
Nick Todd
66f775da4d
#2888 : Add ConfigSchema to Services.
2024-12-10 16:58:28 +00:00
Nick Todd
7dd25f18f6
#2888 : Update with ConfigSchema
2024-12-10 12:27:50 +00:00
Nick Todd
ed128fc535
#2888 : Add ConfigSchema to Application class.
2024-12-09 16:38:42 +00:00
Nick Todd
97094aba79
#2913 : Pre-commit changes.
2024-10-30 11:15:39 +00:00
Nick Todd
9fd862763b
#2913 : Ensure optional software in config file is enabled.
2024-10-30 11:11:07 +00:00
Nick Todd
3c1bb2d546
#2913 : Integration test fixes.
2024-10-29 16:57:11 +00:00
Nick Todd
6f6e4131b4
#2913 : Handle case where server_ip_address is None
2024-10-29 16:54:19 +00:00
Charlie Crane
518b934e09
#2912 - Corrections to some actions & fixing some linting. TODO: Action Manager errors
2024-10-22 17:02:54 +01:00
Nick Todd
c3f266e401
#2913 : Remove unneeded import and pre-commit changes.
2024-10-22 16:26:57 +01:00
Nick Todd
37bdbaf0d1
#2913 : Fix JSON breakage and old-style PORTS and PROTOCOL usage.
2024-10-22 16:15:04 +01:00
Marek Wolan
43ec85a669
#2755 - refix some air space frequency issues
2024-10-11 09:52:16 +01:00
Marek Wolan
8419fd751a
Merged PR 561: Make it possible to add sets of nodes to the network
...
## Summary
* Changed the office LAN convenience function to a class with a registry. Now, plugin can register custom node adders.
* Added ability to define `node_sets` in the config that map to `NetworkNodeAdder` subclasses
* Made airspacefrequency into a DTO class again to make management simpler.
* Moved the node registry out of `HostNode` and `NetworkNode` into `Node`
* Changed game.py to check the hardcoded node types before the node registry (this will change once I add ConfigSchema to all node subclasses)
* Made `show` method of the network container show all nodes, including ones registered at runtime.
## Test process
* Existing tests passed.
* Added unit tests for node adders
## 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
- [ ] 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
2024-10-09 14:56:57 +00:00
Marek Wolan
611b34e29f
remove outdated comment
2024-10-09 14:16:23 +01:00
Marek Wolan
a42398ac09
Fix typos and improve validation
2024-10-09 14:15:53 +01:00
Marek Wolan
b4cc1b4379
Add tests for office lan creation
2024-10-04 11:07:49 +01:00
Marek Wolan
b5b7fc6a8d
Give node types their own identifiers and make the network show method use them
2024-10-04 09:20:07 +01:00
Marek Wolan
5fde945fac
rename identifier back to type
2024-10-02 14:24:59 +01:00
Marek Wolan
a838cc6ce1
Convert office lan adder to a class and make it extendable
2024-10-02 13:56:39 +01:00
