chromeos/test/data/network/augmented_merge.json - Issue 12676017: Adding policy support to the new network configuration stack.

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 12676017: Adding policy support to the new network configuration stack. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed Julian's comments. Reuploaded with rebase. Created 7 years, 8 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/managed_network_configuration_handler.cc ('K') | « chromeos/network/onc/onc_utils_unittest.cc ('k') | chromeos/test/data/network/policy/policy_wifi1.onc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 {	1 {

2 "GUID": {	2 "GUID": {

3 "DevicePolicy": "123",	3 "DevicePolicy": "123",

4 "Effective": "UserPolicy",	4 "Effective": "UserPolicy",

5 "UserPolicy": "123"	5 "UserPolicy": "123"

6 },	6 },

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"

(...skipping 43 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
54 "IPsec": {	54 "IPsec": {

55 "AuthenticationType": {	55 "AuthenticationType": {

56 "Effective": "UserPolicy",	56 "Effective": "UserPolicy",

57 "UserPolicy": "PSK"	57 "UserPolicy": "PSK"

58 },	58 },

59 "IKEVersion": {	59 "IKEVersion": {

60 "Effective": "UserPolicy",	60 "Effective": "UserPolicy",

61 "UserPolicy": 1	61 "UserPolicy": 1

62 },	62 },

63 "PSK": {	63 "PSK": {

64 "DevicePolicy": "sharedkey",

65 "Effective": "UserPolicy",	64 "Effective": "UserPolicy",

66 "UserPolicy": "sharedkey"

67 }	65 }

68 },	66 },

69 "OpenVPN": {	67 "OpenVPN": {

70 "ClientCertPattern": {	68 "ClientCertPattern": {

71 "EnrollmentURI": {	69 "EnrollmentURI": {

72 "DeviceEditable": true,	70 "DeviceEditable": true,

73 "UserEditable": true	71 "UserEditable": true

74 },	72 },

75 "IssuerCARef": {	73 "IssuerCARef": {

76 "DeviceEditable": true,	74 "DeviceEditable": true,

(...skipping 29 matching lines...) Expand all Loading...
106 }	104 }

107 },	105 },

108 "Type": {	106 "Type": {

109 "DevicePolicy": "OpenVPN",	107 "DevicePolicy": "OpenVPN",

110 "Effective": "UserPolicy",	108 "Effective": "UserPolicy",

111 "UserPolicy": "OpenVPN",	109 "UserPolicy": "OpenVPN",

112 "UserSetting": "OpenVPN"	110 "UserSetting": "OpenVPN"

113 }	111 }

114 }	112 }

115 }	113 }

OLD	NEW