Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chromeos/test/data/network/augmented_merge.json

Issue 540333002: ONC: Fix Static-/Saved-/IPConfig. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed another unit test. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chromeos/network/onc/onc_validator_unittest.cc ('k') | chromeos/test/data/network/device_policy.onc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 "ConnectionState": { 2 "ConnectionState": {
3 "Active": "Connected", 3 "Active": "Connected",
4 "Effective": "Unmanaged" 4 "Effective": "Unmanaged"
5 }, 5 },
6 "GUID": "123", 6 "GUID": "123",
7 "IPConfigs": { 7 "IPConfigs": {
8 "DevicePolicy": [ { 8 "Active": [ {
9 "IPAddress": "127.0.0.1", 9 "Gateway": "2001:db8:85a3::7a2e:370:7331",
10 "Type": "IPv4" 10 "IPAddress": "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
11 "NameServers": [ ],
12 "RoutingPrefix": 12,
13 "Type": "IPv6"
11 } ], 14 } ],
12 "Effective": "UserPolicy", 15 "Effective": "Unmanaged"
13 "UserPolicy": [ { 16 },
14 "IPAddress": "127.0.0.1", 17 "SavedIPConfig": {
15 "RoutingPrefix": 32, 18 "Gateway": {
16 "Type": "IPv4" 19 "Active": "1.1.1.4",
17 } ], 20 "Effective": "Unmanaged"
18 "UserSetting": [ { 21 },
19 "IPAddress": "127.0.0.1", 22 "IPAddress": {
20 "SearchDomains": [ "acme.org" ], 23 "Active": "124.124.124.124",
21 "Type": "IPv4" 24 "Effective": "Unmanaged"
22 }, { 25 },
23 "IPAddress": "1.2.3.4", 26 "NameServers": {
24 "Type": "IPv4" 27 "Active": [ "1.1.1.5", "1.1.1.6" ],
25 } ] 28 "Effective": "Unmanaged"
29 },
30 "RoutingPrefix": {
31 "Active": 25,
32 "Effective": "Unmanaged"
33 },
34 "Type": {
35 "Active": "IPv4",
36 "Effective": "Unmanaged"
37 }
38 },
39 "StaticIPConfig": {
40 "IPAddress": {
41 "DevicePolicy": "127.0.0.1",
42 "Effective": "UserPolicy",
43 "UserPolicy": "127.0.0.1",
44 "UserSetting": "1.2.3.4"
45 },
46 "RoutingPrefix": {
47 "Effective": "UserPolicy",
48 "UserPolicy": 32
49 },
50 "SearchDomains": {
51 "Effective": "UserPolicy",
52 "UserSetting": [ "acme.org" ]
53 },
54 "Type": {
55 "DevicePolicy": "IPv4",
56 "Effective": "UserPolicy",
57 "UserPolicy": "IPv4",
58 "UserSetting": "IPv4"
59 }
26 }, 60 },
27 "Name": { 61 "Name": {
28 "Active": "testopenvpn", 62 "Active": "testopenvpn",
29 "DevicePolicy": "testopenvpn", 63 "DevicePolicy": "testopenvpn",
30 "Effective": "UserPolicy", 64 "Effective": "UserPolicy",
31 "UserPolicy": "testopenvpn", 65 "UserPolicy": "testopenvpn",
32 "UserSetting": "testopenvpn" 66 "UserSetting": "testopenvpn"
33 }, 67 },
34 "ProxySettings": { 68 "ProxySettings": {
35 "Type": { 69 "Type": {
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 } 144 }
111 }, 145 },
112 "Type": { 146 "Type": {
113 "DevicePolicy": "OpenVPN", 147 "DevicePolicy": "OpenVPN",
114 "Effective": "UserPolicy", 148 "Effective": "UserPolicy",
115 "UserPolicy": "OpenVPN", 149 "UserPolicy": "OpenVPN",
116 "UserSetting": "OpenVPN" 150 "UserSetting": "OpenVPN"
117 } 151 }
118 } 152 }
119 } 153 }
OLDNEW
« no previous file with comments | « chromeos/network/onc/onc_validator_unittest.cc ('k') | chromeos/test/data/network/device_policy.onc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698