[openvpn] Corrected script-security directive

openwisp · Sep 5, 2016 · 7bc283a · 7bc283a
1 parent 2198b9b
commit 7bc283a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/netjsonconfig/backends/openvpn/renderers.py b/netjsonconfig/backends/openvpn/renderers.py
@@ -15,7 +15,7 @@ def _get_openvpn(self):
         openvpn = []
         for vpn in self.config.get('openvpn', []):
             config = deepcopy(vpn)
-            skip_keys = ['script_security_level', 'remote']
+            skip_keys = ['script_security', 'remote']
             delete_keys = []
             for key, value in config.items():
                 if key in skip_keys:

diff --git a/netjsonconfig/backends/openvpn/schema.py b/netjsonconfig/backends/openvpn/schema.py
@@ -243,8 +243,8 @@
                     "pattern": "^(\\S*)$",
                     "propertyOrder": 29,
                 },
-                "script_security_level": {
-                    "title": "script security level",
+                "script_security": {
+                    "title": "script security",
                     "type": "integer",
                     "enum": [0, 1, 2, 3],
                     "default": 1,

diff --git a/tests/openvpn/test_backend.py b/tests/openvpn/test_backend.py
@@ -46,7 +46,7 @@ def test_server_mode(self):
                 "persist_tun": True,
                 "port": 1194,
                 "proto": "udp",
-                "script_security_level": 0,
+                "script_security": 0,
                 "secret": "",
                 "status": "/var/log/openvpn.status 10",
                 "status_version": 1,
@@ -85,7 +85,7 @@ def test_server_mode(self):
 persist-tun
 port 1194
 proto udp
-script-security-level 0
+script-security 0
 status /var/log/openvpn.status 10
 status-version 1
 tls-server
@@ -139,7 +139,7 @@ def test_client_mode(self):
                         }
                     ],
                     "resolv_retry": True,
-                    "script_security_level": 1,
+                    "script_security": 1,
                     "secret": "",
                     "status": "/var/log/openvpn.status 30",
                     "status_version": 1,
@@ -179,7 +179,7 @@ def test_client_mode(self):
 remote vpn1.test.com 1194
 remote vpn2.test.com 1195
 resolv-retry
-script-security-level 1
+script-security 1
 status /var/log/openvpn.status 30
 status-version 1
 tls-client

diff --git a/tests/openwrt/test_openvpn.py b/tests/openwrt/test_openvpn.py
@@ -48,7 +48,7 @@ def test_server_mode(self):
                 "persist_tun": True,
                 "port": 1194,
                 "proto": "udp",
-                "script_security_level": 0,
+                "script_security": 0,
                 "secret": "",
                 "status": "/var/log/openvpn.status 10",
                 "status_version": 1,
@@ -89,7 +89,7 @@ def test_server_mode(self):
     option persist_tun '1'
     option port '1194'
     option proto 'udp'
-    option script_security_level '0'
+    option script_security '0'
     option status '/var/log/openvpn.status 10'
     option status_version '1'
     option tls_server '1'
@@ -144,7 +144,7 @@ def test_client_mode(self):
                         }
                     ],
                     "resolv_retry": True,
-                    "script_security_level": 1,
+                    "script_security": 1,
                     "secret": "",
                     "status": "/var/log/openvpn.status 30",
                     "status_version": 1,
@@ -186,7 +186,7 @@ def test_client_mode(self):
     list remote 'vpn1.test.com 1194'
     list remote 'vpn2.test.com 1195'
     option resolv_retry '1'
-    option script_security_level '1'
+    option script_security '1'
     option status '/var/log/openvpn.status 30'
     option status_version '1'
     option tls_client '1'