Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release candidate 2.2.0 to main #464

Merged
merged 700 commits into from
Jun 14, 2024
Merged

Release candidate 2.2.0 to main #464

merged 700 commits into from
Jun 14, 2024

Conversation

joenpera
Copy link
Contributor

  • waiting testing results

dania-tii and others added 30 commits January 22, 2024 15:13
@dania-tii @martin-tii
Integrate decision engine to LDPI
f730218
@dania-tii @martin-tii
Update stop features in main.py
b25ae41
@dania-tii @martin-tii
Update ldpi main.py
fb0be2c
@saauvine
Merge remote-tracking branch 'origin/develop' into mdm_use_upper_certs
f6c6e52
@joenpera
Add validation for the delivered configuration message
81900c5 
- part of the validation is done in comms controller settings code, but
  empty message check was added to MDM agent side

Jira-Id: SECO-3293

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Review changes
9f906ac 
Jira-Id: SECO-3293

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Merge pull request #384 from tiiuae/feature/halow_upgrade
06f7048 
SECO-3123: nrc1.5.0 update - setting long guard interval and support_ch_width
@Hiihtaja77
Move osf test to own folder.
10ba1ea
@joenpera
Merge pull request #389 from tiiuae/feature/mdm_agent_empty_mesh_config
b7bb45c 
Add validation for the delivered configuration message
@saauvine
Use locks to protect interfaces list usage
9cf2278 
Jira IDs: SECO-3112, SECO-3111

* AuthClient and AuthServer modified to use hard coded key for now.
* Birth certificates are used as a backup solution in case downloaded
upper cbma certificates are not for correct device.
* MDM agent uses locks to protect cbma interface list creation
* MDM agent stopping modified a bit to ensure faster termination

Signed-off-by: Saku Auvinen <[email protected]>
@joenpera
Fix correct MTU size for batman interface
7c0daf0 
Jira-Id: SECO-3431

Signed-off-by: Mika Joenpera <[email protected]>
@TIISR
Merge pull request #393 from tiiuae/fix/mesh_mtu_size
af9e9e4
@joenpera
Merge pull request #391 from tiiuae/refactor/osf-test-folder
eb530fa 
Move osf test to own folder and refactor it.
@saauvine
Still activate CBMA only if feature set on config file
e6ac606 
Jira ID: SECO-3112

Signed-off-by: Saku Auvinen <[email protected]>
@joenpera
Refactoring MDM code
d2cf253 
Jira-Id: SECO-3163

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Remove Hostapd socket WAR
9671e9c 
Jira-Id: SECO-3390

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Merge pull request #394 from tiiuae/fix/hostapd
6f964b4 
WAR: Remove Hostapd socket
@joenpera
Review fixes
4415acf 
- debug print indent fixed

Jira-Id: SECO-3163

Signed-off-by: Mika Joenpera <[email protected]>
@saauvine
Merge pull request #380 from tiiuae/mdm_use_upper_certs
f4186ec 
Use downloaded upper CBMA certificates
@joenpera
Fix correct MTU size for batman interface
7292187 
Jira-Id: SECO-3431

Signed-off-by: Mika Joenpera <[email protected]>
@Hiihtaja77 @joenpera
Move osf test to own folder.
0abca0b
@joenpera
Remove Hostapd socket WAR
96b55ab 
Jira-Id: SECO-3390

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Merge branch 'develop' into refactoring_mdm
0a2f679
@joenpera
Merge pull request #390 from tiiuae/refactoring_mdm
14816ec 
Refactoring MDM code
@joenpera
FMO/MDM split to separate files
c894f5a 
Jira-Id: SECO-3162

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
FMO/MDM split and refactoring
ebbfbc7 
Jira-Id: SECO-3162

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Fix problem where nodes were not on same channel after start
8772356 
Jira-Id: SECO-3386

Signed-off-by: Mika Joenpera <[email protected]>
@TIISR
Merge pull request #396 from tiiuae/fix/wifi_channel_problem
1111668
@joenpera
Fix AX88719A adapter support
c5fffcd 
Jira-Id: SECO-3240

