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.

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

Release candidate 2.2.0 to main #464

Merged
merged 700 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
700 commits
Select commit Hold shift + click to select a range
f730218
Integrate decision engine to LDPI
dania-tii Jan 22, 2024
b25ae41
Update stop features in main.py
dania-tii Jan 22, 2024
fb0be2c
Update ldpi main.py
dania-tii Jan 22, 2024
f6c6e52
Merge remote-tracking branch 'origin/develop' into mdm_use_upper_certs
saauvine Jan 23, 2024
81900c5
Add validation for the delivered configuration message
joenpera Jan 23, 2024
9f906ac
Review changes
joenpera Jan 23, 2024
06f7048
Merge pull request #384 from tiiuae/feature/halow_upgrade
joenpera Jan 24, 2024
10ba1ea
Move osf test to own folder.
Hiihtaja77 Jan 24, 2024
b7bb45c
Merge pull request #389 from tiiuae/feature/mdm_agent_empty_mesh_config
joenpera Jan 24, 2024
9cf2278
Use locks to protect interfaces list usage
saauvine Jan 24, 2024
7c0daf0
Fix correct MTU size for batman interface
joenpera Jan 24, 2024
af9e9e4
Merge pull request #393 from tiiuae/fix/mesh_mtu_size
TIISR Jan 24, 2024
eb530fa
Merge pull request #391 from tiiuae/refactor/osf-test-folder
joenpera Jan 25, 2024
e6ac606
Still activate CBMA only if feature set on config file
saauvine Jan 25, 2024
d2cf253
Refactoring MDM code
joenpera Jan 24, 2024
9671e9c
Remove Hostapd socket WAR
joenpera Jan 25, 2024
6f964b4
Merge pull request #394 from tiiuae/fix/hostapd
joenpera Jan 26, 2024
4415acf
Review fixes
joenpera Jan 26, 2024
f4186ec
Merge pull request #380 from tiiuae/mdm_use_upper_certs
saauvine Jan 26, 2024
7292187
Fix correct MTU size for batman interface
joenpera Jan 24, 2024
0abca0b
Move osf test to own folder.
Hiihtaja77 Jan 24, 2024
96b55ab
Remove Hostapd socket WAR
joenpera Jan 25, 2024
0a2f679
Merge branch 'develop' into refactoring_mdm
joenpera Jan 26, 2024
14816ec
Merge pull request #390 from tiiuae/refactoring_mdm
joenpera Jan 26, 2024
c894f5a
FMO/MDM split to separate files
joenpera Jan 26, 2024
ebbfbc7
FMO/MDM split and refactoring
joenpera Jan 29, 2024
8772356
Fix problem where nodes were not on same channel after start
joenpera Jan 29, 2024
1111668
Merge pull request #396 from tiiuae/fix/wifi_channel_problem
TIISR Jan 29, 2024
c5fffcd
Fix AX88719A adapter support
joenpera Jan 30, 2024
801e6dc
Move MDM agent's CBMA control to own module
saauvine Jan 30, 2024
eda85b9
Merge pull request #397 from tiiuae/fix/asix_ax88719_adapter
joenpera Jan 31, 2024
f8d1ffc
Add Basic Acceptance tests for CBMA
pentestiing Jan 31, 2024
44e3a16
Add OSF BAT tests.
Hiihtaja77 Jan 31, 2024
bb12073
Remove obsolete module
saauvine Jan 31, 2024
f08af27
Merge pull request #398 from tiiuae/cbma_ba_tests
TIISR Feb 1, 2024
2cc0b71
Merge pull request #399 from tiiuae/tests/osf-bat-tests
Feb 1, 2024
98b3be7
Fix status refreshing in get_identity
saauvine Feb 1, 2024
3fd1143
Merge pull request #395 from tiiuae/refactoring_mdm
TIISR Feb 1, 2024
b2fa71c
Remove default mesh start from entrypoint
joenpera Feb 2, 2024
e35168b
Disable FMO from features.yaml by default
joenpera Feb 2, 2024
ec65525
Merge remote-tracking branch 'origin/develop' into jamming_avoidance
dania-tii Feb 2, 2024
f9dfe49
Update OSF interface name, automatic detection of phy interface and m…
dania-tii Feb 2, 2024
f44c5ff
Ignore empty bridge and batman settings
saauvine Feb 5, 2024
659e785
Change bridge control
saauvine Feb 5, 2024
469780b
Add radio start to CBMA setup
joenpera Feb 5, 2024
a13c746
Update OSF interface name, automatic detection of phy interface and m…
dania-tii Feb 2, 2024
11f101f
Enable CBMA by default
saauvine Feb 6, 2024
66d4ec5
Power on radios after configuring CBMA
saauvine Feb 7, 2024
4d35457
Add only bat1 and wlan1 to br-lan
saauvine Feb 7, 2024
e4306e3
Do not apply CBMA for eth/lan/usb interfaces
saauvine Feb 7, 2024
abb0700
Fix AP start with brcm rpi radio
joenpera Feb 7, 2024
e5fd11c
Setup radios before adding interfaces to bridge
saauvine Feb 7, 2024
561e7a1
Fix status logging flood to mdm_agent log file
joenpera Feb 7, 2024
7421fc0
Add udp control server test.
Hiihtaja77 Feb 7, 2024
03ca3f4
Merge pull request #404 from tiiuae/tests/osf-udp-ctrl-test
Feb 8, 2024
777b236
Remove MDM agent system time check
joenpera Feb 8, 2024
1ecbff1
SECO-3544: multiradio bat test cases updated
murugesan-kumar Feb 12, 2024
a6e0301
Merge pull request #406 from tiiuae/feature/bat_halow_wifi
DamienDeMayaTII Feb 13, 2024
6c0b98e
Use downloaded RSA certificates for upper CBMA
saauvine Feb 15, 2024
8fe3369
Use birth certs with MDM server communication
saauvine Feb 16, 2024
85d24b6
Add global IPv6 for br-lan and bat0
joenpera Feb 16, 2024
bde6ef7
Put CBMA activation back behind feature flag
saauvine Feb 19, 2024
18a9444
Merge remote-tracking branch 'origin/develop' into jamming_avoidance
dania-tii Feb 19, 2024
68f2ed0
Change default scan interface name and update spectral manager test f…
dania-tii Feb 19, 2024
7567c60
Rename tests for test BLE_1M configuration.
Hiihtaja77 Feb 19, 2024
9e046ce
Add test for BLE_2M configuration.
Hiihtaja77 Feb 19, 2024
18d7688
Add bat test for stop/start osf driver.
Hiihtaja77 Feb 19, 2024
3d17e94
Start mesh using old way if CBMA feature flag not enabled
saauvine Feb 19, 2024
3fa106b
Do not start CBMA by default after getting upper CBMA certificates
saauvine Feb 20, 2024
421ff45
Merge pull request #408 from tiiuae/test/osf-bat-stoptstart-and-other
Feb 21, 2024
5697d3a
Merge pull request #402 from tiiuae/mvp
saauvine Feb 21, 2024
ae98c01
Remove old configuration items from mesh config
joenpera Feb 22, 2024
8f64f30
Fix returned br-lan address for NATS
joenpera Feb 22, 2024
bfe8eed
Add iperf for IPV6
francislin12 Feb 22, 2024
354d250
Fix validation for new config setup
joenpera Feb 22, 2024
6a90bf5
Add ipv6 throughput
francislin12 Feb 22, 2024
4a7d2b2
Fix service ipv4/ipv6 discovery
joenpera Feb 22, 2024
d6092f9
Fix NATS Discovery to support IPv6
joenpera Feb 23, 2024
76d9e48
Add configurations and performance tests for different osf's PHY.
Hiihtaja77 Feb 23, 2024
c02ecfd
Merge pull request #410 from tiiuae/tests/osf-config-perf-tests
Feb 26, 2024
32dba21
Merge pull request #409 from tiiuae/Throughput-batman-olsr
Feb 26, 2024
76994e2
Use RSA certificates with MDM server
saauvine Feb 27, 2024
1a79f36
CBMA integration work in progress files
joenpera Mar 1, 2024
146862a
Update LDPI test files
dania-tii Mar 6, 2024
8a1d58a
Update LDPI test files
dania-tii Mar 6, 2024
cf168ab
Initial CBMA integration
joenpera Mar 7, 2024
a589924
Upper CBMA trials
joenpera Mar 8, 2024
80d2318
default-mesh.sh code optimized, duplicated code is now function
sergei-petroff Mar 8, 2024
c53e11d
keepalived package removed
sergei-petroff Mar 8, 2024
0413e87
Update baseimage version and workflow actions
mehmetkillioglu Sep 22, 2023
1e74d47
Use a base image with both proxy clients
jari-hodju Oct 2, 2023
44f00ed
Upgrade baseimage to v3.1.0
maseabunikie Dec 13, 2023
6afc5fc
build branch changed
sergei-petroff Mar 8, 2024
af27a1e
Docker build workflow updated
sergei-petroff Mar 8, 2024
febf49d
MAC address creation for bridge and batman interfaces
joenpera Mar 11, 2024
c3e83a1
CBMA v0.0.6-old-fixes added
joenpera Mar 11, 2024
349c818
Add function to configure batman interfaces
saauvine Mar 11, 2024
109bccd
ros-with-env is now used to start mesh_executor
sergei-petroff Mar 11, 2024
094b9fa
Upper enable_macsec_encryption=True
joenpera Mar 12, 2024
9d19aee
env variable names now reflect its purpose better
sergei-petroff Mar 12, 2024
ea31fa2
Upper CBMA certificate integration
joenpera Mar 13, 2024
4124143
Change cbma_adaptation.py logger child to "CBMAAdaptation"
joenpera Mar 13, 2024
747107c
Temporarily disable interface_monitor_cb debug traces
joenpera Mar 14, 2024
0010d2e
Select Batman routing algo before creating bat interfaces
saauvine Mar 14, 2024
7133d21
Upgrade base images
jari-hodju Mar 14, 2024
5df00fe
Merge pull request #415 from tiiuae/feat-default-mesh-sergei-v3.2.0
sergei-petroff Mar 14, 2024
aa0829a
gitflow build condition changed, startup mess removed
sergei-petroff Mar 15, 2024
c6c0bab
ftl_plotter.py duplicate code removed
sergei-petroff Mar 15, 2024
271359b
default-mesh.sh code updated according to the shellcheck, unnecessary…
sergei-petroff Mar 15, 2024
ad708c8
CBMA macsec refresh_keys() commented out
joenpera Mar 15, 2024
2b12bc4
Merge pull request #411 from tiiuae/mvp
joenpera Mar 15, 2024
a91fc08
Upgrade CBMA to v0.0.8: Revert 3a7e766 ms monitoring + robustness
pentestiing Mar 17, 2024
29fbaba
Merge pull request #418 from tiiuae/upgrade-cbma-to-v0.0.8
TIISR Mar 17, 2024
a8de16e
Upgrade CBMA to v0.0.9: Fix MACsec monitoring + add new certs
pentestiing Mar 18, 2024
6caa353
Merge pull request #419 from tiiuae/upgrade-cbma-to-v0.0.9
TIISR Mar 19, 2024
6c305ab
Merge pull request #407 from tiiuae/jamming_avoidance
ZAbidTii Mar 21, 2024
c501f3b
Add delays for clean garbage symbols.
Hiihtaja77 Mar 21, 2024
51df9cc
Set new performance targets.
Hiihtaja77 Mar 21, 2024
5dc541c
Add test to read statistics from control server.
Hiihtaja77 Mar 21, 2024
8e11340
Add Lucius program and setup Alfred for it
johan-juntunen Mar 21, 2024
ccba66b
Merge pull request #420 from tiiuae/lucius
TIISR Mar 21, 2024
e7a041f
Fix permissions for entrypoint_nats.sh
johan-juntunen Mar 22, 2024
4223ee3
Update also other executable permissions
johan-juntunen Mar 22, 2024
a69cf51
Merge pull request #421 from tiiuae/lucius-startup-fix
TIISR Mar 22, 2024
f34fc1e
Add BATMAN_V support to field test logger
saauvine Mar 22, 2024
e8d5b43
Make MDM Agent Zeroconf module work with both IPv4 and IPv6
pentestiing Mar 23, 2024
10c3251
Increase timeouts for connections with MDM Server in MDM Agent
pentestiing Mar 23, 2024
17e8b05
Upgrade CBMA to v0.1.2: Speed up mesh connectivity + robustness
pentestiing Mar 23, 2024
3ca65b0
Merge pull request #424 from tiiuae/upgrade-cbma-to-v0.1.2
TIISR Mar 23, 2024
46dc14b
Merge pull request #423 from tiiuae/mdm_agent_ipv6_support
TIISR Mar 23, 2024
17d6ee3
Add mcast tests for send and receive UDP.
Hiihtaja77 Mar 25, 2024
4428ea4
Merge pull request #417 from tiiuae/feat-default-mesh-sergei
joenpera Mar 26, 2024
39ae05e
Fix crash in MDM agent caused by interface no name
joenpera Mar 28, 2024
87e8e6c
Merge pull request #426 from tiiuae/tests/osf-mcast-tests
Mar 28, 2024
4b47390
Merge pull request #427 from tiiuae/mdm_agent_crash_fix_no_name
TIISR Mar 28, 2024
e1ee5a2
Remove incorrect returns in S90APoint
pentestiing Mar 29, 2024
4fd964a
Kill previous SLAAC/radvd instance on stop/restart in S90APoint
pentestiing Mar 29, 2024
25d1bfb
First try to gracefully kill hostapd on stop/restart in S90APoint
pentestiing Mar 29, 2024
832eb55
Silence kill stderr on S90APoint
pentestiing Mar 29, 2024
cea210e
Merge pull request #428 from tiiuae/S90APoint-fix
TIISR Mar 29, 2024
1860a37
Make MDM Agent wait until interfaces are ready before starting CBMA
pentestiing Mar 29, 2024
676f25e
Merge pull request #429 from tiiuae/mdm-agent-wait-iface-ready
TIISR Mar 29, 2024
177e8a1
Fix missing index variable in MDM Agent Global IPv6 assignment func
pentestiing Apr 1, 2024
9e685f9
Fix bridge bat1 to br-lan instead of other way around in Lucius
pentestiing Apr 1, 2024
3cacf26
Wait until bat1 is up before starting Alfred and Lucius
johan-juntunen Apr 1, 2024
fde27c6
Revert "Wait until bat1 is up before starting Alfred and Lucius"
johan-juntunen Apr 1, 2024
2aa368d
Wait until bat1 is up before starting Alfred for bat1, remove link edits
johan-juntunen Apr 1, 2024
702d723
Add changes to all start_alfred_upper.sh files
pentestiing Apr 1, 2024
32d917f
Bring bat1 up before launching alfred in start_alfred_upper.sh
pentestiing Apr 1, 2024
ba3b336
Merge pull request #431 from tiiuae/lucius-br-lan-bat1-bridge-fix
TIISR Apr 1, 2024
15afa8e
Merge pull request #430 from tiiuae/mdm-agent-global-ipv6-fix
TIISR Apr 2, 2024
ac7d039
Add Github workflow to autocreate VERSION files on main and develop
pentestiing Apr 3, 2024
92c8273
Add cbma_check_running.sh functional test
pentestiing Apr 3, 2024
ee97a9d
Add cbma_check_connected.sh functional test
pentestiing Apr 3, 2024
2021db9
Add cbma_check_secured.sh functional test
pentestiing Apr 3, 2024
c9839b9
Merge pull request #432 from tiiuae/autocreate-version-file
TIISR Apr 3, 2024
b90f274
Merge pull request #433 from tiiuae/cbma-ba-functional-tests
TIISR Apr 4, 2024
6c880bc
Revert "Add Github workflow to autocreate VERSION files on main and d…
pentestiing Apr 4, 2024
791c199
Merge pull request #434 from tiiuae/revert-autocreate-version-file
TIISR Apr 5, 2024
a37d6ec
Fix MDM Agent process stop
joenpera Apr 5, 2024
1ca0456
Fixing review comments
joenpera Apr 8, 2024
18f4b2c
Merge pull request #435 from tiiuae/fix_mdm_agent_stop
joenpera Apr 8, 2024
1a56241
Merge pull request #422 from tiiuae/field_test_logger_update
saauvine Apr 9, 2024
5846285
Add config file for CBMA
saauvine Apr 10, 2024
b27d237
MDM agent/Controller UnitTests
joenpera Apr 10, 2024
19cf5f9
Merge pull request #437 from tiiuae/cbma_config_file
saauvine Apr 16, 2024
9af86f9
Merge branch 'develop' into mdm_agent_unit_tests
joenpera Apr 16, 2024
1a5e8a8
Review fixes
joenpera Apr 18, 2024
d7dfdc6
Merge pull request #436 from tiiuae/mdm_agent_unit_tests
joenpera Apr 18, 2024
dab8245
Fix hostapd_cli usage
joenpera Apr 18, 2024
3339ce9
Add MDM agent UnitTests
joenpera Apr 18, 2024
c37470d
Add more configuration options
saauvine Apr 19, 2024
bd02cc3
Merge pull request #438 from tiiuae/fix_hostapd_cli
joenpera Apr 22, 2024
79eeae2
Upgrade CBMA to v0.1.3: Add MACsec bridge to batman on startup
pentestiing Apr 22, 2024
df035b4
Fix review findings
joenpera Apr 23, 2024
785e27a
Merge pull request #439 from tiiuae/mdm_agent_unit_tests
joenpera Apr 23, 2024
b24ddcb
Merge remote-tracking branch 'origin/develop' into cbma_config_file
saauvine Apr 23, 2024
082b52a
Merge pull request #441 from tiiuae/upgrade-cbma-to-v0.1.3
TIISR Apr 24, 2024
e2d5ca3
Refactor CBMA adaptation module and add new unit tests
saauvine Apr 24, 2024
e854b08
Merge remote-tracking branch 'origin/develop' into cbma_config_file
saauvine Apr 24, 2024
5b439be
Set hop penalty after setting up bridge
saauvine Apr 24, 2024
e4652e9
Cleanup default config file
saauvine Apr 24, 2024
8e77950
Revert "Fix hostapd_cli usage"
joenpera Apr 25, 2024
54f28a9
Merge pull request #443 from tiiuae/remove_previous_ap_initd_change
TIISR Apr 25, 2024
cc2d566
Fix review findings
saauvine Apr 29, 2024
32683a7
Change MTU sizes according the interface color
joenpera Apr 29, 2024
e5c03fe
UnitTests and Coverage reporting
joenpera Apr 25, 2024
501aa32
Merge pull request #445 from tiiuae/mtu_size_fixes
TIISR Apr 29, 2024
61dfa5e
Merge branch 'develop' into cbma_config_file
saauvine Apr 29, 2024
434a3c4
Remove MTU setting as handled via CBMA adaptation
saauvine Apr 29, 2024
884ae7e
Update unit tests for bat_ctrl_utils
saauvine Apr 29, 2024
9befe79
Fix CBMA adaptation merge
saauvine Apr 29, 2024
59fb974
Merge pull request #442 from tiiuae/cbma_config_file
saauvine Apr 29, 2024
3f15947
Upgrade CBMA to v0.1.4: Increase HOPEFULLY1500 to 1500
pentestiing Apr 30, 2024
c7cd79c
Merge pull request #446 from tiiuae/upgrade-cbma-to-v0.1.4
TIISR Apr 30, 2024
86da4cc
Change MDM agent default None service interface to bat0
joenpera Apr 30, 2024
5bc60ee
Merge pull request #448 from tiiuae/bat0_mdm_connection
TIISR Apr 30, 2024
fd6bf71
Upgrade CBMA to v0.1.5: Add constants.rc + don't clean MACsec bridge
pentestiing May 1, 2024
e2df8df
Merge pull request #449 from tiiuae/upgrade-cbma-to-v0.1.5
TIISR May 2, 2024
08e343f
Use hardcoded fallback when MDM Server mDNS resolution fails
pentestiing May 1, 2024
f09732d
Move IPV6_*_PREFIX to Constants
pentestiing May 2, 2024
816b226
Merge pull request #450 from tiiuae/mdm_agent_mdns_resolution_fix
TIISR May 2, 2024
f33fc69
Change MDM agent default None startup parameter to bat0
joenpera May 2, 2024
5223d47
Fix AP handling and remove ctrl_interface as not needed for ms2.0
joenpera Apr 30, 2024
11ea1d3
Merge pull request #452 from tiiuae/develop
joenpera May 3, 2024
06d46cd
Merge branch 'develop' into default_lower_macsec_if
saauvine May 3, 2024
0d429ae
Change service monitor control
saauvine May 3, 2024
4c22ad7
Use threading lock to protect MDM service status flag
saauvine May 3, 2024
3f51de6
Do not add vlan_red to bridge by default
saauvine May 6, 2024
6011b78
Merge pull request #447 from tiiuae/ap_handling_cleanup
joenpera May 7, 2024
1826923
Fix review findings
saauvine May 7, 2024
48c4ea9
Improve CBMA Adaptation error handling
saauvine May 8, 2024
3d2fc20
Hardcoding br-lan in radvd configuration to force Router Advertisemen…
TIISR May 8, 2024
ce9043c
Merge pull request #453 from tiiuae/force_router_advertisements_leak
TIISR May 9, 2024
e045334
Merge pull request #451 from tiiuae/default_lower_macsec_if
joenpera May 10, 2024
de6e3ad
Add settings/command Unittest
joenpera May 10, 2024
397d769
Traffic multiplication appears to be due to a regression in the Lower…
TIISR May 10, 2024
4110869
Merge pull request #455 from tiiuae/mess_bridge_hotfix2
TIISR May 10, 2024
e437474
Change Halow MTU handling
joenpera May 13, 2024
e397a53
Merge branch 'develop' into halow_mtu_handling_change
joenpera May 13, 2024
78001c8
Fix review findings
joenpera May 14, 2024
8c633fd
Review fixes
joenpera May 14, 2024
1c38941
Merge pull request #456 from tiiuae/halow_mtu_handling_change
joenpera May 14, 2024
f1d799a
Field Test Logger update to get halow support working
joenpera May 15, 2024
0f2ee1b
Crash fix for field_test_logger.py
joenpera May 15, 2024
89f65e5
Fix review findings
joenpera May 15, 2024
12fd751
Merge pull request #457 from tiiuae/field_test_updates
joenpera May 15, 2024
f8340f6
Merge pull request #444 from tiiuae/unittest_impl
joenpera May 17, 2024
0a7ffdb
Fix comms_status.py resource warnings
joenpera May 17, 2024
750800c
Add unit tests for CBMAAdaptation
saauvine May 17, 2024
65900fd
Merge pull request #458 from tiiuae/resource_warning_fix
joenpera May 20, 2024
2b647eb
Merge remote-tracking branch 'origin/develop' into cbma_adaptation_un…
saauvine May 20, 2024
e295093
Add unit test module and black interface list filtering
saauvine May 20, 2024
1cd2fb9
Change CBMAAdaptation's logging level back to 'INFO'
saauvine May 20, 2024
5a9a3fd
Use default wait_for_interface timeout for batman interfaces
saauvine May 20, 2024
cba464d
Add MDM agent unittests
joenpera May 21, 2024
bdd1774
Add CBMA configs validation and unit tests
saauvine May 22, 2024
f939611
Fix review findings
saauvine May 22, 2024
85ed8fb
Review finding fixes
joenpera May 23, 2024
190b749
Merge pull request #460 from tiiuae/mdm_agent_unittests
joenpera May 23, 2024
d437940
Merge branch 'develop' into cbma_adaptation_unit_test
saauvine May 23, 2024
f4d21af
Add separate requirements.txt for unit tests
saauvine May 23, 2024
85f31eb
Merge pull request #459 from tiiuae/cbma_adaptation_unit_test
saauvine May 23, 2024
748d4bc
Add usb0 to red_interfaces config list
saauvine May 28, 2024
e13dca9
Set bat0/1 hop penalty to 1
saauvine May 28, 2024
b14bd97
Merge pull request #461 from tiiuae/config_change
TIISR May 28, 2024
839f72b
Increase BATMAN_OVERHEAD constant for MDM agent
joenpera Jun 6, 2024
03097d8
Merge pull request #462 from tiiuae/increase_mtu_overheads
TIISR Jun 6, 2024
8b60649
Upgrade CBMA to v0.1.7: Increase MTU overhead + add nodst + log fix
pentestiing Jun 6, 2024
74c76dc
Merge pull request #463 from tiiuae/upgrade-cbma-to-v0.1.7
TIISR Jun 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
23 changes: 18 additions & 5 deletions .github/workflows/tii-mesh-com.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,27 @@ on:
jobs:
tii-mesh-com:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@main
with:
tool-cache: false

