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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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: Rebased. 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 side-by-side diff with in-line comments
Download patch
« chromeos/network/onc/onc_translator_onc_to_shill.cc ('K') | « chromeos/network/onc/onc_validator_unittest.cc ('k') | chromeos/test/data/network/device_policy.onc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/test/data/network/augmented_merge.json
diff --git a/chromeos/test/data/network/augmented_merge.json b/chromeos/test/data/network/augmented_merge.json
index 6ebbf04d70a32deadf38f7100817f871723d7f0a..48322b231b5b48c9d99128dd610bdc6384cd4c4c 100644
--- a/chromeos/test/data/network/augmented_merge.json
+++ b/chromeos/test/data/network/augmented_merge.json
@@ -5,24 +5,58 @@
},
"GUID": "123",
"IPConfigs": {
- "DevicePolicy": [ {
- "IPAddress": "127.0.0.1",
- "Type": "IPv4"
+ "Active": [ {
+ "Gateway": "2001:db8:85a3::7a2e:370:7331",
+ "IPAddress": "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+ "NameServers": [ ],
+ "RoutingPrefix": 12,
+ "Type": "IPv6"
} ],
- "Effective": "UserPolicy",
- "UserPolicy": [ {
- "IPAddress": "127.0.0.1",
- "RoutingPrefix": 32,
- "Type": "IPv4"
- } ],
- "UserSetting": [ {
- "IPAddress": "127.0.0.1",
- "SearchDomains": [ "acme.org" ],
- "Type": "IPv4"
- }, {
- "IPAddress": "1.2.3.4",
- "Type": "IPv4"
- } ]
+ "Effective": "Unmanaged"
+ },
+ "SavedIPConfig": {
+ "Gateway": {
+ "Active": "1.1.1.4",
+ "Effective": "Unmanaged"
+ },
+ "IPAddress": {
+ "Active": "124.124.124.124",
+ "Effective": "Unmanaged"
+ },
+ "NameServers": {
+ "Active": [ "1.1.1.5", "1.1.1.6" ],
+ "Effective": "Unmanaged"
+ },
+ "RoutingPrefix": {
+ "Active": 25,
+ "Effective": "Unmanaged"
+ },
+ "Type": {
+ "Active": "IPv4",
+ "Effective": "Unmanaged"
+ }
+ },
+ "StaticIPConfig": {
+ "IPAddress": {
+ "DevicePolicy": "127.0.0.1",
+ "Effective": "UserPolicy",
+ "UserPolicy": "127.0.0.1",
+ "UserSetting": "1.2.3.4"
+ },
+ "RoutingPrefix": {
+ "Effective": "UserPolicy",
+ "UserPolicy": 32
+ },
+ "SearchDomains": {
+ "Effective": "UserPolicy",
+ "UserSetting": [ "acme.org" ]
+ },
+ "Type": {
+ "DevicePolicy": "IPv4",
+ "Effective": "UserPolicy",
+ "UserPolicy": "IPv4",
+ "UserSetting": "IPv4"
+ }
},
"Name": {
"Active": "testopenvpn",
« chromeos/network/onc/onc_translator_onc_to_shill.cc ('K') | « 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