Translate Saved/StaticIPConfig properties from ONC to Shill

chromeos/network/onc/onc_signature.cc

Index: chromeos/network/onc/onc_signature.cc
diff --git a/chromeos/network/onc/onc_signature.cc b/chromeos/network/onc/onc_signature.cc
index 6b85eabecc95cf23e92be3030c2de2b3974205d2..65fcc2977f3f424a73de3251621966ac4dee72d4 100644
--- a/chromeos/network/onc/onc_signature.cc
+++ b/chromeos/network/onc/onc_signature.cc
@@ -178,6 +178,7 @@ const OncFieldSignature ipconfig_fields[] = {
     { ::onc::ipconfig::kRoutingPrefix, &kIntegerSignature},
     { ::onc::network_config::kSearchDomains, &kStringListSignature},
     { ::onc::ipconfig::kType, &kStringSignature},
+    { ::onc::ipconfig::kWebProxyAutoDiscoveryUrl, &kStringSignature},
     {NULL}};
 
 const OncFieldSignature proxy_location_fields[] = {
@@ -287,8 +288,13 @@ const OncFieldSignature network_configuration_fields[] = {
     { ::onc::kRecommended, &kRecommendedSignature},
     { ::onc::network_config::kEthernet, &kEthernetSignature},
     { ::onc::network_config::kGUID, &kStringSignature},
-    // Not supported for policy but for reading network state.
+
+    // IPConfig fields are not supported for policy (onc -> shill) but are
+    // supported for reading network state (shill -> onc).

[pneubeck (no reviews), 2014/09/04 12:41:12]

aah.
kIPConfigs and kSavedIPConfig should be moved to network_with_state_fields as
they're read only.

[stevenjb, 2014/09/04 15:26:21]

Done.

     { ::onc::network_config::kIPConfigs, &kIPConfigListSignature},
+    { ::onc::network_config::kSavedIPConfig, &kSavedIPConfigSignature},
+    { ::onc::network_config::kStaticIPConfig, &kStaticIPConfigSignature},
+
     { ::onc::network_config::kName, &kStringSignature},
     // Not supported, yet.
     { ::onc::network_config::kNameServers, &kStringListSignature},
@@ -380,6 +386,12 @@ const OncValueSignature kEthernetSignature = {
 const OncValueSignature kIPConfigSignature = {
   base::Value::TYPE_DICTIONARY, ipconfig_fields, NULL
 };
+const OncValueSignature kSavedIPConfigSignature = {
+  base::Value::TYPE_DICTIONARY, NULL, NULL, &kIPConfigSignature
+};
+const OncValueSignature kStaticIPConfigSignature = {
+  base::Value::TYPE_DICTIONARY, NULL, NULL, &kIPConfigSignature
+};
 const OncValueSignature kProxyLocationSignature = {
   base::Value::TYPE_DICTIONARY, proxy_location_fields, NULL
 };