ONC: Add IPConfigType.

chromeos/network/onc/onc_normalizer.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_normalizer.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/values.h"
@@ skipping 158 matching lines @@
   std::string type;
   network->GetStringWithoutPathExpansion(::onc::network_config::kType, &type);
   RemoveEntryUnless(network,
                     ::onc::network_config::kEthernet,
                     type == ::onc::network_type::kEthernet);
   RemoveEntryUnless(
       network, ::onc::network_config::kVPN, type == ::onc::network_type::kVPN);
   RemoveEntryUnless(network,
                     ::onc::network_config::kWiFi,
                     type == ::onc::network_type::kWiFi);
+
+  std::string ipconfig_type;
+  network->GetStringWithoutPathExpansion(::onc::network_config::kIPConfigType,
+                                         &ipconfig_type);
+  RemoveEntryUnless(network,
+                    ::onc::network_config::kStaticIPConfig,

[pneubeck (no reviews), 2014/12/04 18:47:04]

this line should remove a 'irrelevant' StaticIPConfig in every flow that goes
through MNCH before we sent a configuration to Shill.

[stevenjb, 2014/12/04 18:54:44]

Then I'm confused why the translation of ethernet.onc doesn't fail since it
doesn't specify IPConfigType?

[stevenjb, 2014/12/05 01:11:47]

I just realized that this is potentially confusing if a configuration only
specifies specific NameServers, e.g.:

StaticIPConfig: {
  NameServers = [ "8.8.4.4" ]
}

In this case, IPConfigType will need to be 'Static', even though the IPAddress
is not set (which will cause Shill to use DHCP for the IP address). This seems
OK, and works fine for the Settings code, but we might want to make that clear
in the spec.

+                    type == ::onc::network_config::kIPConfigTypeStatic);
 }
 
 void Normalizer::NormalizeOpenVPN(base::DictionaryValue* openvpn) {
   std::string clientcert_type;
   openvpn->GetStringWithoutPathExpansion(::onc::client_cert::kClientCertType,
                                          &clientcert_type);
   RemoveEntryUnless(openvpn,
                     ::onc::client_cert::kClientCertPattern,
                     clientcert_type == ::onc::client_cert::kPattern);
   RemoveEntryUnless(openvpn,
@@ skipping 40 matching lines @@
 
   std::string security;
   wifi->GetStringWithoutPathExpansion(::onc::wifi::kSecurity, &security);
   RemoveEntryUnless(wifi, kEAP, security == kWEP_8021X || security == kWPA_EAP);
   RemoveEntryUnless(wifi, kPassphrase,
                     security == kWEP_PSK || security == kWPA_PSK);
 }
 
 }  // namespace onc
 }  // namespace chromeos