Add Shill to ONC translation of IPConfig.

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"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 namespace onc {
 
 // CertificatePattern is converted with function CreateUIData(...) to UIData
 // stored in Shill.
 //
 // Proxy settings are converted to Shill by function
 // ConvertOncProxySettingsToProxyConfig(...).
-//
-// Translation of IPConfig objects is not supported, yet.
 
 namespace {
 
 const FieldTranslationEntry eap_fields[] = {
     { ::onc::eap::kAnonymousIdentity, shill::kEapAnonymousIdentityProperty},
     { ::onc::eap::kIdentity, shill::kEapIdentityProperty},
     // This field is converted during translation, see onc_translator_*.
     // { ::onc::eap::kInner, shill::kEapPhase2AuthProperty },
 
     // This field is converted during translation, see onc_translator_*.
@@ skipping 135 matching lines @@
     { ::onc::network_config::kGUID, shill::kGuidProperty},
     // This field is converted during translation, see onc_translator_*.
     // { ::onc::network_config::kType, shill::kTypeProperty },
 
     // This field is converted during translation, see
     // onc_translator_shill_to_onc.cc. It is only converted when going from
     // Shill->ONC, and ignored otherwise.
     // { ::onc::network_config::kConnectionState, shill::kStateProperty },
     {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},

[stevenjb, 2014/04/23 19:43:42]

We don't need to do this here, but it turns out we are going to need a "Method"
property, which (for Chrome's purposes) can be either "ipv4" or "ipv6".

[pneubeck (no reviews), 2014/04/25 10:07:34]

See changes in onc_translator_shill_to_onc.cc
Just for clarification, Shill calls this property 'Method'.
ONC calls it 'Type'.

+    {NULL}};
+
 struct OncValueTranslationEntry {
   const OncValueSignature* onc_signature;
   const FieldTranslationEntry* field_translation_table;
 };
 
 const OncValueTranslationEntry onc_value_translation_table[] = {
   { &kEAPSignature, eap_fields },
   { &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 },
   { &kCellularSignature, cellular_fields },
   { &kCellularWithStateSignature, cellular_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;
 };
 
 const char* cellular_apn_property_path_entries[] = {
@@ skipping 110 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