Correctly translate Cellular Device properties to ONC

chromeos/network/onc/onc_translation_tables.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_translation_tables.h"
 
 #include <cstddef>
 
 #include "base/logging.h"
 #include "components/onc/onc_constants.h"
@@ skipping 112 matching lines @@
     { ::onc::cellular_apn::kUsername, shill::kApnUsernameProperty},
     { ::onc::cellular_apn::kPassword, shill::kApnPasswordProperty},
     {NULL}};
 
 const FieldTranslationEntry cellular_provider_fields[] = {
     { ::onc::cellular_provider::kCode, shill::kOperatorCodeKey},
     { ::onc::cellular_provider::kCountry, shill::kOperatorCountryKey},
     { ::onc::cellular_provider::kName, shill::kOperatorNameKey},
     {NULL}};
 
+const FieldTranslationEntry sim_lock_status_fields[] = {
+    { ::onc::sim_lock_status::kLockEnabled, shill::kSIMLockEnabledProperty},
+    { ::onc::sim_lock_status::kLockType, shill::kSIMLockTypeProperty},
+    { ::onc::sim_lock_status::kRetriesLeft, shill::kSIMLockRetriesLeftProperty},
+    {NULL}};
+
 // This must only contain Service properties and not Device properties.
-// For Device properties see kCellularDeviceTable.
 const FieldTranslationEntry cellular_fields[] = {
     { ::onc::cellular::kActivateOverNonCellularNetwork,
       shill::kActivateOverNonCellularNetworkProperty},
     { ::onc::cellular::kActivationState, shill::kActivationStateProperty},
     { ::onc::cellular::kNetworkTechnology, shill::kNetworkTechnologyProperty},
     { ::onc::cellular::kRoamingState, shill::kRoamingStateProperty},
     {NULL}};
 
+// This must contain only Shill Device properties and no Service properties.
+const FieldTranslationEntry cellular_device_fields[] = {
+    { ::onc::cellular::kAllowRoaming, shill::kCellularAllowRoamingProperty},
+    { ::onc::cellular::kCarrier, shill::kCarrierProperty},
+    { ::onc::cellular::kESN, shill::kEsnProperty},
+    { ::onc::cellular::kFamily, shill::kTechnologyFamilyProperty},
+    { ::onc::cellular::kFirmwareRevision, shill::kFirmwareRevisionProperty},
+    { ::onc::cellular::kFoundNetworks, shill::kFoundNetworksProperty},
+    { ::onc::cellular::kHardwareRevision, shill::kHardwareRevisionProperty},
+    { ::onc::cellular::kHomeProvider, shill::kHomeProviderProperty},
+    { ::onc::cellular::kICCID, shill::kIccidProperty},
+    { ::onc::cellular::kIMEI, shill::kImeiProperty},
+    { ::onc::cellular::kIMSI, shill::kImsiProperty},
+    { ::onc::cellular::kManufacturer, shill::kManufacturerProperty},
+    { ::onc::cellular::kMDN, shill::kMdnProperty},
+    { ::onc::cellular::kMEID, shill::kMeidProperty},
+    { ::onc::cellular::kMIN, shill::kMinProperty},
+    { ::onc::cellular::kModelID, shill::kModelIDProperty},
+    { ::onc::cellular::kPRLVersion, shill::kPRLVersionProperty},
+    { ::onc::cellular::kProviderRequiresRoaming,
+      shill::kProviderRequiresRoamingProperty},
+    { ::onc::cellular::kSelectedNetwork, shill::kSelectedNetworkProperty},
+    // This field is converted during translation, see onc_translator_*.
+    // { ::onc::cellular::kSIMLockStatus, shill::kSIMLockStatusProperty},
+    { ::onc::cellular::kSIMPresent, shill::kSIMPresentProperty},
+    { ::onc::cellular::kSupportedCarriers, shill::kSupportedCarriersProperty},
+    { ::onc::cellular::kSupportNetworkScan, shill::kSupportNetworkScanProperty},
+    {NULL}};
+
 const FieldTranslationEntry network_fields[] = {
     { ::onc::network_config::kGUID, shill::kGuidProperty},
     { ::onc::network_config::kConnectable, shill::kConnectableProperty },
     { ::onc::network_config::kErrorState, shill::kErrorProperty },
 
     // Shill doesn't allow setting the name for non-VPN networks.
     // Name is conditionally translated, see onc_translator_*.
     // { ::onc::network_config::kName, shill::kNameProperty },
 
     // Type is converted during translation, see onc_translator_*.
@@ skipping 26 matching lines @@
   { &kIPsecSignature, ipsec_fields },
   { &kL2TPSignature, l2tp_fields },
   { &kXAUTHSignature, xauth_fields },
   { &kOpenVPNSignature, openvpn_fields },
   { &kVerifyX509Signature, verify_x509_fields },
   { &kVPNSignature, vpn_fields },
   { &kWiFiSignature, wifi_fields },
   { &kWiFiWithStateSignature, wifi_fields },
   { &kCellularApnSignature, cellular_apn_fields },
   { &kCellularProviderSignature, cellular_provider_fields },
+  { &kSIMLockStatusSignature, sim_lock_status_fields },
   { &kCellularSignature, cellular_fields },
   { &kCellularWithStateSignature, cellular_fields },
+  { &kCellularDeviceSignature, cellular_device_fields },
   { &kNetworkWithStateSignature, network_fields },
   { &kNetworkConfigurationSignature, network_fields },
   { &kIPConfigSignature, ipconfig_fields },
   { NULL }
 };
 
 struct NestedShillDictionaryEntry {
   const OncValueSignature* onc_signature;
   // NULL terminated list of Shill property keys.
   const char* const* shill_property_path;
@@ skipping 47 matching lines @@
     { ::onc::eap::kMD5, shill::kEapPhase2AuthPEAPMD5},
     { ::onc::eap::kMSCHAPv2, shill::kEapPhase2AuthPEAPMSCHAPV2}, {NULL}};
 
 // Translation of the EAP.Inner field in case of EAP.Outer == TTLS
 const StringTranslationEntry kEAP_TTLS_InnerTable[] = {
     { ::onc::eap::kMD5, shill::kEapPhase2AuthTTLSMD5},
     { ::onc::eap::kMSCHAPv2, shill::kEapPhase2AuthTTLSMSCHAPV2},
     { ::onc::eap::kPAP, shill::kEapPhase2AuthTTLSPAP},
     {NULL}};
 
