diff options
| author | pneubeck <pneubeck@chromium.org> | 2014-09-09 06:16:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-09 13:20:24 +0000 |
| commit | 49d77fc25ca944fcfb4a1e39862483656e208f85 (patch) | |
| tree | b0a60909d0f8183110d04cade0b3afa13d21d922 /chromeos/test | |
| parent | 4c2d33ac8c061cf27a594473d6f9a450ee6c3c89 (diff) | |
| download | chromium_src-49d77fc25ca944fcfb4a1e39862483656e208f85.zip chromium_src-49d77fc25ca944fcfb4a1e39862483656e208f85.tar.gz chromium_src-49d77fc25ca944fcfb4a1e39862483656e208f85.tar.bz2 | |
ONC: Remove augmentation of unmanaged network properties.
Before read-only properties which cannot be set by the user or policy, were explicitly marked as 'unmanaged' in the augmented dictionary returned by getManagedProperties.
Now, instead these properties are returned as plain values, which simplifies the consumer side, especially of Array typed properties like IPConfigs (compare this with SavedIPConfig).
BUG=410877
Review URL: https://codereview.chromium.org/551753002
Cr-Commit-Position: refs/heads/master@{#293931}
Diffstat (limited to 'chromeos/test')
| -rw-r--r-- | chromeos/test/data/network/augmented_merge.json | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/chromeos/test/data/network/augmented_merge.json b/chromeos/test/data/network/augmented_merge.json index 48322b2..5c7c434 100644 --- a/chromeos/test/data/network/augmented_merge.json +++ b/chromeos/test/data/network/augmented_merge.json @@ -1,40 +1,19 @@ { - "ConnectionState": { - "Active": "Connected", - "Effective": "Unmanaged" - }, + "ConnectionState": "Connected", "GUID": "123", - "IPConfigs": { - "Active": [ { + "IPConfigs": [ { "Gateway": "2001:db8:85a3::7a2e:370:7331", "IPAddress": "2001:0db8:85a3:0000:0000:8a2e:0370:7334", "NameServers": [ ], "RoutingPrefix": 12, "Type": "IPv6" - } ], - "Effective": "Unmanaged" - }, + } ], "SavedIPConfig": { - "Gateway": { - "Active": "1.1.1.4", - "Effective": "Unmanaged" - }, - "IPAddress": { - "Active": "124.124.124.124", - "Effective": "Unmanaged" - }, - "NameServers": { - "Active": [ "1.1.1.5", "1.1.1.6" ], - "Effective": "Unmanaged" - }, - "RoutingPrefix": { - "Active": 25, - "Effective": "Unmanaged" - }, - "Type": { - "Active": "IPv4", - "Effective": "Unmanaged" - } + "Gateway": "1.1.1.4", + "IPAddress": "124.124.124.124", + "NameServers": [ "1.1.1.5", "1.1.1.6" ], + "RoutingPrefix": 25, + "Type": "IPv4", }, "StaticIPConfig": { "IPAddress": { |