[openwrt] Add test and improve dialup interface type

Signed-off-by: Konrad Kreitmair <kkreitmair@tdt.de>

Author: kkreitmair

CHANGES.rst

@@ -1,6 +1,10 @@
 Change log
 ==========
 
+- Added dialup interface handling for openwrt backend.
+  This change is backward incompatible for custom defined interfaces of the
+  proto type ``other``.
+
 Version 0.8.1 [2020-05-28]
 --------------------------
 

netjsonconfig/backends/openwrt/converters/interfaces.py

@@ -248,7 +248,8 @@ def __netjson_addresses(self, interface):
             return interface
         if proto not in ['static', 'dhcp', 'dhcpv6', 'none']:
             interface['proto'] = proto
-            interface['type'] = 'other'
+            interface['type'] = self.__get_special_interface_type(interface)
+
         addresses = []
         ipv4 = interface.pop('ipaddr', [])
         ipv6 = interface.pop('ip6addr', [])
@@ -272,6 +273,15 @@ def __netjson_addresses(self, interface):
             interface['addresses'] = addresses
         return interface
 
+    def __get_special_interface_type(self, interface):
+        username = interface.get('username', False)
+        password = interface.get('password', False)
+
+        if username and password:
+            return 'dialup'
+
+        return 'other'
+
     def __netjson_address(self, address, interface):
         ip = ip_interface(address)
         family = 'ipv{0}'.format(ip.version)

netjsonconfig/backends/openwrt/schema.py

@@ -114,14 +114,16 @@
             },
             "dialup_interface": {
                 "title": "Dialup interface",
-                "required": [
-                    "proto",
-                    "username",
-                    "password"
-                ],
+                "required": ["proto", "username", "password"],
                 "allOf": [
                     {
                         "properties": {
+                            "type": {
+                                "type": "string",
+                                "enum": ["dialup"],
+                                "default": "dialup",
+                                "propertyOrder": 1,
+                            },
                             "proto": {
                                 "type": "string",
                                 "enum": [
@@ -135,7 +137,7 @@
                                     "pppoe",
                                     "pptp",
                                     "qmi",
-                                    "wwan"
+                                    "wwan",
                                 ],
                                 "default": "pppoe",
                                 "propertyOrder": 8,
@@ -149,11 +151,11 @@
                                 "type": "string",
                                 "description": "password for authentication in protocols like PPPoE",
                                 "propertyOrder": 10,
-                            }
+                            },
                         }
                     },
                     {"$ref": "#/definitions/interface_settings"},
-                ]
+                ],
             },
             "base_radio_settings": {
                 "properties": {
@@ -209,17 +211,7 @@
                 }
             },
             "interfaces": {
-                "type": "array",
-                "title": "Interfaces",
-                "uniqueItems": True,
-                "additionalItems": True,
-                "propertyOrder": 2,
-                "items": {
-                    "title": "Interface",
-                    "oneOf": [
-                        {"$ref": "#/definitions/dialup_interface"}
-                    ]
-                }
+                "items": {"oneOf": [{"$ref": "#/definitions/dialup_interface"}]}
             },
             "routes": {
                 "items": {

tests/openwrt/test_dialup.py

@@ -0,0 +1,42 @@
+import unittest
+
+from netjsonconfig import OpenWrt
+from netjsonconfig.utils import _TabsMixin
+
+
+class TestDialup(unittest.TestCase, _TabsMixin):
+    maxDiff = None
+
+    _dialup_interface_netjson = {
+        "interfaces": [
+            {
+                "mtu": 1448,
+                "network": "xdsl",
+                "type": "dialup",
+                "name": "dsl0",
+                "password": "jf93nf82o023$",
+                "username": "dsluser",
+                "proto": "pppoe",
+            },
+        ]
+    }
+
+    _dialup_interface_uci = """package network
+
+config interface 'xdsl'
+    option ifname 'dsl0'
+    option mtu '1448'
+    option password 'jf93nf82o023$'
+    option proto 'pppoe'
+    option username 'dsluser'
+"""
+
+    def test_render_dialup_interface(self):
+        result = OpenWrt(self._dialup_interface_netjson).render()
+        expected = self._tabs(self._dialup_interface_uci)
+        self.assertEqual(result, expected)
+
+    def test_parse_dialup_interface(self):
+        result = OpenWrt(native=self._dialup_interface_uci).config
+        expected = self._dialup_interface_netjson
+        self.assertDictEqual(result, expected)

tests/openwrt/test_interfaces.py

@@ -601,25 +601,21 @@ def test_parse_custom_proto(self):
         native = self._tabs(
             """package network
 
-config interface 'ppp0'
+config interface 'custom_if0'
     option device '/dev/usb/modem1'
-    option ifname 'ppp0'
+    option ifname 'custom_if0'
     option ipv6 '1'
     option keepalive '3'
-    option password 'pwd0123'
-    option proto 'ppp'
-    option username 'user1'
+    option proto 'custom'
 """
         )
         expected = {
             "interfaces": [
                 {
-                    "name": "ppp0",
+                    "name": "custom_if0",
                     "type": "other",
-                    "proto": "ppp",
+                    "proto": "custom",
                     "device": "/dev/usb/modem1",
-                    "username": "user1",
-                    "password": "pwd0123",
                     "keepalive": '3',
                     "ipv6": '1',
                 }