[openwrt] Dropped obsolete code in OpenVpn backend #58

Closes #58

Author: nemesifier

netjsonconfig/backends/openwrt/converters.py

@@ -477,8 +477,7 @@ def __get_vpn(self, vpn):
         if 'disabled' in config:
             config['enabled'] = not config['disabled']
             del config['disabled']
-        # TODO: keep 'enabled' check until 0.6 and then drop it
-        elif 'disabled' not in config and 'enabled' not in config:
+        else:
             config['enabled'] = True
         config.update({
             '.name': logical_name(config.pop('name')),

tests/openwrt/test_openvpn.py

@@ -25,8 +25,7 @@ def test_server_mode(self):
                 "down": "",
                 "duplicate_cn": True,
                 "engine": "rsax",
-                # TODO: in 0.6.0 change this to "disabled": False
-                "enabled": True,
+                "disabled": False,
                 "fast_io": True,
                 "fragment": 0,
                 "group": "nogroup",
@@ -109,8 +108,7 @@ def test_client_mode(self):
                     "dev": "tun0",
                     "dev_type": "tun",
                     "down": "/home/user/down-command.sh",
-                    # TODO: in 0.6.0 change this to "disabled": False
-                    "enabled": True,
+                    "disabled": False,
                     "engine": "",
                     "fast_io": False,
                     "fragment": 0,
@@ -205,8 +203,7 @@ def test_no_status_file(self):
                 "dev": "tap0",
                 "dev_type": "tap",
                 "dh": "dh.pem",
-                # TODO: in 0.6.0 change this to "disabled": False
-                "enabled": True,
+                "disabled": False,
                 "key": "key.pem",
                 "mode": "server",
                 "name": "test-no-status",
@@ -240,8 +237,7 @@ def test_additional_properties(self):
                 "dev": "tap0",
                 "dev_type": "tap",
                 "dh": "dh.pem",
-                # TODO: in 0.6.0 change this to "disabled": False
-                "enabled": True,
+                "disabled": False,
                 "key": "key.pem",
                 "mode": "server",
                 "name": "test-properties",
@@ -314,8 +310,7 @@ def test_server_bridge(self):
                 "dev": "tap0",
                 "dev_type": "tap",
                 "dh": "dh.pem",
-                # TODO: in 0.6.0 change this to "disabled": False
-                "enabled": True,
+                "disabled": False,
                 "key": "key.pem",
                 "mode": "server",
                 "name": "bridged",
@@ -349,8 +344,7 @@ def test_server_bridge_proxy(self):
                 "dev": "tap0",
                 "dev_type": "tap",
                 "dh": "dh.pem",
-                # TODO: in 0.6.0 change this to "disabled": False
-                "enabled": True,
+                "disabled": False,
                 "key": "key.pem",
                 "mode": "server",
                 "name": "bridged-proxy",
@@ -384,8 +378,7 @@ def test_server_bridge_routed(self):
                 "dev": "tap0",
                 "dev_type": "tap",
                 "dh": "dh.pem",
-                # TODO: in 0.6.0 change this to "disabled": False
-                "enabled": True,
+                "disabled": False,
                 "key": "key.pem",
                 "mode": "server",
                 "name": "routed",
@@ -428,37 +421,3 @@ def test_disabled(self):
             }]
         })
         self.assertIn("option enabled '0'", c.render())
-
-    def test_disabled_and_enabled(self):
-        # disabled wins over enabled since 0.5.3
-        c = OpenWrt({
-            "openvpn": [{
-                "ca": "ca.pem",
-                "cert": "cert.pem",
-                "dev": "tap0",
-                "dev_type": "tap",
-                "dh": "dh.pem",
-                "disabled": True,
-                "enabled": True,
-                "key": "key.pem",
-                "mode": "server",
-                "name": "test-properties",
-                "proto": "udp",
-                "tls_server": True
-            }]
-        })
-        expected = self._tabs("""package openvpn
-
-config openvpn 'test_properties'
-    option ca 'ca.pem'
-    option cert 'cert.pem'
-    option dev 'tap0'
-    option dev_type 'tap'
-    option dh 'dh.pem'
-    option enabled '0'
-    option key 'key.pem'
-    option mode 'server'
-    option proto 'udp'
-    option tls_server '1'
-""")
-        self.assertEqual(c.render(), expected)