This adds Cellular to the Shill to ONC translation.

chromeos/network/onc/onc_signature.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/network/onc/onc_signature.h"
 
 #include "chromeos/network/onc/onc_constants.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using base::Value;
@@ skipping 151 matching lines @@
   // Not supported, yet.
   { ethernet::kAuthentication, NULL, &kStringSignature },
   { ethernet::kEAP, NULL, &kEAPSignature },
   { NULL }
 };
 
 // Not supported, yet.
 const OncFieldSignature ipconfig_fields[] = {
   { ipconfig::kGateway, NULL, &kStringSignature },
   { ipconfig::kIPAddress, NULL, &kStringSignature },
-  { kNameServers, NULL, &kStringSignature },
+  { network_config::kNameServers, NULL, &kStringSignature },
   { ipconfig::kRoutingPrefix, NULL, &kIntegerSignature },
-  { kSearchDomains, NULL, &kStringListSignature },
+  { network_config::kSearchDomains, NULL, &kStringListSignature },
   { ipconfig::kType, NULL, &kStringSignature },
   { NULL }
 };
 
 const OncFieldSignature proxy_location_fields[] = {
   { proxy::kHost, NULL, &kStringSignature },
   { proxy::kPort, NULL, &kIntegerSignature },
   { NULL }
 };
 
@@ skipping 12 matching lines @@
   { proxy::kExcludeDomains, NULL, &kStringListSignature },
   { proxy::kManual, NULL, &kProxyManualSignature },
   { proxy::kPAC, NULL, &kStringSignature },
   { proxy::kType, NULL, &kStringSignature },
   { NULL }
 };
 
 const OncFieldSignature wifi_fields[] = {
   { kRecommended, NULL, &kRecommendedSignature },
   { wifi::kAutoConnect, flimflam::kAutoConnectProperty, &kBoolSignature },
+  { wifi::kBSSID, flimflam::kWifiBSsid, &kStringSignature },
   { wifi::kEAP, NULL, &kEAPSignature },
   { wifi::kHiddenSSID, flimflam::kWifiHiddenSsid, &kBoolSignature },
   { wifi::kPassphrase, flimflam::kPassphraseProperty, &kStringSignature },
   { wifi::kSSID, flimflam::kSSIDProperty, &kStringSignature },
   // This field is converted during translation, see onc_translator_*.
   { wifi::kSecurity, NULL, &kStringSignature },
   { NULL }
 };
 
