chromeos/test/data/network/augmented_merge.json - Issue 551753002: ONC: Remove augmentation of unmanaged network properties.

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 551753002: ONC: Remove augmentation of unmanaged network properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ipconfig

Patch Set: 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

OLD	NEW
1 {	1 {

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

3 "Active": "Connected",

4 "Effective": "Unmanaged"

5 },

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

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

8 "Active": [ {

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

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

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

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

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

14 } ],	10 } ],

15 "Effective": "Unmanaged"

16 },

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

18 "Gateway": {	12 "Gateway": "1.1.1.4",

19 "Active": "1.1.1.4",	13 "IPAddress": "124.124.124.124",

20 "Effective": "Unmanaged"	14 "NameServers": [ "1.1.1.5", "1.1.1.6" ],

21 },	15 "RoutingPrefix": 25,

22 "IPAddress": {	16 "Type": "IPv4",

23 "Active": "124.124.124.124",

24 "Effective": "Unmanaged"

25 },

26 "NameServers": {

27 "Active": [ "1.1.1.5", "1.1.1.6" ],

28 "Effective": "Unmanaged"

29 },

30 "RoutingPrefix": {

31 "Active": 25,

32 "Effective": "Unmanaged"

33 },

34 "Type": {

35 "Active": "IPv4",

36 "Effective": "Unmanaged"

37 }

38 },	17 },

39 "StaticIPConfig": {	18 "StaticIPConfig": {

40 "IPAddress": {	19 "IPAddress": {

41 "DevicePolicy": "127.0.0.1",	20 "DevicePolicy": "127.0.0.1",

42 "Effective": "UserPolicy",	21 "Effective": "UserPolicy",

43 "UserPolicy": "127.0.0.1",	22 "UserPolicy": "127.0.0.1",

44 "UserSetting": "1.2.3.4"	23 "UserSetting": "1.2.3.4"

45 },	24 },

46 "RoutingPrefix": {	25 "RoutingPrefix": {

47 "Effective": "UserPolicy",	26 "Effective": "UserPolicy",

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

145 },	124 },

146 "Type": {	125 "Type": {

147 "DevicePolicy": "OpenVPN",	126 "DevicePolicy": "OpenVPN",

148 "Effective": "UserPolicy",	127 "Effective": "UserPolicy",

149 "UserPolicy": "OpenVPN",	128 "UserPolicy": "OpenVPN",

150 "UserSetting": "OpenVPN"	129 "UserSetting": "OpenVPN"

151 }	130 }

152 }	131 }

153 }	132 }

OLD	NEW

« no previous file with comments | « chromeos/network/onc/onc_merger.cc ('k') | components/onc/onc_constants.h » ('j') | no next file with comments »