[fix] Fixed parsing of wifi with encryption set to none

openwisp · May 15, 2022 · 226c983 · 226c983
1 parent a0f78ff
commit 226c983
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 deletions.
diff --git a/netjsonconfig/backends/openwrt/converters/wireless.py b/netjsonconfig/backends/openwrt/converters/wireless.py
@@ -255,7 +255,7 @@ def __netjson_wifi_typecast(self, wifi):
         'wps_pin',
     ]
 
-    def __netjson_encryption(self, wifi):
+    def __netjson_encryption(self, wifi):  # noqa: max-complexity: 11
         if 'encryption' not in wifi:
             return
         settings = {}
@@ -268,6 +268,10 @@ def __netjson_encryption(self, wifi):
                     wps = True
         # determine NetJSON protocol and cipher
         protocol = wifi.pop('encryption')
+        # if encryption is diabled just set it to none and return
+        if protocol == 'none':
+            wifi['encryption'] = {'protocol': 'none'}
+            return
         cipher = 'auto'
         if '+' in protocol:
             protocol, cipher = protocol.split('+', 1)

diff --git a/tests/openwrt/test_encryption.py b/tests/openwrt/test_encryption.py
@@ -950,25 +950,21 @@ def test_encryption_disabled(self):
         )
         self.assertEqual(o.render(), expected)
 
-    def test_no_encryption(self):
-        o = OpenWrt(
+    _no_encryption_netjson = {
+        "interfaces": [
             {
-                "interfaces": [
-                    {
-                        "name": "wlan0",
-                        "type": "wireless",
-                        "wireless": {
-                            "radio": "radio0",
-                            "mode": "access_point",
-                            "ssid": "open",
-                            "encryption": {"protocol": "none"},
-                        },
-                    }
-                ]
+                "name": "wlan0",
+                "type": "wireless",
+                "wireless": {
+                    "radio": "radio0",
+                    "mode": "access_point",
+                    "ssid": "open",
+                    "encryption": {"protocol": "none"},
+                },
             }
-        )
-        expected = self._tabs(
-            """package network
+        ]
+    }
+    _no_encryption_uci = """package network
 
 config device 'device_wlan0'
     option name 'wlan0'
@@ -987,9 +983,16 @@ def test_no_encryption(self):
     option network 'wlan0'
     option ssid 'open'
 """
-        )
+
+    def test_render_no_encryption(self):
+        o = OpenWrt(self._no_encryption_netjson)
+        expected = self._tabs(self._no_encryption_uci)
         self.assertEqual(o.render(), expected)
 
+    def test_parse_no_encryption(self):
+        o = OpenWrt(native=self._no_encryption_uci)
+        self.assertEqual(o.config, self._no_encryption_netjson)
+
     _wpa2_80211s_netjson = {
         "interfaces": [
             {