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 48322b231b5b48c9d99128dd610bdc6384cd4c4c..5c7c434978d587aeb577ad7453815ca68d31b818 100644 |
--- a/chromeos/test/data/network/augmented_merge.json |
+++ b/chromeos/test/data/network/augmented_merge.json |
@@ -1,40 +1,19 @@ |
{ |
- "ConnectionState": { |
- "Active": "Connected", |
- "Effective": "Unmanaged" |
- }, |
+ "ConnectionState": "Connected", |
"GUID": "123", |
- "IPConfigs": { |
- "Active": [ { |
+ "IPConfigs": [ { |
"Gateway": "2001:db8:85a3::7a2e:370:7331", |
"IPAddress": "2001:0db8:85a3:0000:0000:8a2e:0370:7334", |
"NameServers": [ ], |
"RoutingPrefix": 12, |
"Type": "IPv6" |
- } ], |
- "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" |
- } |
+ "Gateway": "1.1.1.4", |
+ "IPAddress": "124.124.124.124", |
+ "NameServers": [ "1.1.1.5", "1.1.1.6" ], |
+ "RoutingPrefix": 25, |
+ "Type": "IPv4", |
}, |
"StaticIPConfig": { |
"IPAddress": { |