Commit Graph

1976 Commits

Author SHA1 Message Date
Chris McCarthy
71d8c6ea63 #2735 - synced with dev and resolved merge conflicts 2024-08-02 12:55:09 +01:00
Chris McCarthy
696236aa61 #2735 - make the disabled/enabled admins/non-admins dynamic properties for simplicity. Added num_of_logins to User. Added additional test for counting user logins. Added all users to the UserManager describe_state function. Refactored model fields with empty dict as default value to have direct instantiation instead of using Field(default_factory=dict) or Field(default_factory=: lambda: {}). 2024-08-02 12:47:02 +01:00
Christopher McCarthy
61c7cc2da3 Apply suggestions from code review 2024-08-02 10:57:51 +00:00
Nick Todd
3ebad7d7e9 Merged PR 448: Global NMNE variables are incorrectly accessed
## Summary
*Replace this text with an explanation of what the changes are and how you implemented them. Can this impact any other parts of the codebase that we should keep in mind?*

## Test process
*How have you tested this (if applicable)?*

## 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
- [ ] 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: #2676
2024-08-02 08:28:08 +00:00
Chris McCarthy
c2a19af6fa #2735 - added documentation for users, usermanager and usersessionmanager. Added the ability to add additional users from config and documented this. also tested additional users from config. 2024-08-02 09:20:00 +01:00
Czar Echavez
0c66d594f6 Merged PR 490: #2735: fixes to broken items
## Summary
*Replace this text with an explanation of what the changes are and how you implemented them. Can this impact any other parts of the codebase that we should keep in mind?*

## Test process
*How have you tested this (if applicable)?*

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

#2735: fixes to broken items

Related work items: #2735
2024-08-01 22:56:31 +00:00
Marek Wolan
78ad95fcef #2735 - fix up node request manager and system software 2024-08-01 13:58:35 +01:00
Marek Wolan
a719b24cfc Merge branch 'dev' into feature/2735-usermanager-fixes 2024-08-01 13:23:03 +01:00
Marek Wolan
b599257433 #2676 - update configs to use new nmne schema; fix test and warnings 2024-08-01 09:06:35 +01:00
Marek Wolan
fc9bd6fd64 Merged PR 491: #2800 - Consolidate software install and uninstall to a single method
## Summary
Consolidate the two install/uninstall methods so there's only one now. yay

## Test process
Existing tests pass.

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

#2800 - Consolidate software install and uninstall to a single method

Related work items: #2800
2024-08-01 08:04:07 +00:00
Marek Wolan
2648614f97 2800 update changelog 2024-07-31 16:44:25 +01:00
Marek Wolan
2abd1969fe #2800 - Consolidate software install and uninstall to a single method 2024-07-31 16:41:59 +01:00
Marek Wolan
e57a454b9c Merge remote-tracking branch 'origin/dev' into feature/2735-usermanager-fixes 2024-07-31 15:42:54 +01:00
Marek Wolan
bd1e23db7d 2676 - make ntwk intf use default nmne config 2024-07-31 15:25:02 +01:00
Marek Wolan
9bf8d0f8cb #2676 Put NMNE back into network module 2024-07-31 13:20:15 +01:00
Marek Wolan
5b976c7985 Merge remote-tracking branch 'origin/dev' into bugfix/2676_NMNE_var_access 2024-07-31 12:49:21 +01:00
Czar Echavez
5e3a169999 #2735: add usermanager and usersessionmanager into describe_state 2024-07-30 12:48:11 +01:00
Christopher McCarthy
2c2d140bf0 Merged PR 487: #2778 - fixed the mis-merge that was trying to call the old latex function
## Summary
- Fixed the mis-merge that was trying to call the old latex function instead of the new md function
- Removed the old threshold leftover stuff in the report too

## Test process
- Tested the benchmark report locally and it runs end-to-end

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

#2778 - fixed the mis-merge that was trying to call the old latex function instead of the new md function. removed the old threshold leftover stuff in the report too

