Merge fe2a797 into 747b2fe

openwisp · Aug 7, 2018 · 4c8fea7 · 4c8fea7
2 parents 747b2fe + fe2a797
commit 4c8fea7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/netjsonconfig/backends/openwrt/converters/wireless.py b/netjsonconfig/backends/openwrt/converters/wireless.py
@@ -89,7 +89,7 @@ def __intermediate_encryption(self, wireless):
         }
         # if encryption disabled return empty dict
         if not encryption or disabled or encryption['protocol'] == 'none':
-            return {}
+            return {'encryption': 'none'}
         # otherwise configure encryption
         uci = encryption.copy()
         for option in ['protocol', 'key', 'cipher', 'disabled']:

diff --git a/tests/openwrt/test_encryption.py b/tests/openwrt/test_encryption.py
@@ -466,6 +466,7 @@ def test_encryption_disabled(self):
 
 config wifi-iface 'wifi_wlan0'
     option device 'radio0'
+    option encryption 'none'
     option ifname 'wlan0'
     option mode 'ap'
     option network 'wlan0'
@@ -498,6 +499,7 @@ def test_no_encryption(self):
 
 config wifi-iface 'wifi_wlan0'
     option device 'radio0'
+    option encryption 'none'
     option ifname 'wlan0'
     option mode 'ap'
     option network 'wlan0'