Signed-off-by: Mika Joenpera <[email protected]>
@saauvine
Move MDM agent's CBMA control to own module
801e6dc 
Jira-ID: 3290

Signed-off-by: Saku Auvinen <[email protected]>
joenpera and others added 20 commits May 20, 2024 10:08
@joenpera
Merge pull request #458 from tiiuae/resource_warning_fix
65900fd 
Fix comms_status.py resource warnings
@saauvine
Merge remote-tracking branch 'origin/develop' into cbma_adaptation_un…
2b647eb 
…it_test
@saauvine
Add unit test module and black interface list filtering
e295093 
Jira-IDs: SECO-4952, SECO-5350

Signed-off-by: Saku Auvinen <[email protected]>
@saauvine
Change CBMAAdaptation's logging level back to 'INFO'
1cd2fb9 
Signed-off-by: Saku Auvinen <[email protected]>
@saauvine
Use default wait_for_interface timeout for batman interfaces
5a9a3fd 
Signed-off-by: Saku Auvinen <[email protected]>
@joenpera
Add MDM agent unittests
cba464d 
Jira-Id: SECO-5046

Signed-off-by: Mika Joenpera <[email protected]>
@saauvine
Add CBMA configs validation and unit tests
bdd1774 
Jira-ID: SECO-5460

Do not use CBMA config from ms_config.yaml in case it resulted
empty black interfaces list.

Signed-off-by: Saku Auvinen <[email protected]>
@saauvine
Fix review findings
f939611 
Signed-off-by: Saku Auvinen <[email protected]>
@joenpera
Review finding fixes
85ed8fb 
Jira-Id: SECO-5046

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Merge pull request #460 from tiiuae/mdm_agent_unittests
190b749 
Add MDM agent unittests
@saauvine
Merge branch 'develop' into cbma_adaptation_unit_test
d437940
@saauvine
Add separate requirements.txt for unit tests
f4d21af 
Also fixed one info trace in cbma_adaptation/unit test and
added br-lan handling to __get_interfaces().

Signed-off-by: Saku Auvinen <[email protected]>
@saauvine
Merge pull request #459 from tiiuae/cbma_adaptation_unit_test
85f31eb 
Cbma adaptation unit test
@saauvine
Add usb0 to red_interfaces config list
748d4bc 
Jira-ID: SECO-5616

Signed-off-by: Saku Auvinen <[email protected]>
@saauvine
Set bat0/1 hop penalty to 1
e13dca9 
Jira-ID: SECO-5618

Signed-off-by: Saku Auvinen <[email protected]>
@TIISR
Merge pull request #461 from tiiuae/config_change
b14bd97 
Add usb0 to red_interfaces config list and update bat0/bat1 hop penalty config
@joenpera
Increase BATMAN_OVERHEAD constant for MDM agent
839f72b 
Jira-Id: SECO-5659

Signed-off-by: Mika Joenpera <[email protected]>
@TIISR
Merge pull request #462 from tiiuae/increase_mtu_overheads
03097d8
@pentestiing
Upgrade CBMA to v0.1.7: Increase MTU overhead + add nodst + log fix
8b60649
@TIISR
Merge pull request #463 from tiiuae/upgrade-cbma-to-v0.1.7
74c76dc
@joenpera joenpera self-assigned this Jun 14, 2024
pentestiing
pentestiing approved these changes Jun 14, 2024
View reviewed changes
Copy link
Contributor

@pentestiing pentestiing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎲

@joenpera joenpera merged commit 2c28b4b into main Jun 14, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pentestiing pentestiing pentestiing approved these changes

@jihonen jihonen jihonen approved these changes

@pemanty pemanty pemanty approved these changes

@TIISR TIISR Awaiting requested review from TIISR

@johan-juntunen johan-juntunen Awaiting requested review from johan-juntunen

Assignees

@joenpera joenpera

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.