- uses: actions/checkout@v4

- uses: actions/checkout@v2
- uses: docker/setup-buildx-action@v3

- uses: docker/setup-buildx-action@v1
- name: Setup QEMU
uses: docker/setup-qemu-action@v3
with:
platforms: amd64,arm64,riscv64

- name: Docker meta
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5
with:
images: ghcr.io/tiiuae/tii-mesh-com
tags: |
Expand All @@ -34,16 +46,17 @@ jobs:
type=raw,value=latest

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build tii-mesh-com image and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm64,linux/riscv64
file: ./modules/mesh_com/Dockerfile
push: true
tags: ${{ steps.meta.outputs.tags }}
Expand Down
82 changes: 82 additions & 0 deletions common/scripts/default-mesh.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
#!/bin/bash -eu

# Check if proper default mesh class is set
if [[ "$MESH_CLASS" != "gs" && "$MESH_CLASS" != "edge" ]]; then
echo "Wrong mesh class, check container env parameters"
exit 1
else
echo "Mesh class: " "$MESH_CLASS"
fi

# Function to check if drone is provisioned
check_drone_provisioned() {
echo "INFO: Checking if drone is provisioned..."
while true; do
if [ "$DRONE_DEVICE_ID" = "bootstrap" ]; then
sleep 10
else
echo "INFO: Drone is provisioned, continuing"
break
fi
done
}

