Merge branch 'master' into openwrt-firewall

Author: jonathanunderwood

CHANGES.rst

@@ -1,6 +1,14 @@
 Change log
 ==========
 
+Version 0.9.1 [2020-02-15]
+--------------------------
+
+- [fix] Removed ``mtu_disc`` from ``auto_client`` method because it causes
+  issues on most OpenWRT systems
+- [fix] Avoided maxLength on PIN property to allow configuration variables
+- [change] Add missing TLS ciphers to OpenVPN
+
 Version 0.9.0 [2020-11-18]
 --------------------------
 

docs/source/backends/openwrt.rst

@@ -1353,7 +1353,7 @@ also requires setting the following additional options for each radio in the lis
 +--------------+---------+-----------------------------------------------+
 | key name     | type    | allowed values                                |
 +==============+=========+===============================================+
-| ``driver``   | string  | mac80211, madwifi, ath5k, ath9k, broadcom     |
+| ``driver``   | string  | mac80211, atheros, ath5k, ath9k, broadcom     |
 +--------------+---------+-----------------------------------------------+
 | ``protocol`` | string  | 802.11a, 802.11b, 802.11g, 802.11n, 802.11ac  |
 +--------------+---------+-----------------------------------------------+

netjsonconfig/backends/openvpn/schema.py

@@ -111,16 +111,19 @@
                         "AES-128-CFB",
                         "AES-128-CFB1",
                         "AES-128-CFB8",
+                        "AES-128-GCM",
                         "AES-128-OFB",
                         "AES-192-CBC",
                         "AES-192-CFB",
                         "AES-192-CFB1",
                         "AES-192-CFB8",
+                        "AES-192-GCM",
                         "AES-192-OFB",
                         "AES-256-CBC",
                         "AES-256-CFB",
                         "AES-256-CFB1",
                         "AES-256-CFB8",
+                        "AES-256-GCM",
                         "AES-256-OFB",
                         "BF-CBC",
                         "BF-CFB",

netjsonconfig/backends/openwrt/converters/radios.py

@@ -28,6 +28,8 @@ def __intermediate_radio(self, radio):
         # determine channel width
         if radio['type'] == 'mac80211':
             radio['htmode'] = self.__intermediate_htmode(radio)
+        else:
+            del radio['protocol']
         # ensure country is uppercase
         if 'country' in radio:
             radio['country'] = radio['country'].upper()

netjsonconfig/backends/openwrt/schema.py

@@ -236,7 +236,7 @@
                 "properties": {
                     "driver": {
                         "type": "string",
-                        "enum": ["mac80211", "madwifi", "ath5k", "ath9k", "broadcom"],
+                        "enum": ["mac80211", "atheros", "ath5k", "ath9k", "broadcom"],
                         "default": default_radio_driver,
                         "propertyOrder": 2,
                     }

netjsonconfig/version.py

@@ -1,4 +1,4 @@
-VERSION = (0, 9, 0, 'final')
+VERSION = (0, 9, 1, 'final')
 __version__ = VERSION
 
 

tests/openwrt/test_radio.py

@@ -617,6 +617,36 @@ def test_render_radio_list_option(self):
         )
         self.assertEqual(o.render(), expected)
 
+    def test_render_atheros_driver(self):
+        expected = self._tabs(
+            """package wireless
+
+config wifi-device 'wifi0'
+    option channel '6'
+    option channel_width '20'
+    option disabled '0'
+    option hwmode '11g'
+    option phy 'wifi0'
+    option type 'atheros'
+"""
+        )
+        o = OpenWrt(
+            {
+                "radios": [
+                    {
+                        "protocol": "802.11g",
+                        "name": "wifi0",
+                        "phy": "wifi0",
+                        "channel": 6,
+                        "channel_width": 20,
+                        "disabled": False,
+                        "driver": "atheros",
+                    }
+                ]
+            }
+        )
+        self.assertEqual(o.render(), expected)
+
     def test_parse_radio_list_option(self):
         native = self._tabs(
             """package wireless