diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-03 20:18:48 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-03 20:18:48 +0000 |
| commit | 0e3f2d23e87124f1341e88d822c9f5551506642b (patch) | |
| tree | 48e8ed95b25eeea437cb6d3e2539c51ccc61d8b0 /chromeos/test/data/network | |
| parent | 01924fbe6c0e0f059ca46a03f9f6b2670ae3e0fa (diff) | |
| download | chromium_src-0e3f2d23e87124f1341e88d822c9f5551506642b.zip chromium_src-0e3f2d23e87124f1341e88d822c9f5551506642b.tar.gz chromium_src-0e3f2d23e87124f1341e88d822c9f5551506642b.tar.bz2 | |
Don't augment GUID in ONC merging.
The GUID property is used to pick user settings, policies and active settings for the same network. Thus it's more an identifier than a property and should not be exposed with additional meta information as it is the case for other properties.
BUG=372337
Review URL: https://codereview.chromium.org/291553006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/test/data/network')
| -rw-r--r-- | chromeos/test/data/network/augmented_merge.json | 20 | ||||
| -rw-r--r-- | chromeos/test/data/network/vpn_active_settings.onc | 5 |
2 files changed, 16 insertions, 9 deletions
diff --git a/chromeos/test/data/network/augmented_merge.json b/chromeos/test/data/network/augmented_merge.json index d7987ae..6ebbf04 100644 --- a/chromeos/test/data/network/augmented_merge.json +++ b/chromeos/test/data/network/augmented_merge.json @@ -1,9 +1,9 @@ { - "GUID": { - "DevicePolicy": "123", - "Effective": "UserPolicy", - "UserPolicy": "123" + "ConnectionState": { + "Active": "Connected", + "Effective": "Unmanaged" }, + "GUID": "123", "IPConfigs": { "DevicePolicy": [ { "IPAddress": "127.0.0.1", @@ -25,6 +25,7 @@ } ] }, "Name": { + "Active": "testopenvpn", "DevicePolicy": "testopenvpn", "Effective": "UserPolicy", "UserPolicy": "testopenvpn", @@ -37,6 +38,7 @@ } }, "Type": { + "Active": "VPN", "DevicePolicy": "VPN", "Effective": "UserPolicy", "UserPolicy": "VPN", @@ -61,7 +63,7 @@ "UserPolicy": 1 }, "PSK": { - "Effective": "UserPolicy", + "Effective": "UserPolicy" } }, "OpenVPN": { @@ -96,15 +98,15 @@ "UserPolicy": 1194, "UserSetting": 1195 }, + "ServerCARefs": { + "Effective": "UserPolicy", + "UserPolicy": ["ref1", "ref2"] + }, "Username": { "DevicePolicy": "device user", "Effective": "DevicePolicy", "UserEditable": true, "UserPolicy": "policy user" - }, - "ServerCARefs": { - "UserPolicy": ["ref1", "ref2"], - "Effective": "UserPolicy" } }, "Type": { diff --git a/chromeos/test/data/network/vpn_active_settings.onc b/chromeos/test/data/network/vpn_active_settings.onc new file mode 100644 index 0000000..62b3c21 --- /dev/null +++ b/chromeos/test/data/network/vpn_active_settings.onc @@ -0,0 +1,5 @@ +{ "Type": "VPN", + "Name": "testopenvpn", + "ConnectionState": "Connected", + "GUID": "123" +} |