This adds Cellular to the Shill to ONC translation.

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"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/values.h"
+#include "chromeos/network/network_state.h"
 #include "chromeos/network/onc/onc_constants.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_translation_tables.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 namespace onc {
 
 namespace {
 
 // Converts |str| to a base::Value of the given |type|. If the conversion fails,
 // returns NULL.
 scoped_ptr<base::Value> ConvertStringToValue(const std::string& str,
                                              base::Value::Type type) {
   base::Value* value;
-  if (type == base::Value::TYPE_STRING)
+  if (type == base::Value::TYPE_STRING) {
     value = base::Value::CreateStringValue(str);
-  else
+  } else {
     value = base::JSONReader::Read(str);
+  }
 
   if (value == NULL || value->GetType() != type) {
     delete value;
     value = NULL;
   }
   return make_scoped_ptr(value);
 }
 
 // This class implements the translation of properties from the given
 // |shill_dictionary| to a new ONC object of signature |onc_signature|. Using
@@ skipping 36 matching lines @@
   const base::DictionaryValue* shill_dictionary_;
   const OncValueSignature* onc_signature_;
   scoped_ptr<base::DictionaryValue> onc_object_;
 
   DISALLOW_COPY_AND_ASSIGN(ShillToONCTranslator);
 };
 
 scoped_ptr<base::DictionaryValue>
 ShillToONCTranslator::CreateTranslatedONCObject() {
   onc_object_.reset(new base::DictionaryValue);
-  if (onc_signature_ == &kNetworkConfigurationSignature)
+  if (onc_signature_ == &kNetworkConfigurationSignature) {
     TranslateNetworkConfiguration();
-  else if (onc_signature_ == &kVPNSignature)
+  } else if (onc_signature_ == &kVPNSignature) {
     TranslateVPN();
-  else if (onc_signature_ == &kOpenVPNSignature)
+  } else if (onc_signature_ == &kOpenVPNSignature) {
     TranslateOpenVPN();
-  else
+  } else {
     CopyPropertiesAccordingToSignature();
+  }
   return onc_object_.Pass();
 }
 
 void ShillToONCTranslator::TranslateOpenVPN() {
   // Shill supports only one RemoteCertKU but ONC requires a list. If existing,
   // wraps the value into a list.
   std::string certKU;
   if (shill_dictionary_->GetStringWithoutPathExpansion(
           flimflam::kOpenVPNRemoteCertKUProperty, &certKU)) {
     scoped_ptr<base::ListValue> certKUs(new base::ListValue);
@@ skipping 33 matching lines @@
       LOG(ERROR) << "Shill property '" << field_signature->shill_property_name
                  << "' has value '" << shill_value
                  << "', but expected a string";
     }
     onc_object_->SetWithoutPathExpansion(onc_field_name, translated.release());
   }
 }
 
 void ShillToONCTranslator::TranslateVPN() {
   TranslateWithTableAndSet(flimflam::kProviderTypeProperty, kVPNTypeTable,
-                           kType);
+                           vpn::kType);
   CopyPropertiesAccordingToSignature();
 
   std::string vpn_type;
