[change] Don't attach WiFi interface unless explicitly defined

There's no point in trying to attach a WiFi interface to itself. It's unnecessary and can cause issues in some situations.
openwisp · Jun 7, 2024 · eb192a0 · eb192a0
1 parent 6c46ca1
commit eb192a0
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 56 deletions.
diff --git a/netjsonconfig/backends/openwrt/converters/wireless.py b/netjsonconfig/backends/openwrt/converters/wireless.py
@@ -73,8 +73,8 @@ def __intermediate_wireless(self, interface):
             try:
                 bridges = self._bridged_wifi[interface['name']]
             except KeyError:
-                # default to the value of "network" or inteface name
-                network = [interface.get('network', interface['name'])]
+                # don't bridge to anything unless explicitly specified
+                network = []
             else:
                 network = bridges
             wireless['network'] = network

diff --git a/tests/openwrt/test_backend.py b/tests/openwrt/test_backend.py
@@ -181,7 +181,6 @@ def test_generate(self):
     option hidden '1'
     option ifname 'wlan0'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'MyWifiAP'
 """
         )

diff --git a/tests/openwrt/test_encryption.py b/tests/openwrt/test_encryption.py
@@ -36,7 +36,6 @@ class TestEncryption(unittest.TestCase, _TabsMixin):
     option ifname 'wlan0'
     option key 'passphrase012345'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'wpa3-personal'
 """
 
@@ -77,7 +76,6 @@ def test_parse_wpa3_personal(self):
     option ifname 'wlan0'
     option key 'passphrase012345'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'wpa2-3-personal-mixed'
 """
 
@@ -118,7 +116,6 @@ def test_parse_wpa2_personal_mixed(self):
     option ifname 'wlan0'
     option key 'passphrase012345'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'wpa2-personal'
 """
 
@@ -159,7 +156,6 @@ def test_parse_wpa2_personal(self):
     option ifname 'wlan0'
     option key 'passphrase012345'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'wpa2-personal'
 """
 
@@ -198,7 +194,6 @@ def test_parse_wpa_personal_mixed(self):
     option ifname 'wlan0'
     option key 'passphrase012345'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'wpa-personal'
 """
 
@@ -243,7 +238,6 @@ def test_parse_wpa_personal(self):
     option ifname 'wlan0'
     option key 'radius_secret'
     option mode 'ap'
-    option network 'wlan0'
     option server '192.168.0.1'
     option ssid 'enterprise-mixed'
 """
@@ -306,7 +300,6 @@ def test_parse_wpa2_enterprise_mixed_ap(self):
     option key 'radius_secret'
     option mode 'ap'
     option nasid '2'
-    option network 'wlan0'
     option port '1812'
     option server '192.168.0.1'
     option ssid 'wpa3-enterprise'
@@ -361,7 +354,6 @@ def test_parse_wpa3_enterprise(self):
     option key 'radius_secret'
     option mode 'ap'
     option nasid '2'
-    option network 'wlan0'
     option port '1812'
     option server '192.168.0.1'
     option ssid 'wpa2-802.1x'
@@ -407,7 +399,6 @@ def test_parse_wpa2_enterprise(self):
     option ifname 'wlan0'
     option key 'radius_secret'
     option mode 'ap'
-    option network 'wlan0'
     option server '192.168.0.1'
     option ssid 'enterprise-mixed'
 """
@@ -451,7 +442,6 @@ def test_parse_wpa_enterprise_mixed_ap(self):
     option ifname 'wlan0'
     option key 'radius_secret'
     option mode 'ap'
-    option network 'wlan0'
     option server '192.168.0.1'
     option ssid 'enterprise'
 """
@@ -499,7 +489,6 @@ def test_parse_wpa_enterprise_ap(self):
     option ieee80211w '2'
     option ifname 'wlan0'
     option mode 'sta'
-    option network 'wlan0'
     option password 'test-password'
     option ssid 'enterprise-client'
 """
@@ -546,7 +535,6 @@ def test_parse_wpa3_enterprise_client(self):
     option ieee80211w '1'
     option ifname 'wlan0'
     option mode 'sta'
-    option network 'wlan0'
     option password 'test-password'
     option ssid 'enterprise-client'
 """
@@ -593,7 +581,6 @@ def test_parse_wpa2_enterprise_client(self):
     option identity 'test-identity'
     option ifname 'wlan0'
     option mode 'sta'
-    option network 'wlan0'
     option password 'test-password'
     option ssid 'enterprise-client'
 """
@@ -640,7 +627,6 @@ def test_parse_wpa2_enterprise_ttls_client(self):
     option identity 'test-identity'
     option ifname 'wlan0'
     option mode 'sta'
-    option network 'wlan0'
     option password 'test-password'
     option ssid 'enterprise-client'
 """
@@ -687,7 +673,6 @@ def test_parse_wpa2_enterprise_peap_client(self):
     option identity 'test-identity'
     option ifname 'wlan0'
     option mode 'sta'
-    option network 'wlan0'
     option password 'test-password'
     option ssid 'enterprise-client'
 """