+const OncFieldSignature cellular_fields[] = {

[pneubeck (no reviews), 2013/01/18 10:27:41]

We'll need documentation for these fields. I'll set up an addendum document
besides the onc_spec.

[Greg Spencer (Chromium), 2013/01/18 22:27:44]

OK.  I think almost all of them are read-only fields.

Given that, and the fact that I think read-only is a pretty common thing among
these fields, do you think it makes sense to have a bitfield in
OncFieldSignature that indicate which fields are writable?  Then we could
probably eliminate some functions in the translators where they're only handling
the read-only aspects and not actual translation.

+  { kRecommended, NULL, &kRecommendedSignature },
+  { cellular::kActivateOverNonCellularNetwork,
+    shill::kActivateOverNonCellularNetworkProperty, &kStringSignature },
+  { cellular::kActivationState,
+    flimflam::kActivationStateProperty, &kStringSignature },
+  { cellular::kAllowRoaming,
+    flimflam::kCellularAllowRoamingProperty, &kStringSignature },
+  { cellular::kAPN, flimflam::kApnProperty, &kStringSignature },
+  { cellular::kCarrier, flimflam::kCarrierProperty, &kStringSignature },
+  { cellular::kESN, flimflam::kEsnProperty, &kStringSignature },
+  { cellular::kFamily, flimflam::kTechnologyFamilyProperty, &kStringSignature },
+  { cellular::kFirmwareRevision,
+    flimflam::kFirmwareRevisionProperty, &kStringSignature },
+  { cellular::kFoundNetworks,
+    flimflam::kFoundNetworksProperty, &kStringSignature },
+  { cellular::kHardwareRevision,
+    flimflam::kHardwareRevisionProperty, &kStringSignature },
+  { cellular::kHomeProvider,
+    flimflam::kHomeProviderProperty, &kStringSignature },
+  { cellular::kICCID, flimflam::kIccidProperty, &kStringSignature },
+  { cellular::kIMEI, flimflam::kImeiProperty, &kStringSignature },
+  { cellular::kIMSI, flimflam::kImsiProperty, &kStringSignature },
+  { cellular::kManufacturer,
+    flimflam::kManufacturerProperty, &kStringSignature },
+  { cellular::kMDN, flimflam::kMdnProperty, &kStringSignature },
+  { cellular::kMEID, flimflam::kMeidProperty, &kStringSignature },
+  { cellular::kMIN, flimflam::kMinProperty, &kStringSignature },
+  { cellular::kModelID, flimflam::kModelIDProperty, &kStringSignature },
+  { cellular::kNetworkTechnology,
+    flimflam::kNetworkTechnologyProperty, &kStringSignature },
+  { cellular::kOperatorCode,
+    flimflam::kOperatorCodeProperty, &kStringSignature },
+  { cellular::kOperatorName,
+    flimflam::kOperatorNameProperty, &kStringSignature },
+  { cellular::kPRLVersion, flimflam::kPRLVersionProperty, &kStringSignature },
+  { cellular::kProviderRequiresRoaming,
+    shill::kProviderRequiresRoamingProperty, &kStringSignature },
+  { cellular::kRoamingState,
+    flimflam::kRoamingStateProperty, &kStringSignature },
+  { cellular::kSelectedNetwork,
+    flimflam::kSelectedNetworkProperty, &kStringSignature },
+  { cellular::kServingOperator,
+    flimflam::kServingOperatorProperty, &kStringSignature },
+  { cellular::kSIMLockStatus,
+    flimflam::kSIMLockStatusProperty, &kStringSignature },
+  { cellular::kSIMPresent, shill::kSIMPresentProperty, &kStringSignature },
+  { cellular::kSupportedCarriers,
+    shill::kSupportedCarriersProperty, &kStringSignature },
+  { cellular::kSupportNetworkScan,
+    flimflam::kSupportNetworkScanProperty, &kStringSignature },
+  { NULL }
+};
+
 const OncFieldSignature network_configuration_fields[] = {
   { kRecommended, NULL, &kRecommendedSignature },
-  { kEthernet, NULL, &kEthernetSignature },
-  { kGUID, flimflam::kGuidProperty, &kStringSignature },
-  { kIPConfigs, NULL, &kIPConfigListSignature },
+  { network_config::kEthernet, NULL, &kEthernetSignature },
+  { network_config::kGUID, flimflam::kGuidProperty, &kStringSignature },
+  { network_config::kIPConfigs, NULL, &kIPConfigListSignature },
   // Shill doesn't allow setting the name for non-VPN networks.
   // This field is conditionally translated, see onc_translator_*.
-  { kName, NULL, &kStringSignature },
+  { network_config::kName, NULL, &kStringSignature },
   // Not supported, yet.
-  { kNameServers, NULL, &kStringListSignature },
-  { kProxySettings, NULL, &kProxySettingsSignature },
+  { network_config::kNameServers, NULL, &kStringListSignature },
+  { network_config::kProxySettings, NULL, &kProxySettingsSignature },
   // No need to translate.
   { kRemove, NULL, &kBoolSignature },
   // Not supported, yet.
-  { kSearchDomains, NULL, &kStringListSignature },
+  { network_config::kSearchDomains, NULL, &kStringListSignature },
   // This field is converted during translation, see onc_translator_*.
-  { kType, NULL, &kStringSignature },
-  { kVPN, NULL, &kVPNSignature },
-  { kWiFi, NULL, &kWiFiSignature },
+  { network_config::kType, NULL, &kStringSignature },
+  { network_config::kVPN, NULL, &kVPNSignature },
+  { network_config::kWiFi, NULL, &kWiFiSignature },
+  { network_config::kCellular, NULL, &kCellularSignature },
+  // This field is converted during translation, see onc_translator_*.

[pneubeck (no reviews), 2013/01/18 10:27:41]

mention that it is read-only and/or converted only in Shill->ONC
(onc_translator_shill_to_onc.*)

[Greg Spencer (Chromium), 2013/01/18 22:27:44]

Done.

+  { network_config::kState, NULL, &kStringSignature},
   { NULL }
 };
 
 // Certificates are not translated to Shill.
 const OncFieldSignature certificate_fields[] = {
-  { kGUID, NULL, &kStringSignature },
+  { network_config::kGUID, NULL, &kStringSignature },

[pneubeck (no reviews), 2013/01/18 10:27:41]

(onc::)kGUID

[Greg Spencer (Chromium), 2013/01/18 22:27:44]

Changed to certificate::kGUID.

   { certificate::kPKCS12, NULL, &kStringSignature },
   { kRemove, NULL, &kBoolSignature },
   { certificate::kTrust, NULL, &kStringListSignature },
   { certificate::kType, NULL, &kStringSignature },
   { certificate::kX509, NULL, &kStringSignature },
   { NULL }
 };
 
 const OncFieldSignature toplevel_configuration_fields[] = {
   { kCertificates, NULL, &kCertificateListSignature },
   { kNetworkConfigurations, NULL, &kNetworkConfigurationListSignature },
-  { kType, NULL, &kStringSignature },
+  { encrypted::kType, NULL, &kStringSignature },

[pneubeck (no reviews), 2013/01/18 10:27:41]

toplevel_config::kType

[Greg Spencer (Chromium), 2013/01/18 22:27:44]

Done.

   { encrypted::kCipher, NULL, &kStringSignature },
   { encrypted::kCiphertext, NULL, &kStringSignature },
   { encrypted::kHMAC, NULL, &kStringSignature },
   { encrypted::kHMACMethod, NULL, &kStringSignature },
   { encrypted::kIV, NULL, &kStringSignature },
   { encrypted::kIterations, NULL, &kIntegerSignature },
   { encrypted::kSalt, NULL, &kStringSignature },
   { encrypted::kStretch, NULL, &kStringSignature },
   { NULL }
 };