Related work items: #2778
2024-07-30 09:42:10 +00:00
Chris McCarthy
2e1d622228 #2778 - pinned Ray version to <2.33 until they fix their bug 2024-07-30 09:57:48 +01:00
Czar Echavez
c984d695cc #2735: use ray version 2.32 until 2.33 is fixed 2024-07-29 23:03:26 +01:00
Czar Echavez
0fad61eaea #2735: pipeline build fail if test fails 2024-07-29 15:15:15 +01:00
Czar Echavez
3d13669671 #2735: fixes to broken items 2024-07-29 15:12:24 +01:00
Chris McCarthy
265632669e #2778 - added request managers for USerManager and UserSessionManager classes 2024-07-29 10:29:12 +01:00
Chris McCarthy
8af7fc0ecd #2778 - ran pre-commit 2024-07-29 09:31:50 +01:00
Chris McCarthy
2e35549c95 #2735 - added docstrings to the User, UserManager, and UserSessionManager classes 2024-07-29 09:29:20 +01:00
Chris McCarthy
a0cfe8cdfa #2778 - fixed the mis-merge that was trying to call the old latex function instead of the new md function. removed the old threshold leftover stuff in the report too 2024-07-29 08:52:16 +01:00
Chris McCarthy
d0c8aeae30 #2735 - implemented remote logins. Added action remote sessions to UserSessionManager describe_state. Added suite of tests for UserSessionManager logins 2024-07-24 17:08:18 +01:00
Chris McCarthy
6976936102 Merge branch 'refs/heads/dev' into feature/2735_Implement-UserManager-class-and-integrate-into-Node 2024-07-22 22:07:59 +01:00
Chris McCarthy
e67b4b54ce bumped version number and ran pre-commit 2024-07-22 14:46:58 +01:00
Chris McCarthy
db50a4d457 Merge remote-tracking branch 'refs/remotes/origin/release/3.2.0' into dev
# Conflicts:
#	src/primaite/VERSION
2024-07-22 14:38:01 +01:00
Chris McCarthy
85a530382c merged 3.1.0 into dev for git history alignment [skip ci] 2024-07-22 14:30:33 +01:00
Chris McCarthy
8ce39a09ad merged 3.0.0 into dev for git history alignment [skip ci] 2024-07-22 14:06:08 +01:00
Chris McCarthy
6bfe1510e8 merged 3.1.0 into 3.2.0 for git history alignment [skip ci] 2024-07-22 13:59:28 +01:00
Chris McCarthy
9dd1d6b742 merged 3.0.0 into 3.1.0 for git history alignment [skip ci] 2024-07-22 13:50:29 +01:00
Chris McCarthy
0789244df8 refactored the performance benchmark plot so that there's no benchmark threshold line and all bars are blue [skip ci] 2024-07-22 10:12:43 +01:00
Defence Science and Technology Laboratory UK
4631f19e84 Automated benchmark output commit for version 3.2.0 [skip ci] 2024-07-21 09:10:19 +00:00
Chris McCarthy
4ae3573f70 release/3.2.0 2024-07-21 07:44:26 +01:00
Defence Science and Technology Laboratory UK
3f7d6c6ba6 Automated benchmark output commit for version 3.1.0 [skip ci] 2024-07-20 18:36:58 +00:00
Chris McCarthy
fba85cebfd retrospectively benchmarked 3.1.0 using the new benchmark process 2024-07-20 17:15:53 +01:00
Defence Science and Technology Laboratory UK
7f9acc4329 Automated benchmark output commit for version 3.0.0 [skip ci] 2024-07-20 16:11:46 +00:00
Chris McCarthy
213e301e58 retrospectively benchmarked 3.0.0 using the new benchmark process 2024-07-20 15:05:56 +01:00
Archer.Bowen
22d10bf0d5 #2734 Minor grammatical issue. 2024-07-19 14:28:00 +01:00
Nick Todd
82a11b8b85 #2676: Updated doc strings 2024-07-19 12:54:01 +01:00
Archer Bowen
da13eb3dea Merged PR 472: User Guide Updates - Following Feedback
Implements the following changes:

**Moving some of the text from index.html into about.html (reduces repeated text**)

Index.html (home)
	i.	Overview
	ii.	Features (the ones we have listed currently in v3.2.0)
About.html
	i.	Architecture
	ii.	Training & Evaluation Capability
	iii.	What is PrimAITE built with
	iv.	Getting started with PrimAITE

**Adds deepdiff and sb3_contrib to the dependencies list**

![image.png](https://dev.azure.com/ma-dev-uk/b50a61ee-86c4-48bc-9a0b-a67645ba12ee/_apis/git/repositories/2825053e-bd3b-45b2-8680-1281809eefa2/pullRequests/472/attachments/image.png)

**NMAP headers were inconsistent with other documentation. **

This may be an issue with the other documentation rather than NMAP however refactoring every header could cause a lot more headache.

![image (2).png](https://dev.azure.com/ma-dev-uk/b50a61ee-86c4-48bc-9a0b-a67645ba12ee/_apis/git/repositories/2825053e-bd3b-45b2-8680-1281809eefa2/pullRequests/472/attachments/image%20%282%29.png)

**General Improvements**

Small link fixes

changing up python outdated python information

adding the common.config to .rst documents that didnt have them previously.

Related work items: #2734
2024-07-19 11:52:02 +00:00
Archer.Bowen
bd9f69f062 #2734 Forgot the comma.... 2024-07-19 12:22:22 +01:00
Archer.Bowen
047117cba0 #2734 Slight grammatical improvements following PR 2024-07-19 12:21:16 +01:00
Nick Todd
e4ade6ba54 #2676: Merge nmne.py with io.py 2024-07-19 12:02:43 +01:00
Archer.Bowen
3ff0a37a71 #2734 User guide feedback core changes. 2024-07-19 11:54:10 +01:00
Nick Todd
9fb3790c1a #2726: Resolve pydantic validators PR comment 2024-07-19 11:10:57 +01:00
Chris McCarthy
8702dc7067 #2735 - tidies up some oif the api, temporarily integrated login checks to ping for testing, added temp test 2024-07-19 10:34:32 +01:00