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

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

Issue 776603002: Revert of Change to Shill's IPConfig objects. (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
« no previous file with comments | « chromeos/test/data/network/shill_ethernet.json ('k') | no next file » | 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":"guid", 2 "GUID":"guid",
3 "IPConfigs":[ 3 "IPConfigs":[
4 { 4 {
5 "Address":"123.123.123.123", 5 "Address":"123.123.123.123",
6 "Gateway":"1.1.1.1", 6 "Gateway":"1.1.1.1",
7 "Method":"ipv4", 7 "Method":"ipv4",
8 "NameServers":[ 8 "NameServers":[
9 "1.1.1.2", 9 "1.1.1.2",
10 "1.1.1.3" 10 "1.1.1.3"
11 ], 11 ],
12 "Prefixlen":24, 12 "Prefixlen":24,
13 "WebProxyAutoDiscoveryUrl":"proxy.url" 13 "WebProxyAutoDiscoveryUrl":"proxy.url"
14 }, 14 },
15 { 15 {
16 "Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334", 16 "Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334",
17 "Gateway":"2001:db8:85a3::7a2e:370:7331", 17 "Gateway":"2001:db8:85a3::7a2e:370:7331",
18 "Method":"ipv6", 18 "Method":"ipv6",
19 "NameServers":[], 19 "NameServers":[],
20 "Prefixlen":12 20 "Prefixlen":12
21 } 21 }
22 ], 22 ],
23 "SavedIPConfig": { 23 "SavedIP.Address":"124.124.124.124",
24 "Address":"124.124.124.124", 24 "SavedIP.Gateway":"1.1.1.4",
25 "Gateway":"1.1.1.4", 25 "SavedIP.NameServers":"1.1.1.5,1.1.1.6",
26 "NameServers":["1.1.1.5","1.1.1.6"], 26 "SavedIP.Prefixlen":25,
27 "Prefixlen":25 27 "StaticIP.Address":"125.125.125.125",
28 }, 28 "StaticIP.Gateway":"1.1.1.7",
29 "StaticIPConfig": { 29 "StaticIP.NameServers":"1.1.1.8",
30 "Address":"125.125.125.125", 30 "StaticIP.Prefixlen":26,
31 "Gateway":"1.1.1.7",
32 "NameServers":["1.1.1.8"],
33 "Prefixlen":26
34 },
35 "Type":"ethernet" 31 "Type":"ethernet"
36 } 32 }
OLDNEW
« no previous file with comments | « chromeos/test/data/network/shill_ethernet.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698