chromeos/test/data/network/augmented_merge.json - Issue 749013003: ONC: Add IPAddressConfigType and NameServersConfigType

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 749013003: ONC: Add IPAddressConfigType and NameServersConfigType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 6 years 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

« chromeos/network/onc/onc_translator_shill_to_onc.cc ('K') | « chromeos/network/onc/onc_validator.cc ('k') | chromeos/test/data/network/device_policy.onc » ('j') | components/onc/docs/onc_spec.html » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 {	1 {

2 "ConnectionState": "Connected",	2 "ConnectionState": "Connected",

3 "GUID": "123",	3 "GUID": "123",

4 "IPConfigs": [ {	4 "IPConfigs": [ {

5 "Gateway": "2001:db8:85a3::7a2e:370:7331",	5 "Gateway": "2001:db8:85a3::7a2e:370:7331",

6 "IPAddress": "2001:0db8:85a3:0000:0000:8a2e:0370:7334",	6 "IPAddress": "2001:0db8:85a3:0000:0000:8a2e:0370:7334",

7 "NameServers": [ ],	7 "NameServers": [ ],

8 "RoutingPrefix": 12,	8 "RoutingPrefix": 12,

9 "Type": "IPv6"	9 "Type": "IPv6"

10 } ],	10 } ],

11 "SavedIPConfig": {	11 "SavedIPConfig": {

12 "Gateway": "1.1.1.4",	12 "Gateway": "1.1.1.4",

13 "IPAddress": "124.124.124.124",	13 "IPAddress": "124.124.124.124",

14 "NameServers": [ "1.1.1.5", "1.1.1.6" ],	14 "NameServers": [ "1.1.1.5", "1.1.1.6" ],

15 "RoutingPrefix": 25,	15 "RoutingPrefix": 25,

16 "Type": "IPv4",	16 "Type": "IPv4"

	17 },

	18 "IPAddressConfigType": {

	19 "DevicePolicy": "Static",

	20 "Effective": "UserPolicy",

	21 "UserSetting": "Static"

17 },	22 },

18 "StaticIPConfig": {	23 "StaticIPConfig": {

19 "IPAddress": {	24 "IPAddress": {

20 "DevicePolicy": "127.0.0.1",	25 "DevicePolicy": "127.0.0.1",

21 "Effective": "UserPolicy",	26 "Effective": "UserPolicy",

22 "UserPolicy": "127.0.0.1",	27 "UserPolicy": "127.0.0.1",

23 "UserSetting": "1.2.3.4"	28 "UserSetting": "1.2.3.4"

24 },	29 },

25 "RoutingPrefix": {	30 "RoutingPrefix": {

26 "Effective": "UserPolicy",	31 "Effective": "UserPolicy",

(...skipping 96 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
123 }	128 }

124 },	129 },

125 "Type": {	130 "Type": {

126 "DevicePolicy": "OpenVPN",	131 "DevicePolicy": "OpenVPN",

127 "Effective": "UserPolicy",	132 "Effective": "UserPolicy",

128 "UserPolicy": "OpenVPN",	133 "UserPolicy": "OpenVPN",

129 "UserSetting": "OpenVPN"	134 "UserSetting": "OpenVPN"

130 }	135 }

131 }	136 }

132 }	137 }

OLD	NEW