Use setProperties for IP Config.

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 124 matching lines @@
   if (authentication == ::onc::ethernet::k8021X)
     shill_type = shill::kTypeEthernetEap;
   shill_dictionary_->SetStringWithoutPathExpansion(shill::kTypeProperty,
                                                    shill_type);
 
   CopyFieldsAccordingToSignature();
 }
 
 
 void LocalTranslator::TranslateStaticIPConfig() {
-  const base::ListValue* onc_nameservers = NULL;
-  if (onc_object_->GetListWithoutPathExpansion(::onc::ipconfig::kNameServers,
-                                               &onc_nameservers)) {
-    std::vector<std::string> onc_nameservers_vector;
-    ConvertListValueToStringVector(*onc_nameservers, &onc_nameservers_vector);
-    std::string shill_nameservers = JoinString(onc_nameservers_vector, ',');
-    shill_dictionary_->SetStringWithoutPathExpansion(
-        shill::kStaticIPNameServersProperty, shill_nameservers);
+  const base::ListValue* onc_nameservers_list = NULL;
+  onc_object_->GetListWithoutPathExpansion(::onc::ipconfig::kNameServers,
+                                           &onc_nameservers_list);
+  if (onc_nameservers_list) {
+    if (!onc_nameservers_list->empty()) {
+      std::vector<std::string> onc_nameservers_vector;
+      ConvertListValueToStringVector(*onc_nameservers_list,
+                                     &onc_nameservers_vector);
+      std::string shill_nameservers = JoinString(onc_nameservers_vector, ',');
+      shill_dictionary_->SetStringWithoutPathExpansion(
+          shill::kStaticIPNameServersProperty, shill_nameservers);
+    } else {
+      // Empty NameServers entry clears the value.
+      shill_dictionary_->SetWithoutPathExpansion(
+          shill::kStaticIPNameServersProperty, base::Value::CreateNullValue());
+    }
   }
 
   CopyFieldsAccordingToSignature();
+
+  // An empty IP Address string indicates 'automatic' configuration; clear all
+  // Static IP config properties in Shill.
+  std::string address_value;
+  if (onc_object_->GetStringWithoutPathExpansion(::onc::ipconfig::kIPAddress,
+                                                 &address_value) &&
+      address_value.empty()) {
+    shill_dictionary_->SetWithoutPathExpansion(shill::kStaticIPAddressProperty,
+                                               base::Value::CreateNullValue());
+    shill_dictionary_->SetWithoutPathExpansion(shill::kStaticIPGatewayProperty,
+                                               base::Value::CreateNullValue());
+    shill_dictionary_->SetWithoutPathExpansion(
+        shill::kStaticIPPrefixlenProperty, base::Value::CreateNullValue());
+  }
 }
 
 void LocalTranslator::TranslateOpenVPN() {
   // SaveCredentials needs special handling when translating from Shill -> ONC
   // so handle it explicitly here.
   CopyFieldFromONCToShill(::onc::vpn::kSaveCredentials,
                           shill::kSaveCredentialsProperty);
 
   std::string user_auth_type;
   onc_object_->GetStringWithoutPathExpansion(
@@ skipping 236 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