| Index: server/site_tests/network_VPN/000VPNGenesis
|
| diff --git a/server/site_tests/network_VPN/000VPNGenesis b/server/site_tests/network_VPN/000VPNGenesis
|
| index e504dffa30c262572c31c4443eb89e8f2c15c828..eec1f9ba0e08ffa716082332872ddd15d0c317c8 100644
|
| --- a/server/site_tests/network_VPN/000VPNGenesis
|
| +++ b/server/site_tests/network_VPN/000VPNGenesis
|
| @@ -2,21 +2,21 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
| #
|
| -# An example of how to set up a VPN from the Client (DUT), through the
|
| -# Router to to the Server.
|
| +# An example of how to set up an OpenVPN VPN from the Client (DUT),
|
| +# through the Router to to the Server.
|
| #
|
|
|
| { "name":"VPNGenesis",
|
| "steps":[
|
| - ### Create WiFi connection from Client to Router.
|
| + # Create WiFi connection from Client to Router.
|
| [ "create", { "type":"hostap" } ],
|
| [ "config", { "channel":"2412", "mode":"11b" } ],
|
| [ "connect", { "security":"none" } ],
|
|
|
| - ### Create Client & Server VPN configurations.
|
| - ###
|
| - ### o Install certficiates files on Server, and Client.
|
| - ### o Create VPN configuration on the Server.
|
| + # Create Client & Server VPN configurations.
|
| + #
|
| + # o Install certficiates files on Server, and Client.
|
| + # o Create VPN configuration on the Server.
|
|
|
| [ "install_files", { "system" : "server",
|
| "files" :
|
| @@ -39,12 +39,12 @@
|
| site_eap_certs.client_private_key_1
|
| }}],
|
|
|
| - ### Configure and launch the VPN server.
|
| - ### Automatically kills any previously running server.
|
| - ###
|
| - ### There are two vpn_server_config() uses to ensure that the
|
| - ### internal configuration is persistent across invocations.
|
| - ###
|
| + # Configure and launch the VPN server. Automatically kills any
|
| + # previously running server.
|
| + #
|
| + # There are two vpn_server_config() uses to ensure that the
|
| + # internal configuration is persistent across invocations.
|
| + #
|
| [ "vpn_server_config", { "kind" : "openvpn",
|
| "config" :
|
| { "port":"1194",
|
| @@ -65,34 +65,34 @@
|
| }],
|
| # Having two vpn_server_config invocations back-to-back results in
|
| # a failure with 'pkill' right after an rspro boot. There seems
|
| - # to be some significant latency when starting openvpn the first
|
| - # time, so slow the system down a tad to avoid spurious errors.
|
| + # to be some significant latency when starting the first time, so
|
| + # slow the system down a tad to avoid spurious errors.
|
| [ "sleep", { "time": "1" } ],
|
| [ "vpn_server_config", { "kind" : "openvpn",
|
| "config" : { "comp-lzo":"" }
|
| }],
|
| - ### Launch the VPN Client.
|
| + # Launch the VPN Client.
|
| [ "vpn_client_load_tunnel" ],
|
| [ "vpn_client_config", { "kind":"openvpn",
|
| "files":{
|
| - "ca-certificate":"/tmp/vpn-ca.crt",
|
| - "client-certificate":"/tmp/vpn-client.crt",
|
| - "client-key":"/tmp/vpn-client.key" },
|
| + "ca-certificate":"/tmp/vpn-ca.crt",
|
| + "client-certificate":"/tmp/vpn-client.crt",
|
| + "client-key":"/tmp/vpn-client.key" },
|
| "remote-cert-tls":"none"
|
| }],
|
| - ### Verify the client is connected to the server
|
| + # Verify the client is connected to the server
|
| [ "client_ping", { "ping_ip":"10.8.0.1",
|
| "count":"10" } ],
|
|
|
| - ### Ensure the VPN also works with the client-side default of
|
| - ### '--remote-cert-tls server'.
|
| + # Ensure the VPN also works with the client-side default of
|
| + # '--remote-cert-tls server'.
|
| [ "vpn_client_config", { "kind":"openvpn",
|
| "files":{
|
| "ca-certificate":"/tmp/vpn-ca.crt",
|
| "client-certificate":"/tmp/vpn-client.crt",
|
| "client-key":"/tmp/vpn-client.key" },
|
| }],
|
| - ### Verify the client is connected to the server
|
| + # Verify the client is connected to the server
|
| [ "client_ping", { "ping_ip":"10.8.0.1",
|
| "count":"10" } ],
|
|
|
|
|