# Function to start mesh executor to publish ROS topic
start_mesh_executor() {
sleep 120
echo "INFO: Starting ROS topic"
ros-with-env /opt/ros/"${ROS_DISTRO}"/lib/mesh_com/mesh_executor
}

#Function to start mesh-11s.sh
start_mesh-11s() {
/opt/ros/"${ROS_DISTRO}"/share/bin/mesh-11s.sh "$MESH_MODE" "$MESH_IP" "$MESH_MASK" "$MESH_MAC" "$MESH_KEY" "$MESH_ESSID" "$MESH_FREQ" "$MESH_TX" "$MESH_COUNTRY"
echo "mesh setup done"
}


# Set IP based on drone role/type.
if [[ "$DRONE_TYPE" == "recon" ]]; then
# 192.168.240.1-192.168.246.255
MESH_IP="$EDGE_IP"
start_mesh-11s
gateway_ip="$FOG_GW_VIP" # VRRP FOG virtual IP for the Default mesh
route add default gw "$gateway_ip" bat0
check_drone_provisioned
# Start executor. Required to publish ROS2 topic.
start_mesh_executor
elif [ "$DRONE_TYPE" == "groundstation" ]; then
MESH_IP="$GS_IP"
start_mesh-11s
check_drone_provisioned
# Start executor. Required to publish ROS2 topic.
start_mesh_executor
elif [[ "$DRONE_TYPE" == "fog" || "$DRONE_TYPE" == "cm-fog" ]]; then
if [ "$MESH_CLASS" == "edge" ]; then # mesh class is edge
MESH_IP=$EDGE_IP
else
# mesh class is gs; single cm-fog or fog: 192.168.248.10; multiple cm-fog: 192.168.248.2-9
MESH_IP=$FOG_IP_IN_GS_MESH
fi
start_mesh-11s
if [ "$MESH_CLASS" == "gs" ]; then
gateway_ip="$GS_GW_VIP" # VRRP GS virtual IP for the Default mesh
route add default gw "$gateway_ip" bat0
fi
check_drone_provisioned
# Start executor. Required to publish ROS2 topic.
start_mesh_executor
elif [[ "$DRONE_TYPE" == "singlemesh" ]]; then
# singlemesh: 192.168.248.11-254
MESH_IP="$RECON_IP_IN_GS_MESH"
start_mesh-11s
# mesh class is gs
gateway_ip="$GS_GW_VIP" # VRRP GS virtual IP for the Default mesh
route add default gw "$gateway_ip" bat0
check_drone_provisioned
# Start executor. Required to publish ROS2 topic.
start_mesh_executor
else
echo "drone type not implemented: $DRONE_TYPE"
exit 1
fi
Loading
Loading