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

Multiradio support #319

Merged
merged 32 commits into from
Nov 1, 2023
Merged

Multiradio support #319

merged 32 commits into from
Nov 1, 2023

Conversation

joenpera
Copy link
Contributor

@joenpera joenpera commented Oct 9, 2023 •
edited
Loading

Implements messaging interface for Multiradio control.

Jira-Id: SPSI-43

joenpera and others added 29 commits October 5, 2023 15:05
@joenpera
Add radio index to configuration and init.d files
bc933ad 
Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Add halow check to S9011sNatsMesh
19bd3ea 
Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Add initial support to handle multiradio parameters
f888f56 
- multiwifi currently supported

Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
More refactoring mesh-11s_nats.sh for multiradio
56bb175 
- Bridge config now taken from configuration message.
- Also some other hardcoded values removed.
- killall calls removed

Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Initial multiradio status skeleton
73c37a0 
Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Add phy/network name handling and more index usage
d7ace14 
Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Add wpa/hostapad status handling based in index
ca2fc96 
- comms_status.py - status handling rework
- comms_nats_controller.py - refactoring status instance handling
- comms_settings.py - save/load fixes

Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Fix default bridge IP and comms_settings start
d3b2709 
Some fixes after testing commit done so far.

Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Update work in progress files to git
8d90c72 
Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Add Halow source files for multiradio
3c25682 
Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Fix S9011sNatsMesh to kill correct processes in multiradio
1652696 
Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Add more multiradio command supports
4e8a832 
Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Add ap+mesh_scc/mcc possibility with multiradio
544e22a 
Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Remove netif name from log/config/pid naming
7437b93 
- radio index used now widely
- sorting radio config by index when settings received
- default_mesh checks removed as not needed in a logic

Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@pemanty
Improve Halow radio startup
1335e87 
Jira-Id:SCDI-61

Signed-off-by: pemanty <[email protected]>
@joenpera
Fix comms.status mesh_radio - status
89385fc 
Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@saauvine
Do not start mesh in case halow init has not finished
8f75053 
Jira-ID: WC-247
entrypoint_nats waits for init_halow process to finish
before generating bridge ip and continuing to start mesh.

Signed-off-by: Saku Auvinen <[email protected]>
@saauvine
Merge remote-tracking branch 'origin/develop' into multiradio
d236204
@joenpera
Fix visualisation for multiradio
4d5f1a0 
Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Fix visualisation and remove phy from config
010138e 
- Alfred now start with own init.d
- all configs done with based on the wifi interface name and
  phy is detected.

Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Fix UnitTests and bug in the comms_settings
3c9dbe3 
- UnitTests now supports multiradio
- bug found and fixed from comms_settings

Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@pemanty
Fix Gateworks Halow module load loop
1f56a21 
Jira-Id: WC-260

Signed-off-by: pemanty <[email protected]>
@joenpera
Refactoring bridge IP helper code and settings code fixes
85445cd 
- br_lan_ip -> bridge_ip as bridge name can change
- comms_settings.py fail case fixes

Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Add channel change interface for radio_index
8302d19 
- Changes channel to requested frequency without any
  extra acks.

Jira-Id: 43

Signed-off-by: Mika Joenpera <[email protected]>
@pemanty
Multiradio throughput issue when Halow used
eb3c65c 
Jira-Id: WC-262

Signed-off-by: pemanty <[email protected]>
@saauvine
Include a list of wireless interfaces to identity query response
0dcbb5a 
Jira-ID: WC-248
GET_IDENTITY response contains now list of wireless interfaces that
can be controlled via CommsController. Affected code is refactored with
black tool using -l 79 option to comply with pep8 rules. Type annotations
has been changed also to compatible with mypy tool.

