[openvpn] Allow to omit seconds in status attribute

openwisp · Feb 8, 2017 · c4aa07a · c4aa07a
1 parent 42204cc
commit c4aa07a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/netjsonconfig/backends/openvpn/schema.py b/netjsonconfig/backends/openvpn/schema.py
@@ -292,7 +292,7 @@
                     "description": "Write operational status to file every n seconds; "
                                    "eg: \"/var/run/openvpn.status 10\"",
                     "type": "string",
-                    "pattern": "^((\\S*) ([0-9]*)|)$",
+                    "pattern": "^((\\S*) ([0-9]*)|(\\S*)|)$",
                     "propertyOrder": 35,
                 },
                 "status_version": {

diff --git a/tests/openvpn/test_backend.py b/tests/openvpn/test_backend.py
@@ -1,3 +1,4 @@
+import copy
 import tarfile
 import unittest
 
@@ -220,6 +221,12 @@ def test_no_status_file(self):
         self.assertNotIn('status', output)
         self.assertNotIn('status-version', output)
 
+    def test_status_file_no_seconds(self):
+        conf = copy.deepcopy(self._simple_conf)
+        conf['openvpn'][0]['status'] = '/var/run/openvpn.status'
+        c = OpenVpn(conf)
+        self.assertIn('status /var/run/openvpn.status', c.render())
+
     def test_server_bridge(self):
         c = OpenVpn({
             "openvpn": [{