-// This must contain only Shill Device properties and no Service properties.
-// For Service properties see cellular_fields.
-const FieldTranslationEntry kCellularDeviceTable[] = {
-    { ::onc::cellular::kAllowRoaming, shill::kCellularAllowRoamingProperty},
-    { ::onc::cellular::kCarrier, shill::kCarrierProperty},
-    { ::onc::cellular::kESN, shill::kEsnProperty},
-    { ::onc::cellular::kFamily, shill::kTechnologyFamilyProperty},
-    { ::onc::cellular::kFirmwareRevision, shill::kFirmwareRevisionProperty},
-    { ::onc::cellular::kFoundNetworks, shill::kFoundNetworksProperty},
-    { ::onc::cellular::kHardwareRevision, shill::kHardwareRevisionProperty},
-    { ::onc::cellular::kHomeProvider, shill::kHomeProviderProperty},
-    { ::onc::cellular::kICCID, shill::kIccidProperty},
-    { ::onc::cellular::kIMEI, shill::kImeiProperty},
-    { ::onc::cellular::kIMSI, shill::kImsiProperty},
-    { ::onc::cellular::kManufacturer, shill::kManufacturerProperty},
-    { ::onc::cellular::kMDN, shill::kMdnProperty},
-    { ::onc::cellular::kMEID, shill::kMeidProperty},
-    { ::onc::cellular::kMIN, shill::kMinProperty},
-    { ::onc::cellular::kModelID, shill::kModelIDProperty},
-    { ::onc::cellular::kPRLVersion, shill::kPRLVersionProperty},
-    { ::onc::cellular::kProviderRequiresRoaming,
-      shill::kProviderRequiresRoamingProperty},
-    { ::onc::cellular::kSelectedNetwork, shill::kSelectedNetworkProperty},
-    { ::onc::cellular::kSIMLockEnabled, shill::kSIMLockEnabledProperty},
-    { ::onc::cellular::kSIMLockStatus, shill::kSIMLockStatusProperty},
-    { ::onc::cellular::kSIMLockType, shill::kSIMLockTypeProperty},
-    { ::onc::cellular::kSIMPresent, shill::kSIMPresentProperty},
-    { ::onc::cellular::kSupportedCarriers, shill::kSupportedCarriersProperty},
-    { ::onc::cellular::kSupportNetworkScan, shill::kSupportNetworkScanProperty},
-    {NULL}};
-
 const FieldTranslationEntry* GetFieldTranslationTable(
     const OncValueSignature& onc_signature) {
   for (const OncValueTranslationEntry* it = onc_value_translation_table;
        it->onc_signature != NULL; ++it) {
     if (it->onc_signature == &onc_signature)
       return it->field_translation_table;
   }
   return NULL;
 }
 
@@ skipping 47 matching lines @@
       continue;
     *onc_value = table[i].onc_value;
     return true;
   }
   LOG(ERROR) << "Value '" << shill_value << "' cannot be translated to ONC";
   return false;
 }
 
 }  // namespace onc
 }  // namespace chromeos