diff options
| author | pstew <pstew@chromium.org> | 2015-04-06 14:00:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-06 21:00:56 +0000 |
| commit | b20f791602f4064dbb96418abc64ff6fdb79379d (patch) | |
| tree | adf5c2a4f16e62702c38b457c3dc1158200934c0 /chromeos/test | |
| parent | 59639a8ae80d96e4083be7a19865de32bbf798bc (diff) | |
| download | chromium_src-b20f791602f4064dbb96418abc64ff6fdb79379d.zip chromium_src-b20f791602f4064dbb96418abc64ff6fdb79379d.tar.gz chromium_src-b20f791602f4064dbb96418abc64ff6fdb79379d.tar.bz2 | |
Add an ONC property for disabling LCP echo
This CL maps an ONC property for disabling L2TP connection
monitoring via PPP LCP frames.
BUG=463602
TEST=Expanded test ONC and JSON test sets
Review URL: https://codereview.chromium.org/1058973002
Cr-Commit-Position: refs/heads/master@{#323943}
Diffstat (limited to 'chromeos/test')
6 files changed, 8 insertions, 2 deletions
diff --git a/chromeos/test/data/network/l2tpipsec_clientcert_with_cert_pems.onc b/chromeos/test/data/network/l2tpipsec_clientcert_with_cert_pems.onc index 40bf369..d412b89 100644 --- a/chromeos/test/data/network/l2tpipsec_clientcert_with_cert_pems.onc +++ b/chromeos/test/data/network/l2tpipsec_clientcert_with_cert_pems.onc @@ -29,7 +29,8 @@ }, "L2TP": { "Username": "some username", - "Password": "some password" + "Password": "some password", + "LcpEchoDisabled": true } } } diff --git a/chromeos/test/data/network/shill_l2tpipsec.json b/chromeos/test/data/network/shill_l2tpipsec.json index ce7c8b7..68e275c 100644 --- a/chromeos/test/data/network/shill_l2tpipsec.json +++ b/chromeos/test/data/network/shill_l2tpipsec.json @@ -8,5 +8,6 @@ "L2TPIPsec.XauthPassword": "some xauth password", "L2TPIPsec.XauthUser": "some xauth username", "L2TPIPsec.Password": "some password", + "L2TPIPsec.LCPEchoDisabled": true, "SaveCredentials": true } diff --git a/chromeos/test/data/network/shill_l2tpipsec_clientcert.json b/chromeos/test/data/network/shill_l2tpipsec_clientcert.json index f5b97a8..8fccf69 100644 --- a/chromeos/test/data/network/shill_l2tpipsec_clientcert.json +++ b/chromeos/test/data/network/shill_l2tpipsec_clientcert.json @@ -4,6 +4,7 @@ "L2TPIPsec.User": "some username", "L2TPIPsec.XauthPassword": "some xauth password", "L2TPIPsec.XauthUser": "some xauth username", + "L2TPIPsec.LCPEchoDisabled": true, "Name": "MyL2TPVPN", "Provider.Host": "some.host.org", "Provider.Type": "l2tpipsec", diff --git a/chromeos/test/data/network/shill_output_l2tpipsec.json b/chromeos/test/data/network/shill_output_l2tpipsec.json index 4848ab4..e9f33ea 100644 --- a/chromeos/test/data/network/shill_output_l2tpipsec.json +++ b/chromeos/test/data/network/shill_output_l2tpipsec.json @@ -3,6 +3,7 @@ "Name": "MyL2TPVPN", "Provider": { "Host": "some.host.org", + "L2TPIPsec.LCPEchoDisabled": true, "L2TPIPsec.PSK": "some_preshared_key", "L2TPIPsec.User": "some username", "L2TPIPsec.XauthPassword": "some xauth password", diff --git a/chromeos/test/data/network/translation_of_shill_l2tpipsec.onc b/chromeos/test/data/network/translation_of_shill_l2tpipsec.onc index c12a769..84bbfc3 100644 --- a/chromeos/test/data/network/translation_of_shill_l2tpipsec.onc +++ b/chromeos/test/data/network/translation_of_shill_l2tpipsec.onc @@ -21,6 +21,7 @@ "L2TP": { "Username": "some username", "Password": "some password", + "LcpEchoDisabled": true, }, } } diff --git a/chromeos/test/data/network/valid_l2tpipsec.onc b/chromeos/test/data/network/valid_l2tpipsec.onc index 8aab993..498a217 100644 --- a/chromeos/test/data/network/valid_l2tpipsec.onc +++ b/chromeos/test/data/network/valid_l2tpipsec.onc @@ -16,7 +16,8 @@ }, "L2TP": { "Username": "some username", - "Password": "some password" + "Password": "some password", + "LcpEchoDisabled": true } } } |