Correctly translate Cellular Device properties to ONC

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 "components/onc/onc_constants.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using base::Value;
 
 namespace chromeos {
 namespace onc {
 namespace {
 
 const OncValueSignature kBoolSignature = {
   base::Value::TYPE_BOOLEAN, NULL
 };
 const OncValueSignature kStringSignature = {
   base::Value::TYPE_STRING, NULL
 };
 const OncValueSignature kIntegerSignature = {
   base::Value::TYPE_INTEGER, NULL
 };
+const OncValueSignature kDoubleSignature = {
+  base::Value::TYPE_DOUBLE, NULL
+};
 const OncValueSignature kStringListSignature = {
   base::Value::TYPE_LIST, NULL, &kStringSignature
 };
 const OncValueSignature kIntegerListSignature = {
   base::Value::TYPE_LIST, NULL, &kIntegerSignature
 };
 const OncValueSignature kIPConfigListSignature = {
   base::Value::TYPE_LIST, NULL, &kIPConfigSignature
 };
 const OncValueSignature kCellularApnListSignature = {
   base::Value::TYPE_LIST, NULL, &kCellularApnSignature
 };
+const OncValueSignature kCellularFoundNetworkListSignature = {
+  base::Value::TYPE_LIST, NULL, &kCellularFoundNetworkSignature
+};
 
 const OncFieldSignature issuer_subject_pattern_fields[] = {
     { ::onc::client_cert::kCommonName, &kStringSignature},
     { ::onc::client_cert::kLocality, &kStringSignature},
     { ::onc::client_cert::kOrganization, &kStringSignature},
     { ::onc::client_cert::kOrganizationalUnit, &kStringSignature},
     {NULL}};
 
 const OncFieldSignature certificate_pattern_fields[] = {
     { ::onc::kRecommended, &kRecommendedSignature},
@@ skipping 163 matching lines @@
     { ::onc::wifi::kSignalStrength, &kIntegerSignature},
     {NULL}};
 
 const OncFieldSignature cellular_provider_fields[] = {
     { ::onc::cellular_provider::kCode, &kStringSignature},
     { ::onc::cellular_provider::kCountry, &kStringSignature},
     { ::onc::cellular_provider::kName, &kStringSignature},
     {NULL}};
 
 const OncFieldSignature cellular_apn_fields[] = {
+    { ::onc::cellular_apn::kApn, &kStringSignature},
     { ::onc::cellular_apn::kName, &kStringSignature},
     { ::onc::cellular_apn::kUsername, &kStringSignature},
     { ::onc::cellular_apn::kPassword, &kStringSignature},
+    { ::onc::cellular_apn::kLocalizedName, &kStringSignature},
+    { ::onc::cellular_apn::kLanguage, &kStringSignature},
+    {NULL}};
+
+const OncFieldSignature cellular_found_network_fields[] = {
+    { ::onc::cellular_found_network::kStatus, &kStringSignature},
+    { ::onc::cellular_found_network::kNetworkId, &kStringSignature},
+    { ::onc::cellular_found_network::kShortName, &kStringSignature},
+    { ::onc::cellular_found_network::kLongName, &kStringSignature},
+    { ::onc::cellular_found_network::kTechnology, &kStringSignature},
+    {NULL}};
+
+const OncFieldSignature sim_lock_status_fields[] = {
+    { ::onc::sim_lock_status::kLockEnabled, &kBoolSignature},
+    { ::onc::sim_lock_status::kLockType, &kStringSignature},
+    { ::onc::sim_lock_status::kRetriesLeft, &kDoubleSignature},
     {NULL}};
 
 const OncFieldSignature cellular_fields[] = {
     { ::onc::kRecommended, &kRecommendedSignature},
     { ::onc::cellular::kAPN, &kCellularApnSignature },
     { ::onc::cellular::kAPNList, &kCellularApnListSignature},
     {NULL}};
 
 const OncFieldSignature cellular_with_state_fields[] = {
     { ::onc::cellular::kActivateOverNonCellularNetwork, &kBoolSignature},
     { ::onc::cellular::kActivationState, &kStringSignature},
+    { ::onc::cellular::kNetworkTechnology, &kStringSignature},
+    { ::onc::cellular::kRoamingState, &kStringSignature},
+    { ::onc::cellular::kServingOperator, &kCellularProviderSignature},
+    {NULL}};
+
+const OncFieldSignature cellular_device_fields[] = {
     { ::onc::cellular::kAllowRoaming, &kBoolSignature},
+    { ::onc::cellular::kAPNList, &kCellularApnListSignature},

[pneubeck (no reviews), 2014/07/21 08:21:53]

this exists now in both CellularDevice and Cellular (and by 'inheritance' as
well in CellularWithState).
is one redundant?

[stevenjb, 2014/07/22 18:29:33]

I think it probably doesn't belong in Cellular, will remove.

     { ::onc::cellular::kCarrier, &kStringSignature},
     { ::onc::cellular::kESN, &kStringSignature},
     { ::onc::cellular::kFamily, &kStringSignature},
     { ::onc::cellular::kFirmwareRevision, &kStringSignature},
-    { ::onc::cellular::kFoundNetworks, &kStringSignature},
+    { ::onc::cellular::kFoundNetworks, &kCellularFoundNetworkListSignature},
     { ::onc::cellular::kHardwareRevision, &kStringSignature},
     { ::onc::cellular::kHomeProvider, &kCellularProviderSignature},
     { ::onc::cellular::kICCID, &kStringSignature},
     { ::onc::cellular::kIMEI, &kStringSignature},
     { ::onc::cellular::kIMSI, &kStringSignature},
     { ::onc::cellular::kManufacturer, &kStringSignature},
     { ::onc::cellular::kMDN, &kStringSignature},
     { ::onc::cellular::kMEID, &kStringSignature},
     { ::onc::cellular::kMIN, &kStringSignature},
     { ::onc::cellular::kModelID, &kStringSignature},
-    { ::onc::cellular::kNetworkTechnology, &kStringSignature},
-    { ::onc::cellular::kPRLVersion, &kStringSignature},
+    { ::onc::cellular::kPRLVersion, &kIntegerSignature},
     { ::onc::cellular::kProviderRequiresRoaming, &kBoolSignature},
-    { ::onc::cellular::kRoamingState, &kStringSignature},
     { ::onc::cellular::kSelectedNetwork, &kStringSignature},
-    { ::onc::cellular::kServingOperator, &kCellularProviderSignature},
-    { ::onc::cellular::kSIMLockEnabled, &kBoolSignature},
-    { ::onc::cellular::kSIMLockStatus, &kStringSignature},
-    { ::onc::cellular::kSIMLockType, &kStringSignature},
-    { ::onc::cellular::kSIMPresent, &kStringSignature},
-    { ::onc::cellular::kSupportedCarriers, &kStringSignature},
-    { ::onc::cellular::kSupportNetworkScan, &kStringSignature},
+    { ::onc::cellular::kSIMLockStatus, &kSIMLockStatusSignature},
+    { ::onc::cellular::kSIMPresent, &kBoolSignature},
+    { ::onc::cellular::kSupportedCarriers, &kStringListSignature},
+    { ::onc::cellular::kSupportNetworkScan, &kBoolSignature},
     {NULL}};
 
 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.
     { ::onc::network_config::kIPConfigs, &kIPConfigListSignature},
     { ::onc::network_config::kName, &kStringSignature},
     // Not supported, yet.
@@ skipping 124 matching lines @@
 const OncValueSignature kWiFiWithStateSignature = {
   base::Value::TYPE_DICTIONARY, wifi_with_state_fields, NULL, &kWiFiSignature
 };
 const OncValueSignature kCellularSignature = {
   base::Value::TYPE_DICTIONARY, cellular_fields, NULL
 };
 const OncValueSignature kCellularWithStateSignature = {
   base::Value::TYPE_DICTIONARY, cellular_with_state_fields, NULL,
   &kCellularSignature
 };
+const OncValueSignature kCellularDeviceSignature = {
+  base::Value::TYPE_DICTIONARY, cellular_device_fields, NULL
+};
 const OncValueSignature kCellularProviderSignature = {
   base::Value::TYPE_DICTIONARY, cellular_provider_fields, NULL
 };
 const OncValueSignature kCellularApnSignature = {
   base::Value::TYPE_DICTIONARY, cellular_apn_fields, NULL
 };
+const OncValueSignature kCellularFoundNetworkSignature = {
+  base::Value::TYPE_DICTIONARY, cellular_found_network_fields, NULL
+};
+const OncValueSignature kSIMLockStatusSignature = {
+  base::Value::TYPE_DICTIONARY, sim_lock_status_fields, NULL
+};
 
 const OncFieldSignature* GetFieldSignature(const OncValueSignature& signature,
                                            const std::string& onc_field_name) {
   if (!signature.fields)
     return NULL;
   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;
   }
@@ skipping 29 matching lines @@
     if (&signature == entry->value_signature &&
         onc_field_name == entry->field_name) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace onc
 }  // namespace chromeos