Provide IPConfigs in networkingPrivate.GetProperties

chromeos/network/onc/onc_translator_shill_to_onc.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_translator.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/json/json_reader.h"
@@ skipping 301 matching lines @@
     TranslateAndAddListOfObjects(::onc::network_config::kIPConfigs,
                                  *shill_ipconfigs);
   }
 }
 
 void ShillToONCTranslator::TranslateIPConfig() {
   CopyPropertiesAccordingToSignature();
   std::string shill_ip_method;
   shill_dictionary_->GetStringWithoutPathExpansion(shill::kMethodProperty,
                                                    &shill_ip_method);
-  if (shill_ip_method != shill::kTypeIPv4 &&
-      shill_ip_method != shill::kTypeIPv6) {
-    LOG(ERROR) << "Unhandled IPConfig Method value " << shill_ip_method;
-    return;
-  }
+  std::string type;
+  if (shill_ip_method == shill::kTypeIPv4)

[pneubeck (no reviews), 2014/05/02 09:57:43]

Ok, I think we have a mismatch of the properties' semantics here:

onc::ipconfig::Type means "What kind of ip address is this: IPv4 or IPv6".

shill::kMethodProperty means "The method by which Layer 3 state is managed."

If you really need the latter information in the UI, then we have to find
another way to communicate it than the onc::ipconfig::Type field.

[stevenjb, 2014/05/02 17:22:34]

Hm, I see, OK. We have to support multiple "IPv6" entries anyway, so translating
dhcp -> kIPv4 seems like it would be fine.

+    type == ::onc::ipconfig::kIPv4;
+  else if (shill_ip_method == shill::kTypeIPv6)
+    type = ::onc::ipconfig::kIPv6;
+  else if (shill_ip_method == shill::kTypeDHCP)
+    type = ::onc::ipconfig::kDHCPv4;
+  else if (shill_ip_method == shill::kTypeDHCP6)
+    type = ::onc::ipconfig::kDHCPv6;
+  else
+    return;  // Ignore unhandled IPConfig types, e.g. bootp, zeroconf, ppp
 
-  std::string type = ::onc::ipconfig::kIPv4;
-  if (shill_ip_method == shill::kTypeIPv6)
-    type = ::onc::ipconfig::kIPv6;
   onc_object_->SetStringWithoutPathExpansion(::onc::ipconfig::kType, type);
 }
 
 void ShillToONCTranslator::TranslateAndAddNestedObject(
     const std::string& onc_field_name) {
   TranslateAndAddNestedObject(onc_field_name, *shill_dictionary_);
 }
 
 void ShillToONCTranslator::TranslateAndAddNestedObject(
     const std::string& onc_field_name,
@@ skipping 110 matching lines @@
     const base::DictionaryValue& shill_dictionary,
     const OncValueSignature* onc_signature) {
   CHECK(onc_signature != NULL);
 
   ShillToONCTranslator translator(shill_dictionary, *onc_signature);
   return translator.CreateTranslatedONCObject();
 }
 
 }  // namespace onc
 }  // namespace chromeos