Signed-off-by: Saku Auvinen <[email protected]>
@joenpera
Radio_index handling fixes and S90socat init.d removed
270ac6f 
Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Remove radvd.conf file creation from mesh-helper.sh
8b4f5fa 
Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Merge branch 'develop' into multiradio
38f4aa2
@joenpera joenpera requested a review from saauvine October 31, 2023 08:01
@joenpera joenpera changed the title WIP: Multiradio support Multiradio support Oct 31, 2023
@joenpera joenpera self-assigned this Oct 31, 2023
TIISR
TIISR reviewed Oct 31, 2023
View reviewed changes
Copy link
Contributor

@TIISR TIISR left a comment

Choose a reason for hiding this comment

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

First batch, will try to continue later

common/scripts/mesh-helper.sh Outdated Show resolved Hide resolved
common/scripts/mesh-helper.sh Show resolved Hide resolved
common/scripts/mesh-helper.sh Outdated Show resolved Hide resolved
common/scripts/mesh-helper.sh Show resolved Hide resolved
common/scripts/mesh-helper.sh Show resolved Hide resolved
common/scripts/mesh-helper.sh Show resolved Hide resolved
TIISR
TIISR reviewed Oct 31, 2023
View reviewed changes
Copy link
Contributor

@TIISR TIISR left a comment

Choose a reason for hiding this comment

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

Written in a hurry, apologies if anything sounds harsh as it is not at all how I mean all this :)

modules/sc-mesh-secure-deployment/src/nats/initd/S9011sNatsMesh Show resolved Hide resolved
modules/sc-mesh-secure-deployment/src/nats/initd/S9011sNatsMesh Show resolved Hide resolved
modules/sc-mesh-secure-deployment/src/nats/scripts/cli_radio_on.py Show resolved Hide resolved
modules/sc-mesh-secure-deployment/src/nats/scripts/cli_settings_request.py Show resolved Hide resolved
modules/sc-mesh-secure-deployment/src/nats/scripts/cli_settings_request.py Show resolved Hide resolved
modules/sc-mesh-secure-deployment/src/nats/tests/test_settings.py Show resolved Hide resolved
modules/sc-mesh-secure-deployment/src/nats/tests/test_settings.py Show resolved Hide resolved
modules/sc-mesh-secure-deployment/src/nats/tests/test_settings.py Show resolved Hide resolved
modules/sc-mesh-secure-deployment/src/nats/tests/test_settings.py Show resolved Hide resolved
modules/utils/docker/entrypoint_nats.sh Outdated Show resolved Hide resolved
@joenpera
Fix review findings
b67d5f9 
- identity file deleted from test codes under nats/scripts
- /sys/class/net/<interface>/address used to get MAC address instead of
  complex grep/awk/print
- max_recon_attempts renamed to max_reconnection_attempts from test codes
  under nats/scripts

Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
TIISR
TIISR reviewed Oct 31, 2023
View reviewed changes
Copy link
Contributor

@TIISR TIISR left a comment

Choose a reason for hiding this comment

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

Not sure if my comments get stuck as Pending again unless I do this

@joenpera
Fix review findings in mesh-helper.sh
d730ee8 
Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera
Fix review findings
5353cf4 
- generate_bridge_ip renamed to generate_lan_bridge_ip

Jira-Id: SCDI-43

Signed-off-by: Mika Joenpera <[email protected]>
@joenpera joenpera merged commit 50b5c52 into develop Nov 1, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TIISR TIISR TIISR left review comments

@mbaddeley mbaddeley mbaddeley approved these changes

@pemanty pemanty pemanty approved these changes

@martin-tii martin-tii martin-tii approved these changes

@govindsi govindsi govindsi approved these changes

@saauvine saauvine Awaiting requested review from saauvine

@SelinaTII SelinaTII Awaiting requested review from SelinaTII

@jihonen jihonen Awaiting requested review from jihonen

@juhamunikie juhamunikie Awaiting requested review from juhamunikie

Assignees

@joenpera joenpera

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@joenpera @govindsi @mbaddeley @martin-tii @pemanty @TIISR @saauvine