-  if (onc_object_->GetStringWithoutPathExpansion(kType, &vpn_type)) {
+  if (onc_object_->GetStringWithoutPathExpansion(vpn::kType,
+                                                 &vpn_type)) {
     if (vpn_type == vpn::kTypeL2TP_IPsec) {
       TranslateAndAddNestedObject(vpn::kIPsec);
       TranslateAndAddNestedObject(vpn::kL2TP);
     } else {
       TranslateAndAddNestedObject(vpn_type);
     }
   }
 }
 
 void ShillToONCTranslator::TranslateAndAddNestedObject(
     const std::string& onc_field_name) {
   const OncFieldSignature* field_signature =
       GetFieldSignature(*onc_signature_, onc_field_name);
   ShillToONCTranslator nested_translator(*shill_dictionary_,
                                          *field_signature->value_signature);
   scoped_ptr<base::DictionaryValue> nested_object =
       nested_translator.CreateTranslatedONCObject();
   onc_object_->SetWithoutPathExpansion(onc_field_name, nested_object.release());
 }
 
 void ShillToONCTranslator::TranslateNetworkConfiguration() {
-  TranslateWithTableAndSet(flimflam::kTypeProperty, kNetworkTypeTable, kType);
+  TranslateWithTableAndSet(flimflam::kTypeProperty, kNetworkTypeTable,
+                           network_config::kType);
   CopyPropertiesAccordingToSignature();
 
   std::string network_type;
-  if (onc_object_->GetStringWithoutPathExpansion(kType, &network_type))
+  if (onc_object_->GetStringWithoutPathExpansion(network_config::kType,
+                                                 &network_type))
     TranslateAndAddNestedObject(network_type);
 
-  if (network_type == kVPN) {
-    std::string name;
-    shill_dictionary_->GetStringWithoutPathExpansion(flimflam::kNameProperty,
-                                                     &name);
-    onc_object_->SetStringWithoutPathExpansion(kName, name);
+  // Since Name is a read only field in Shill unless it's a VPN, it is copied
+  // here, but not when going the other direction (if it's not a VPN).
+  std::string name;
+  shill_dictionary_->GetStringWithoutPathExpansion(flimflam::kNameProperty,
+                                                   &name);
+  onc_object_->SetStringWithoutPathExpansion(network_config::kName, name);
+
+  std::string state;
+  if (shill_dictionary_->GetString(flimflam::kStateProperty, &state)) {

[pneubeck (no reviews), 2013/01/21 08:32:18]

GetStringWithoutPathExpansion (I know that it's ugly :-/ )

[Greg Spencer (Chromium), 2013/01/22 19:10:54]

Done.

+    std::string onc_state = status::kNotConnected;
+    if (NetworkState::StateIsConnected(state)) {
+      onc_state = status::kConnected;
+    } else if (NetworkState::StateIsConnecting(state)) {
+      onc_state = status::kConnecting;
+    }
+    onc_object_->SetString(network_config::kState, onc_state);
   }
 }
 
 void ShillToONCTranslator::CopyPropertiesAccordingToSignature() {
   for (const OncFieldSignature* field_signature = onc_signature_->fields;
        field_signature->onc_field_name != NULL; ++field_signature) {
     const base::Value* shill_value;
     if (field_signature->shill_property_name == NULL ||
         !shill_dictionary_->GetWithoutPathExpansion(
             field_signature->shill_property_name, &shill_value)) {
       continue;
     }
     onc_object_->SetWithoutPathExpansion(
         field_signature->onc_field_name, shill_value->DeepCopy());
   }
 }
 
 void ShillToONCTranslator::TranslateWithTableAndSet(
     const std::string& shill_property_name,
     const StringTranslationEntry table[],
     const std::string& onc_field_name) {
   std::string shill_value;
   if (!shill_dictionary_->GetStringWithoutPathExpansion(shill_property_name,
                                                         &shill_value)) {
     return;
   }
-
-  for (int i = 0; table[i].onc_value != NULL; ++i) {
-    if (shill_value != table[i].shill_value)
-      continue;
-    onc_object_->SetStringWithoutPathExpansion(onc_field_name,
-                                               table[i].onc_value);
+  std::string onc_value;
+  if (TranslateStringToONC(table, shill_value, &onc_value)) {
+    onc_object_->SetStringWithoutPathExpansion(onc_field_name, onc_value);
     return;
   }
   LOG(ERROR) << "Shill property '" << shill_property_name << "' with value '"
              << shill_value << "' couldn't be translated to ONC";
 }
 
 }  // namespace
 
 scoped_ptr<base::DictionaryValue> TranslateShillServiceToONCPart(
     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