Merged PR 458: Carry over airspace hotfixes from internal
## Summary Carried over hit fixes from internal that backtracked on the complex channel width stuff for now and focussed on getting a stable data rate baked in for each frequency. Implemented overriding of frequency max capacities on the airspace. updated documentation to reflect the changes in airspace.py. ## Test process - Original tests still work - Tested reading the frequency capacity overrides from config file - Tested that setting the frequency override to 0.0 blocks the channel ## 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 - [X] attended to any **TO-DOs** left in the code Related work items: #2745
This commit is contained in:
@@ -9,8 +9,6 @@ game:
|
||||
|
||||
simulation:
|
||||
network:
|
||||
airspace:
|
||||
airspace_environment_type: urban
|
||||
nodes:
|
||||
- type: computer
|
||||
hostname: pc_a
|
||||
|
||||
@@ -10,7 +10,9 @@ game:
|
||||
simulation:
|
||||
network:
|
||||
airspace:
|
||||
airspace_environment_type: urban
|
||||
frequency_max_capacity_mbps:
|
||||
WIFI_2_4: 123.45
|
||||
WIFI_5: 0.0
|
||||
nodes:
|
||||
- type: computer
|
||||
hostname: pc_a
|
||||
@@ -37,8 +39,7 @@ simulation:
|
||||
wireless_access_point:
|
||||
ip_address: 192.168.1.1
|
||||
subnet_mask: 255.255.255.0
|
||||
frequency: WIFI_5
|
||||
channel_width: 80
|
||||
frequency: WIFI_2_4
|
||||
acl:
|
||||
1:
|
||||
action: PERMIT
|
||||
@@ -59,8 +60,7 @@ simulation:
|
||||
wireless_access_point:
|
||||
ip_address: 192.168.1.2
|
||||
subnet_mask: 255.255.255.0
|
||||
frequency: WIFI_5
|
||||
channel_width: 80
|
||||
frequency: WIFI_2_4
|
||||
acl:
|
||||
1:
|
||||
action: PERMIT
|
||||
@@ -10,7 +10,9 @@ game:
|
||||
simulation:
|
||||
network:
|
||||
airspace:
|
||||
airspace_environment_type: blocked
|
||||
frequency_max_capacity_mbps:
|
||||
WIFI_2_4: 0.0
|
||||
WIFI_5: 0.0
|
||||
nodes:
|
||||
- type: computer
|
||||
hostname: pc_a
|
||||
@@ -37,8 +39,7 @@ simulation:
|
||||
wireless_access_point:
|
||||
ip_address: 192.168.1.1
|
||||
subnet_mask: 255.255.255.0
|
||||
frequency: WIFI_5
|
||||
channel_width: 80
|
||||
frequency: WIFI_2_4
|
||||
acl:
|
||||
1:
|
||||
action: PERMIT
|
||||
@@ -59,8 +60,7 @@ simulation:
|
||||
wireless_access_point:
|
||||
ip_address: 192.168.1.2
|
||||
subnet_mask: 255.255.255.0
|
||||
frequency: WIFI_5
|
||||
channel_width: 80
|
||||
frequency: WIFI_2_4
|
||||
acl:
|
||||
1:
|
||||
action: PERMIT
|
||||
Reference in New Issue
Block a user