diff options
| author | stevenjb <stevenjb@chromium.org> | 2014-09-19 14:03:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-19 21:03:59 +0000 |
| commit | 9362ad95966777d8689476acbef35a31421831c3 (patch) | |
| tree | 1616e0e37828d5deed272adb7ba35528c6d182c8 /chromeos/test/data/network | |
| parent | 0fbac4d6271f2eaacd8d67800ba5dce7781578b4 (diff) | |
| download | chromium_src-9362ad95966777d8689476acbef35a31421831c3.zip chromium_src-9362ad95966777d8689476acbef35a31421831c3.tar.gz chromium_src-9362ad95966777d8689476acbef35a31421831c3.tar.bz2 | |
Translate Wimax from Shill -> ONC, fix JS Wimax strings.
This is a follow up CL for 414417 that includes the ONC translation
necessary for the Wimax UI and fixes the JS to use the new WiMAX
capitalization. It also adds a WiMAX entry to the HTML doc.
BUG=414417
Review URL: https://codereview.chromium.org/581213003
Cr-Commit-Position: refs/heads/master@{#295774}
Diffstat (limited to 'chromeos/test/data/network')
3 files changed, 9 insertions, 2 deletions
diff --git a/chromeos/test/data/network/shill_wimax_with_state.json b/chromeos/test/data/network/shill_wimax_with_state.json index ed12a13..ececaa8 100644 --- a/chromeos/test/data/network/shill_wimax_with_state.json +++ b/chromeos/test/data/network/shill_wimax_with_state.json @@ -2,9 +2,7 @@ "AutoConnect": true, "Connectable": true, "Name": "SomeWiMAX", - "EAP.EAP": "TLS", "EAP.Identity": "${LOGIN_ID}@my.domain.com", - "EAP.UseSystemCAs": true, "GUID": "{77db0089-0bc8-4358-929c-123xcv}", "Profile": "/profile/someuser", "SaveCredentials": true, diff --git a/chromeos/test/data/network/translation_of_shill_wifi_clientcert.onc b/chromeos/test/data/network/translation_of_shill_wifi_clientcert.onc index cd01e6d..1f2956c 100644 --- a/chromeos/test/data/network/translation_of_shill_wifi_clientcert.onc +++ b/chromeos/test/data/network/translation_of_shill_wifi_clientcert.onc @@ -3,6 +3,11 @@ "Name":"", "Type":"WiFi", "WiFi":{ + "EAP": { + "Identity": "abc ${LOGIN_ID}@my.domain.com", + "SaveCredentials": true, + "UseSystemCAs": true + }, "SSID":"SomeWifi-XY", "Security":"WPA-EAP" } diff --git a/chromeos/test/data/network/translation_of_shill_wimax_with_state.onc b/chromeos/test/data/network/translation_of_shill_wimax_with_state.onc index c8a83f6..3be399b 100644 --- a/chromeos/test/data/network/translation_of_shill_wimax_with_state.onc +++ b/chromeos/test/data/network/translation_of_shill_wimax_with_state.onc @@ -6,6 +6,10 @@ "Name": "SomeWiMAX", "WiMAX": { "AutoConnect": true, + "EAP": { + "Identity": "${LOGIN_ID}@my.domain.com", + "SaveCredentials": true + }, "SignalStrength": 10 }, "Source":"User" |