[openvpn] Corrected wrong "client" mode: "p2p"

openwisp · Sep 21, 2016 · b486c4d · b486c4d
1 parent c15c630
commit b486c4d
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/docs/source/backends/openvpn.rst b/docs/source/backends/openvpn.rst
@@ -91,7 +91,7 @@ Required properties:
 +==========================+=========+==============+=============================================================+
 | ``name``                 | string  |              | 2 to 24 alphanumeric characters, dashes and underscores     |
 +--------------------------+---------+--------------+-------------------------------------------------------------+
-| ``mode``                 | string  |              | ``client`` or ``server``                                    |
+| ``mode``                 | string  |              | ``p2p`` or ``server``                                       |
 +--------------------------+---------+--------------+-------------------------------------------------------------+
 | ``proto``                | string  |              | ``udp``, ``tcp-client``, ``tcp-server``                     |
 +--------------------------+---------+--------------+-------------------------------------------------------------+
@@ -269,7 +269,7 @@ Will be rendered as::
     dev tap0
     dev-type tap
     key key.pem
-    mode client
+    mode p2p
     nobind
     proto udp
     remote vpn1.test.com 1195

diff --git a/docs/source/backends/openwisp.rst b/docs/source/backends/openwisp.rst
@@ -231,7 +231,7 @@ The following example shows a full working *configuration dictionary* for the
                 "keepalive": "5 40",
                 "key": "/tmp/owispmanager/openvpn/x509/l2vpn_client_2693.pem",
                 "ns_cert_type": "server",
-                "mode": "client",
+                "mode": "p2p",
                 "enabled": True,
                 "comp_lzo": "yes",
                 "down": "/tmp/owispmanager/openvpn/vpn_2693_script_down.sh",

diff --git a/netjsonconfig/backends/openvpn/openvpn.py b/netjsonconfig/backends/openvpn/openvpn.py
@@ -61,7 +61,7 @@ def auto_client(self, host, server, ca_path=None, ca_contents=None,
         """
         # client defaults
         c = {
-            "mode": "client",
+            "mode": "p2p",
             "nobind": True,
             "resolv_retry": True,
             "tls_client": True

diff --git a/netjsonconfig/backends/openvpn/schema.py b/netjsonconfig/backends/openvpn/schema.py
@@ -363,7 +363,7 @@
                     "type": "object",
                     "required": ["remote"],
                     "properties": {
-                        "mode": {"enum": ["client"]},
+                        "mode": {"enum": ["p2p"]},
                         "proto": {
                             "enum": ["udp", "tcp-client"],
                             "default": "udp",

diff --git a/tests/openvpn/test_backend.py b/tests/openvpn/test_backend.py
@@ -116,7 +116,7 @@ def test_client_mode(self):
                     "key": "key.pem",
                     "local": "",
                     "log": "/var/log/openvpn.log",
-                    "mode": "client",
+                    "mode": "p2p",
                     "mssfix": 1450,
                     "mtu_disc": "yes",
                     "mtu_test": True,
@@ -165,7 +165,7 @@ def test_client_mode(self):
 down /home/user/down-command.sh
 key key.pem
 log /var/log/openvpn.log
-mode client
+mode p2p
 mssfix 1450
 mtu-disc yes
 mtu-test
@@ -401,7 +401,7 @@ def test_auto_client_simple(self):
 dev tap0
 dev-type tap
 key key.pem
-mode client
+mode p2p
 nobind
 proto udp
 remote vpn1.test.com 1195
@@ -431,7 +431,7 @@ def test_auto_client_tls(self):
 dev tap0
 dev-type tap
 key key.pem
-mode client
+mode p2p
 nobind
 proto tcp-client
 remote vpn2.test.com 1196
@@ -474,7 +474,7 @@ def test_auto_client_complex(self):
 dev tap0
 dev-type tap
 key {{key_path_1}}
-mode client
+mode p2p
 nobind
 ns-cert-type server
 proto tcp-client
@@ -524,7 +524,7 @@ def test_auto_client_ns_cert_type_empty(self):
 dev tap0
 dev-type tap
 key key.pem
-mode client
+mode p2p
 nobind
 proto udp
 remote vpn1.test.com 1195

diff --git a/tests/openwisp/test_backend.py b/tests/openwisp/test_backend.py
@@ -75,7 +75,7 @@ class TestBackend(unittest.TestCase, _TabsMixin):
                 "keepalive": "5 40",
                 "key": "/tmp/owispmanager/openvpn/x509/l2vpn_client_2693.pem",
                 "log": "/tmp/openvpn_2693.log",
-                "mode": "client",
+                "mode": "p2p",
                 "mute": 10,
                 "mute_replay_warnings": True,
                 "name": "2693",

diff --git a/tests/openwrt/test_openvpn.py b/tests/openwrt/test_openvpn.py
@@ -120,7 +120,7 @@ def test_client_mode(self):
                     "key": "key.pem",
                     "local": "",
                     "log": "/var/log/openvpn.log",
-                    "mode": "client",
+                    "mode": "p2p",
                     "mssfix": 1450,
                     "mtu_disc": "yes",
                     "mtu_test": True,
@@ -171,7 +171,7 @@ def test_client_mode(self):
     option enabled '1'
     option key 'key.pem'
     option log '/var/log/openvpn.log'
-    option mode 'client'
+    option mode 'p2p'
     option mssfix '1450'
     option mtu_disc 'yes'
     option mtu_test '1'