ONC: Add IPConfigType.

chromeos/network/onc/onc_translator_onc_to_shill.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.
 
 // The implementation of TranslateONCObjectToShill is structured in two parts:
 // - The recursion through the existing ONC hierarchy
 //     see TranslateONCHierarchy
 // - The local translation of an object depending on the associated signature
 //     see LocalTranslator::TranslateFields
 
@@ skipping 239 matching lines @@
                                              &type);
 
   // Set the type except for Ethernet which is set in TranslateEthernet.
   if (type != ::onc::network_type::kEthernet)
     TranslateWithTableAndSet(type, kNetworkTypeTable, shill::kTypeProperty);
 
   // Shill doesn't allow setting the name for non-VPN networks.
   if (type == ::onc::network_type::kVPN)
     CopyFieldFromONCToShill(::onc::network_config::kName, shill::kNameProperty);
 
+  std::string ipconfig_type;
+  onc_object_->GetStringWithoutPathExpansion(
+      ::onc::network_config::kIPConfigType, &ipconfig_type);
+
+  if (ipconfig_type == ::onc::network_config::kIPConfigTypeDHCP) {
+    // Clear the properties of StaticIPConfig.
+    scoped_ptr<base::DictionaryValue> static_ipconfig(
+        new base::DictionaryValue);
+    static_ipconfig->SetWithoutPathExpansion(shill::kAddressProperty,
+                                             base::Value::CreateNullValue());
+    static_ipconfig->SetWithoutPathExpansion(shill::kGatewayProperty,
+                                             base::Value::CreateNullValue());
+    static_ipconfig->SetWithoutPathExpansion(shill::kPrefixlenProperty,
+                                             base::Value::CreateNullValue());
+    shill_dictionary_->SetWithoutPathExpansion(shill::kStaticIPConfigProperty,
+                                               static_ipconfig.release());
+  }
+  // Otherwise, the StaticIPConfig is set and translated.
+
   CopyFieldsAccordingToSignature();
 }
 
 void LocalTranslator::CopyFieldsAccordingToSignature() {
   for (base::DictionaryValue::Iterator it(*onc_object_); !it.IsAtEnd();
        it.Advance()) {
     AddValueAccordingToSignature(it.key(),
                                  make_scoped_ptr(it.value().DeepCopy()));
   }
 }
@@ skipping 104 matching lines @@
     const OncValueSignature* onc_signature,
     const base::DictionaryValue& onc_object) {
   CHECK(onc_signature != NULL);
   scoped_ptr<base::DictionaryValue> shill_dictionary(new base::DictionaryValue);
   TranslateONCHierarchy(*onc_signature, onc_object, shill_dictionary.get());
   return shill_dictionary.Pass();
 }
 
 }  // namespace onc
 }  // namespace chromeos