diff options
| author | stevenjb <stevenjb@chromium.org> | 2014-12-03 12:44:22 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-03 20:45:51 +0000 |
| commit | 870dfbecc375b1e0d89594e1f7de5fa7a4e1ea84 (patch) | |
| tree | f542a70afabe233daa4841b5e9519b3349f81ff0 /chromeos/test/data/network | |
| parent | fb0c4fd675c191bcc214088881d66170a2e828c0 (diff) | |
| download | chromium_src-870dfbecc375b1e0d89594e1f7de5fa7a4e1ea84.zip chromium_src-870dfbecc375b1e0d89594e1f7de5fa7a4e1ea84.tar.gz chromium_src-870dfbecc375b1e0d89594e1f7de5fa7a4e1ea84.tar.bz2 | |
Reland: Change to Shill's IPConfig objects.
Before a recent Shill change, Static and Saved IP config properties were stored in toplevel properties with prefixed keys like kStaticIPAddressProperty.
This change makes use of Shill now exposing these properties nested under a StaticIPConfig and SavedIPConfig dictionary.
This also makes the translation between a list of nameservers and a comma-separated string obsolete.
Original Review URL: https://codereview.chromium.org/762243002
BUG=411289
TBR=pneubeck@chromium.org
Review URL: https://codereview.chromium.org/778693004
Cr-Commit-Position: refs/heads/master@{#306669}
Diffstat (limited to 'chromeos/test/data/network')
| -rw-r--r-- | chromeos/test/data/network/shill_ethernet.json | 10 | ||||
| -rw-r--r-- | chromeos/test/data/network/shill_ethernet_with_ipconfig.json | 20 |
2 files changed, 18 insertions, 12 deletions
diff --git a/chromeos/test/data/network/shill_ethernet.json b/chromeos/test/data/network/shill_ethernet.json index e342d13..7842203 100644 --- a/chromeos/test/data/network/shill_ethernet.json +++ b/chromeos/test/data/network/shill_ethernet.json @@ -1,7 +1,9 @@ { "GUID": "guid", "Type": "ethernet", - "StaticIP.Address":"125.125.125.125", - "StaticIP.Gateway":"1.1.1.7", - "StaticIP.NameServers":"1.1.1.8,125.1.1.3", - "StaticIP.Prefixlen":26 + "StaticIPConfig": { + "Address": "125.125.125.125", + "Gateway": "1.1.1.7", + "NameServers": ["1.1.1.8", "125.1.1.3"], + "Prefixlen": 26 + } } diff --git a/chromeos/test/data/network/shill_ethernet_with_ipconfig.json b/chromeos/test/data/network/shill_ethernet_with_ipconfig.json index a451a6b..f698b26 100644 --- a/chromeos/test/data/network/shill_ethernet_with_ipconfig.json +++ b/chromeos/test/data/network/shill_ethernet_with_ipconfig.json @@ -20,13 +20,17 @@ "Prefixlen":12 } ], - "SavedIP.Address":"124.124.124.124", - "SavedIP.Gateway":"1.1.1.4", - "SavedIP.NameServers":"1.1.1.5,1.1.1.6", - "SavedIP.Prefixlen":25, - "StaticIP.Address":"125.125.125.125", - "StaticIP.Gateway":"1.1.1.7", - "StaticIP.NameServers":"1.1.1.8", - "StaticIP.Prefixlen":26, + "SavedIPConfig": { + "Address":"124.124.124.124", + "Gateway":"1.1.1.4", + "NameServers":["1.1.1.5","1.1.1.6"], + "Prefixlen":25 + }, + "StaticIPConfig": { + "Address":"125.125.125.125", + "Gateway":"1.1.1.7", + "NameServers":["1.1.1.8"], + "Prefixlen":26 + }, "Type":"ethernet" } |