Extending the translation 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 974df42e32e27baf21746573e9dde3feed3b543f..5062c6133a7fb3817227e93f7d772a01ccb6b7bb 100644
--- a/chromeos/network/onc/onc_signature.cc
+++ b/chromeos/network/onc/onc_signature.cc
@@ -54,8 +54,10 @@ const OncFieldSignature eap_fields[] = {
   { eap::kClientCertRef, NULL, &kStringSignature },
   { eap::kClientCertType, NULL, &kStringSignature },
   { eap::kIdentity, flimflam::kEapIdentityProperty, &kStringSignature },
-  { eap::kInner, flimflam::kEapPhase2AuthProperty, &kStringSignature },
-  { eap::kOuter, flimflam::kEapMethodProperty, &kStringSignature },
+  // This field is converted during translation, see onc_translator_*.
+  { eap::kInner, NULL, &kStringSignature },
+  // This field is converted during translation, see onc_translator_*.
+  { eap::kOuter, NULL, &kStringSignature },
   { eap::kPassword, flimflam::kEapPasswordProperty, &kStringSignature },
   { eap::kSaveCredentials, flimflam::kSaveCredentialsProperty,
     &kBoolSignature },
@@ -126,6 +128,7 @@ const OncFieldSignature openvpn_fields[] = {
   { vpn::kSaveCredentials, flimflam::kSaveCredentialsProperty,
     &kBoolSignature },
   { vpn::kServerCARef, flimflam::kOpenVPNCaCertNSSProperty, &kStringSignature },
+  // Not supported, yet.
   { vpn::kServerCertRef, NULL, &kStringSignature },
   { vpn::kServerPollTimeout, flimflam::kOpenVPNServerPollTimeoutProperty,
     &kIntegerSignature },
@@ -136,6 +139,7 @@ const OncFieldSignature openvpn_fields[] = {
     &kStringSignature },
   { vpn::kTLSRemote, flimflam::kOpenVPNTLSRemoteProperty, &kStringSignature },
   { vpn::kUsername, flimflam::kOpenVPNUserProperty, &kStringSignature },
+  // Not supported, yet.
   { vpn::kVerb, NULL, &kStringSignature },
   { NULL }
 };
@@ -147,12 +151,13 @@ const OncFieldSignature vpn_fields[] = {
   { vpn::kL2TP, NULL, &kL2TPSignature },
   { vpn::kOpenVPN, NULL, &kOpenVPNSignature },
   // This field is converted during translation, see onc_translator_*.
-  { kType, NULL, &kStringSignature },
+  { vpn::kType, NULL, &kStringSignature },
   { NULL }
 };
 
 const OncFieldSignature ethernet_fields[] = {
   { kRecommended, NULL, &kRecommendedSignature },
+  // Not supported, yet.
   { ethernet::kAuthentication, NULL, &kStringSignature },
   { ethernet::kEAP, NULL, &kEAPSignature },
   { NULL }
@@ -164,8 +169,7 @@ const OncFieldSignature ipconfig_fields[] = {
   { kNameServers, NULL, &kStringSignature },
   { ipconfig::kRoutingPrefix, NULL, &kIntegerSignature },
   { kSearchDomains, NULL, &kStringListSignature },
-  // This field is converted during translation, see onc_translator_*.
-  { kType, NULL, &kStringSignature },
+  { ipconfig::kType, NULL, &kStringSignature },
   { NULL }
 };
 
@@ -188,7 +192,7 @@ const OncFieldSignature proxy_settings_fields[] = {
   { proxy::kExcludeDomains, NULL, &kStringListSignature },
   { proxy::kManual, NULL, &kProxyManualSignature },
   { proxy::kPAC, NULL, &kStringSignature },
-  { kType, NULL, &kStringSignature },
+  { proxy::kType, NULL, &kStringSignature },
   { NULL }
 };
 
@@ -199,7 +203,8 @@ const OncFieldSignature wifi_fields[] = {
   { wifi::kHiddenSSID, flimflam::kWifiHiddenSsid, &kBoolSignature },
   { wifi::kPassphrase, flimflam::kPassphraseProperty, &kStringSignature },
   { wifi::kSSID, flimflam::kSSIDProperty, &kStringSignature },
-  { wifi::kSecurity, flimflam::kSecurityProperty, &kStringSignature },
+  // This field is converted during translation, see onc_translator_*.
+  { wifi::kSecurity, NULL, &kStringSignature },
   { NULL }
 };
 
@@ -208,7 +213,9 @@ const OncFieldSignature network_configuration_fields[] = {
   { kEthernet, NULL, &kEthernetSignature },
   { kGUID, flimflam::kGuidProperty, &kStringSignature },
   { kIPConfigs, NULL, &kIPConfigListSignature },
-  { kName, flimflam::kNameProperty, &kStringSignature },
+  // Shill doesn't allow setting the name for non-VPN networks.
+  // This field is conditionally translated, see onc_translator_*.
+  { kName, NULL, &kStringSignature },
   { kNameServers, NULL, &kStringListSignature },
   { kProxySettings, NULL, &kProxySettingsSignature },
   { kRemove, NULL, &kBoolSignature },
@@ -225,7 +232,7 @@ const OncFieldSignature certificate_fields[] = {
   { certificate::kPKCS12, NULL, &kStringSignature },
   { kRemove, NULL, &kBoolSignature },
   { certificate::kTrust, NULL, &kStringListSignature },
-  { kType, NULL, &kStringSignature },
+  { certificate::kType, NULL, &kStringSignature },
   { certificate::kX509, NULL, &kStringSignature },
   { NULL }
 };