diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-15 13:03:10 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-15 13:03:10 +0000 |
| commit | a9a87bda5930b0181b7e8075b18ef5637e03c563 (patch) | |
| tree | 14ac54d9c7d91ab47296b4b62b01011172cfcb1e /chromeos/test | |
| parent | 87a46f42e0ce1cb81a2ef8878c1cf48d0a517e3c (diff) | |
| download | chromium_src-a9a87bda5930b0181b7e8075b18ef5637e03c563.zip chromium_src-a9a87bda5930b0181b7e8075b18ef5637e03c563.tar.gz chromium_src-a9a87bda5930b0181b7e8075b18ef5637e03c563.tar.bz2 | |
Add an ONC merge that produces an augmented dictionary.
BUG=148905
TBR=stevenjb@chromium.org (only added a test file)
Review URL: https://chromiumcodereview.appspot.com/12208075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182683 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/test')
| -rw-r--r-- | chromeos/test/data/network/augmented_merge.json | 115 |
1 files changed, 115 insertions, 0 deletions
diff --git a/chromeos/test/data/network/augmented_merge.json b/chromeos/test/data/network/augmented_merge.json new file mode 100644 index 0000000..60ae5b0 --- /dev/null +++ b/chromeos/test/data/network/augmented_merge.json @@ -0,0 +1,115 @@ +{ + "GUID": { + "DevicePolicy": "123", + "Effective": "UserPolicy", + "UserPolicy": "123" + }, + "IPConfigs": { + "DevicePolicy": [ { + "IPAddress": "127.0.0.1", + "Type": "IPv4" + } ], + "Effective": "UserPolicy", + "UserPolicy": [ { + "IPAddress": "127.0.0.1", + "RoutingPrefix": 32, + "Type": "IPv4" + } ], + "UserSetting": [ { + "IPAddress": "127.0.0.1", + "SearchDomains": [ "acme.org" ], + "Type": "IPv4" + }, { + "IPAddress": "1.2.3.4", + "Type": "IPv4" + } ] + }, + "Name": { + "DevicePolicy": "testopenvpn", + "Effective": "UserPolicy", + "UserPolicy": "testopenvpn", + "UserSetting": "testopenvpn" + }, + "ProxySettings": { + "Type": { + "Effective": "UserPolicy", + "UserSetting": "Direct" + } + }, + "Type": { + "DevicePolicy": "VPN", + "Effective": "UserPolicy", + "UserPolicy": "VPN", + "UserSetting": "Ethernet" + }, + "VPN": { + "Host": { + "DeviceEditable": true, + "DevicePolicy": "device policys host", + "Effective": "UserSetting", + "UserEditable": true, + "UserPolicy": "policys host", + "UserSetting": "users host" + }, + "IPsec": { + "AuthenticationType": { + "Effective": "UserPolicy", + "UserPolicy": "PSK" + }, + "IKEVersion": { + "Effective": "UserPolicy", + "UserPolicy": 1 + }, + "PSK": { + "DevicePolicy": "sharedkey", + "Effective": "UserPolicy", + "UserPolicy": "sharedkey" + } + }, + "OpenVPN": { + "ClientCertPattern": { + "EnrollmentURI": { + "DeviceEditable": true, + "UserEditable": true + }, + "IssuerCARef": { + "DeviceEditable": true, + "DevicePolicy": [ "openvpn-test-ca" ], + "Effective": "UserPolicy", + "UserEditable": true, + "UserPolicy": [ "openvpn-test-ca" ] + } + }, + "ClientCertType": { + "DevicePolicy": "Pattern", + "Effective": "UserPolicy", + "UserPolicy": "Pattern" + }, + "Password": { + "DeviceEditable": true, + "Effective": "UserSetting", + "UserEditable": true, + "UserSetting": "users password" + }, + "Port": { + "DeviceEditable": true, + "DevicePolicy": 0, + "Effective": "UserPolicy", + "UserPolicy": 1194, + "UserSetting": 1195 + }, + "Username": { + "DevicePolicy": "device user", + "Effective": "DevicePolicy", + "UserEditable": true, + "UserPolicy": "policy user" + } + }, + "Type": { + "DevicePolicy": "OpenVPN", + "Effective": "UserPolicy", + "UserPolicy": "OpenVPN", + "UserSetting": "OpenVPN" + } + } +} |