Translate activation/romaing state, restricted pool

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 134 matching lines @@
 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::kActivationType, shill::kActivationTypeProperty},
-    { ::onc::cellular::kActivationState, shill::kActivationStateProperty},
+    // This field is converted during translation, see onc_translator_*.
+    // { ::onc::cellular::kActivationState, shill::kActivationStateProperty},
     { ::onc::cellular::kNetworkTechnology, shill::kNetworkTechnologyProperty},
-    { ::onc::cellular::kRoamingState, shill::kRoamingStateProperty},
+    // This field is converted during translation, see onc_translator_*.
+    // { ::onc::cellular::kRoamingState, shill::kRoamingStateProperty},
     {NULL}};
 
 const FieldTranslationEntry network_fields[] = {
     { ::onc::network_config::kGUID, shill::kGuidProperty},
     { ::onc::network_config::kConnectable, shill::kConnectableProperty },
     { ::onc::network_config::kErrorState, shill::kErrorProperty },
     { ::onc::network_config::kPriority, shill::kPriorityProperty },
 
     // 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_*.
     // { ::onc::network_config::kType, shill::kTypeProperty },
 
     // These fields are converted during translation, see
     // onc_translator_shill_to_onc.cc. They are only converted when going from
     // Shill->ONC, and ignored otherwise.
     // { ::onc::network_config::kConnectionState, shill::kStateProperty },
+    // { ::onc::network_config::kRestrictedConnectivity,
+    //   shill::kStateProperty },
     // { ::onc::network_config::kMacAddress, shill::kAddressProperty },
     {NULL}};
 
 const FieldTranslationEntry ipconfig_fields[] = {
     { ::onc::ipconfig::kIPAddress, shill::kAddressProperty},
     { ::onc::ipconfig::kGateway, shill::kGatewayProperty},
     { ::onc::ipconfig::kRoutingPrefix, shill::kPrefixlenProperty},
     { ::onc::ipconfig::kNameServers, shill::kNameServersProperty},
     // This field is converted during translation, see ShillToONCTranslator::
     // TranslateIPConfig. It is only converted from Shill->ONC.
@@ skipping 101 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}};
 
+const StringTranslationEntry kActivationStateTable[] = {
+    { ::onc::cellular::kActivated, shill::kActivationStateActivated},
+    { ::onc::cellular::kActivating, shill::kActivationStateActivating},
+    { ::onc::cellular::kNotActivated, shill::kActivationStateNotActivated},
+    { ::onc::cellular::kPartiallyActivated,
+      shill::kActivationStatePartiallyActivated},
+    {NULL}};
+
+const StringTranslationEntry kRoamingStateTable[] = {
+    { ::onc::cellular::kHome, shill::kRoamingStateHome},
+    { ::onc::cellular::kRoaming, shill::kRoamingStateRoaming},
+    {NULL}};
+
 // This must contain only Shill Device properties and no Service properties.
 // For Service properties see cellular_fields.
 const FieldTranslationEntry kCellularDeviceTable[] = {
     // This field is converted during translation, see onc_translator_*.
     // { ::onc::cellular::kAPNList, shill::kCellularApnListProperty},
     { ::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},
@@ skipping 80 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