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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 291553006: Don't augment GUID in ONC merging. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« chromeos/network/onc/onc_merger.cc ('K') | « chromeos/network/onc/onc_merger_unittest.cc ('k') | chromeos/test/data/network/vpn_active_settings.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 "GUID": { 2 "ConnectionState": {
3 "DevicePolicy": "123", 3 "Active": "Connected",
4 "Effective": "UserPolicy", 4 "Effective": "Unmanaged"
5 "UserPolicy": "123"
6 }, 5 },
6 "GUID": "123",
7 "IPConfigs": { 7 "IPConfigs": {
8 "DevicePolicy": [ { 8 "DevicePolicy": [ {
9 "IPAddress": "127.0.0.1", 9 "IPAddress": "127.0.0.1",
10 "Type": "IPv4" 10 "Type": "IPv4"
11 } ], 11 } ],
12 "Effective": "UserPolicy", 12 "Effective": "UserPolicy",
13 "UserPolicy": [ { 13 "UserPolicy": [ {
14 "IPAddress": "127.0.0.1", 14 "IPAddress": "127.0.0.1",
15 "RoutingPrefix": 32, 15 "RoutingPrefix": 32,
16 "Type": "IPv4" 16 "Type": "IPv4"
17 } ], 17 } ],
18 "UserSetting": [ { 18 "UserSetting": [ {
19 "IPAddress": "127.0.0.1", 19 "IPAddress": "127.0.0.1",
20 "SearchDomains": [ "acme.org" ], 20 "SearchDomains": [ "acme.org" ],
21 "Type": "IPv4" 21 "Type": "IPv4"
22 }, { 22 }, {
23 "IPAddress": "1.2.3.4", 23 "IPAddress": "1.2.3.4",
24 "Type": "IPv4" 24 "Type": "IPv4"
25 } ] 25 } ]
26 }, 26 },
27 "Name": { 27 "Name": {
28 "Active": "testopenvpn",
28 "DevicePolicy": "testopenvpn", 29 "DevicePolicy": "testopenvpn",
29 "Effective": "UserPolicy", 30 "Effective": "UserPolicy",
30 "UserPolicy": "testopenvpn", 31 "UserPolicy": "testopenvpn",
31 "UserSetting": "testopenvpn" 32 "UserSetting": "testopenvpn"
32 }, 33 },
33 "ProxySettings": { 34 "ProxySettings": {
34 "Type": { 35 "Type": {
35 "Effective": "UserPolicy", 36 "Effective": "UserPolicy",
36 "UserSetting": "Direct" 37 "UserSetting": "Direct"
37 } 38 }
38 }, 39 },
39 "Type": { 40 "Type": {
41 "Active": "VPN",
40 "DevicePolicy": "VPN", 42 "DevicePolicy": "VPN",
41 "Effective": "UserPolicy", 43 "Effective": "UserPolicy",
42 "UserPolicy": "VPN", 44 "UserPolicy": "VPN",
43 "UserSetting": "Ethernet" 45 "UserSetting": "Ethernet"
44 }, 46 },
45 "VPN": { 47 "VPN": {
46 "Host": { 48 "Host": {
47 "DeviceEditable": true, 49 "DeviceEditable": true,
48 "DevicePolicy": "device policys host", 50 "DevicePolicy": "device policys host",
49 "Effective": "UserSetting", 51 "Effective": "UserSetting",
50 "UserEditable": true, 52 "UserEditable": true,
51 "UserPolicy": "policys host", 53 "UserPolicy": "policys host",
52 "UserSetting": "users host" 54 "UserSetting": "users host"
53 }, 55 },
54 "IPsec": { 56 "IPsec": {
55 "AuthenticationType": { 57 "AuthenticationType": {
56 "Effective": "UserPolicy", 58 "Effective": "UserPolicy",
57 "UserPolicy": "PSK" 59 "UserPolicy": "PSK"
58 }, 60 },
59 "IKEVersion": { 61 "IKEVersion": {
60 "Effective": "UserPolicy", 62 "Effective": "UserPolicy",
61 "UserPolicy": 1 63 "UserPolicy": 1
62 }, 64 },
63 "PSK": { 65 "PSK": {
64 "Effective": "UserPolicy", 66 "Effective": "UserPolicy"
65 } 67 }
66 }, 68 },
67 "OpenVPN": { 69 "OpenVPN": {
68 "ClientCertPattern": { 70 "ClientCertPattern": {
69 "EnrollmentURI": { 71 "EnrollmentURI": {
70 "DeviceEditable": true, 72 "DeviceEditable": true,
71 "UserEditable": true 73 "UserEditable": true
72 }, 74 },
73 "IssuerCARef": { 75 "IssuerCARef": {
74 "DeviceEditable": true, 76 "DeviceEditable": true,
(...skipping 14 matching lines...) Expand all
89 "UserEditable": true, 91 "UserEditable": true,
90 "UserSetting": "users password" 92 "UserSetting": "users password"
91 }, 93 },
92 "Port": { 94 "Port": {
93 "DeviceEditable": true, 95 "DeviceEditable": true,
94 "DevicePolicy": 0, 96 "DevicePolicy": 0,
95 "Effective": "UserPolicy", 97 "Effective": "UserPolicy",
96 "UserPolicy": 1194, 98 "UserPolicy": 1194,
97 "UserSetting": 1195 99 "UserSetting": 1195
98 }, 100 },
101 "ServerCARefs": {
102 "Effective": "UserPolicy",
103 "UserPolicy": ["ref1", "ref2"]
104 },
99 "Username": { 105 "Username": {
100 "DevicePolicy": "device user", 106 "DevicePolicy": "device user",
101 "Effective": "DevicePolicy", 107 "Effective": "DevicePolicy",
102 "UserEditable": true, 108 "UserEditable": true,
103 "UserPolicy": "policy user" 109 "UserPolicy": "policy user"
104 },
105 "ServerCARefs": {
106 "UserPolicy": ["ref1", "ref2"],
107 "Effective": "UserPolicy"
108 } 110 }
109 }, 111 },
110 "Type": { 112 "Type": {
111 "DevicePolicy": "OpenVPN", 113 "DevicePolicy": "OpenVPN",
112 "Effective": "UserPolicy", 114 "Effective": "UserPolicy",
113 "UserPolicy": "OpenVPN", 115 "UserPolicy": "OpenVPN",
114 "UserSetting": "OpenVPN" 116 "UserSetting": "OpenVPN"
115 } 117 }
116 } 118 }
117 } 119 }
OLDNEW
« chromeos/network/onc/onc_merger.cc ('K') | « chromeos/network/onc/onc_merger_unittest.cc ('k') | chromeos/test/data/network/vpn_active_settings.onc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698