Use Managed properties for Preferred and Provider.

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 25 matching lines @@
     {NULL}};
 
 const FieldTranslationEntry ipsec_fields[] = {
     // Ignored by Shill, not necessary to synchronize.
     // { ::onc::ipsec::kAuthenticationType, shill::kL2tpIpsecAuthenticationType
     // },
     { ::onc::ipsec::kGroup, shill::kL2tpIpsecTunnelGroupProperty},
     // Ignored by Shill, not necessary to synchronize.
     // { ::onc::ipsec::kIKEVersion, shill::kL2tpIpsecIkeVersion },
     { ::onc::ipsec::kPSK, shill::kL2tpIpsecPskProperty},
-    { ::onc::vpn::kSaveCredentials, shill::kSaveCredentialsProperty},
+    // This field is converted during translation, see onc_translator_*.
+    // { ::onc::vpn::kSaveCredentials, shill::kSaveCredentialsProperty},
     { ::onc::ipsec::kServerCAPEMs, shill::kL2tpIpsecCaCertPemProperty},
     {NULL}};
 
 const FieldTranslationEntry xauth_fields[] = {
     { ::onc::vpn::kPassword, shill::kL2tpIpsecXauthPasswordProperty},
     { ::onc::vpn::kUsername, shill::kL2tpIpsecXauthUserProperty},
     {NULL}};
 
 const FieldTranslationEntry l2tp_fields[] = {
     { ::onc::vpn::kPassword, shill::kL2tpIpsecPasswordProperty},
     // We don't synchronize l2tp's SaveCredentials field for now, as Shill
-    // doesn't
-    // support separate settings for ipsec and l2tp.
+    // doesn't support separate settings for ipsec and l2tp.
     // { ::onc::vpn::kSaveCredentials, &kBoolSignature },
     { ::onc::vpn::kUsername, shill::kL2tpIpsecUserProperty}, {NULL}};
 
 const FieldTranslationEntry openvpn_fields[] = {
     { ::onc::openvpn::kAuth, shill::kOpenVPNAuthProperty},
     { ::onc::openvpn::kAuthNoCache, shill::kOpenVPNAuthNoCacheProperty},
     { ::onc::openvpn::kAuthRetry, shill::kOpenVPNAuthRetryProperty},
     { ::onc::openvpn::kCipher, shill::kOpenVPNCipherProperty},
     { ::onc::openvpn::kCompLZO, shill::kOpenVPNCompLZOProperty},
     { ::onc::openvpn::kCompNoAdapt, shill::kOpenVPNCompNoAdaptProperty},
     { ::onc::openvpn::kIgnoreDefaultRoute,
       shill::kOpenVPNIgnoreDefaultRouteProperty},
     { ::onc::openvpn::kKeyDirection, shill::kOpenVPNKeyDirectionProperty},
     { ::onc::openvpn::kNsCertType, shill::kOpenVPNNsCertTypeProperty},
     { ::onc::vpn::kPassword, shill::kOpenVPNPasswordProperty},
     { ::onc::openvpn::kPort, shill::kOpenVPNPortProperty},
     { ::onc::openvpn::kProto, shill::kOpenVPNProtoProperty},
     { ::onc::openvpn::kPushPeerInfo, shill::kOpenVPNPushPeerInfoProperty},
     { ::onc::openvpn::kRemoteCertEKU, shill::kOpenVPNRemoteCertEKUProperty},
     // This field is converted during translation, see onc_translator_*.
     // { ::onc::openvpn::kRemoteCertKU, shill::kOpenVPNRemoteCertKUProperty },
     { ::onc::openvpn::kRemoteCertTLS, shill::kOpenVPNRemoteCertTLSProperty},
     { ::onc::openvpn::kRenegSec, shill::kOpenVPNRenegSecProperty},
-    { ::onc::vpn::kSaveCredentials, shill::kSaveCredentialsProperty},
+    // This field is converted during translation, see onc_translator_*.
+    // { ::onc::vpn::kSaveCredentials, shill::kSaveCredentialsProperty},
     { ::onc::openvpn::kServerCAPEMs, shill::kOpenVPNCaCertPemProperty},
     { ::onc::openvpn::kServerPollTimeout,
       shill::kOpenVPNServerPollTimeoutProperty},
     { ::onc::openvpn::kShaper, shill::kOpenVPNShaperProperty},
     { ::onc::openvpn::kStaticChallenge, shill::kOpenVPNStaticChallengeProperty},
     { ::onc::openvpn::kTLSAuthContents, shill::kOpenVPNTLSAuthContentsProperty},
     { ::onc::openvpn::kTLSRemote, shill::kOpenVPNTLSRemoteProperty},
     { ::onc::vpn::kUsername, shill::kOpenVPNUserProperty},
     { ::onc::openvpn::kVerifyHash, shill::kOpenVPNVerifyHashProperty},
     {NULL}};
 
 const FieldTranslationEntry verify_x509_fields[] = {
     { ::onc::verify_x509::kName, shill::kOpenVPNVerifyX509NameProperty},
     { ::onc::verify_x509::kType, shill::kOpenVPNVerifyX509TypeProperty},
     {NULL}};
 
 const FieldTranslationEntry vpn_fields[] = {
     { ::onc::vpn::kAutoConnect, shill::kAutoConnectProperty},
-    { ::onc::vpn::kHost, shill::kProviderHostProperty},
-    // This field is converted during translation, see onc_translator_*.
+    // These fields are converted during translation, see onc_translator_*.
+    // { ::onc::vpn::kHost, shill::kProviderHostProperty},
     // { ::onc::vpn::kType, shill::kProviderTypeProperty },
     {NULL}};
 
 const FieldTranslationEntry wifi_fields[] = {
     { ::onc::wifi::kAutoConnect, shill::kAutoConnectProperty},
     { ::onc::wifi::kBSSID, shill::kWifiBSsid},
     { ::onc::wifi::kFrequency, shill::kWifiFrequency},
     { ::onc::wifi::kFrequencyList, shill::kWifiFrequencyListProperty},
     { ::onc::wifi::kHiddenSSID, shill::kWifiHiddenSsid},
     { ::onc::wifi::kPassphrase, shill::kPassphraseProperty},
@@ skipping 38 matching lines @@
     { ::onc::cellular::kActivationType, shill::kActivationTypeProperty},
     { ::onc::cellular::kActivationState, shill::kActivationStateProperty},
     { ::onc::cellular::kNetworkTechnology, shill::kNetworkTechnologyProperty},
     { ::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
@@ skipping 193 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