@@ -724,7 +709,6 @@ def test_render_wpa2_enterprise_tls_client_auth(self):
     option key '1'
     option key1 's:wepkey1234567'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'wep'
 """
 
@@ -764,7 +748,6 @@ def test_parse_wep_open(self):
     option key '1'
     option key1 'wepkey1234567'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'wep'
 """
 
@@ -807,7 +790,6 @@ def test_encryption_disabled(self):
     option encryption 'none'
     option ifname 'wlan0'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'MyNetwork'
 """
         )
@@ -834,7 +816,6 @@ def test_encryption_disabled(self):
     option encryption 'none'
     option ifname 'wlan0'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'open'
 """
 
@@ -874,7 +855,6 @@ def test_parse_no_encryption(self):
     option key 'passphrase012345'
     option mesh_id 'encrypted-mesh'
     option mode 'mesh'
-    option network 'mesh0'
 """
 
     def test_render_wpa2_80211s(self):
@@ -915,7 +895,6 @@ def test_parse_wpa2_80211s(self):
     option key 'passphrase012345'
     option mesh_id 'encrypted-mesh'
     option mode 'mesh'
-    option network 'mesh0'
 """
 
     def test_render_wpa3_80211s(self):
@@ -955,7 +934,6 @@ def test_parse_wpa3_80211s(self):
     option ifname 'wlan0'
     option key 'passphrase012345'
     option mode 'adhoc'
-    option network 'wlan0'
     option ssid 'encrypted-adhoc'
 """
 
@@ -994,7 +972,6 @@ def test_parse_wpa2_adhoc(self):
     option encryption 'psk'
     option ifname 'wlan0'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'wps-ssid'
     option wps_label '0'
     option wps_pin 'pin1234'
@@ -1138,7 +1115,6 @@ def test_render_ieee80211w(self):
     option ieee80211w '1'
     option ifname 'wlan0'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'owe_ssid'
 """
 

diff --git a/tests/openwrt/test_wireless.py b/tests/openwrt/test_wireless.py
@@ -52,7 +52,6 @@ class TestWireless(unittest.TestCase, _TabsMixin):
     option ifname 'wlan0'
     option isolate '1'
     option mode 'ap'
-    option network 'wlan0'
     option rts '1300'
     option ssid 'MyWifiAP'
 """
@@ -78,7 +77,6 @@ def test_parse_wifi_interface_partial(self):
     option device 'radio0'
     option ifname 'wlan0'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'MyWifiAP'
 """
         )
@@ -136,15 +134,13 @@ def test_parse_wifi_interface_partial(self):
     option device 'radio0'
     option ifname 'wlan0'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'ap-ssid'
 
 config wifi-iface 'wifi_wlan1'
     option bssid '00:11:22:33:44:55'
     option device 'radio1'
     option ifname 'wlan1'
     option mode 'adhoc'
-    option network 'wlan1'
     option ssid 'adhoc-ssid'
 """
 
@@ -246,7 +242,6 @@ def test_parse_wifi_bridge(self):
     option device 'radio0'
     option ifname 'wsta0'
     option mode 'sta'
-    option network 'wsta0'
     option ssid 'open'
     option wds '0'
 """
@@ -284,7 +279,6 @@ def test_render_wireless_empty_network_attr(self):
     option device 'radio0'
     option ifname 'wlan0'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'open'
 """
         )
@@ -333,7 +327,6 @@ def test_wireless_network_attr_validation(self):
     option device 'radio0'
     option ifname 'wlan0'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'open'
 """
 
@@ -429,7 +422,6 @@ def test_network_dash_conversion(self):
     option disabled '1'
     option ifname 'wlan0'
     option mode 'sta'
-    option network 'wlan0'
     option ssid 'mywifi'
 """
 
@@ -482,7 +474,6 @@ def test_parse_interface_disabled_partial(self):
     option device 'radio0'
     option ifname 'wlan0'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'MyWdsAp'
     option wds '1'
 """
@@ -527,7 +518,6 @@ def test_wifi_options_zero(self):
     option device 'radio0'
     option ifname 'wlan0'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'MyWifiAP'
     option wmm '1'
 """
@@ -558,7 +548,6 @@ def test_wifi_options_zero(self):
     list maclist 'E8:94:F6:33:8C:1D'
     list maclist '42:6c:8f:95:0f:00'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'MyWifiAP'
 """
 
@@ -903,7 +892,6 @@ def test_bssid_station(self):
     option device 'radio0'
     option ifname 'wlan0'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'open'
 """
 
@@ -956,7 +944,6 @@ def test_isolate(self):
     option ifname 'wlan0'
     option macaddr 'E8:94:F6:33:8C:00'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'open'
 """
 
@@ -989,7 +976,6 @@ def test_parse_macaddr_override(self):
     option device 'radio0'
     option ifname 'wlan0'
     option mode 'ap'
-    option network 'wlan0'
     option ssid 'MyWifiAP'
 """