@@ skipping 35 matching lines @@
 };
 const OncValueSignature kProxyManualSignature = {
   Value::TYPE_DICTIONARY, proxy_manual_fields, NULL
 };
 const OncValueSignature kProxySettingsSignature = {
   Value::TYPE_DICTIONARY, proxy_settings_fields, NULL
 };
 const OncValueSignature kWiFiSignature = {
   Value::TYPE_DICTIONARY, wifi_fields, NULL
 };
+const OncValueSignature kCellularSignature = {
+  Value::TYPE_DICTIONARY, cellular_fields, NULL
+};
 const OncValueSignature kCertificateSignature = {
   Value::TYPE_DICTIONARY, certificate_fields, NULL
 };
 const OncValueSignature kNetworkConfigurationSignature = {
   Value::TYPE_DICTIONARY, network_configuration_fields, NULL
 };
 const OncValueSignature kCertificateListSignature = {
   Value::TYPE_LIST, NULL, &kCertificateSignature
 };
 const OncValueSignature kNetworkConfigurationListSignature = {
@@ skipping 10 matching lines @@
   for (const OncFieldSignature* field_signature = signature.fields;
        field_signature->onc_field_name != NULL; ++field_signature) {
     if (onc_field_name == field_signature->onc_field_name)
       return field_signature;
   }
   return NULL;
 }
 
 }  // namespace onc
 }  // namespace chromeos