Use Managed properties for Preferred and Provider.

chromeos/network/onc/onc_translator_shill_to_onc.cc

Index: chromeos/network/onc/onc_translator_shill_to_onc.cc
diff --git a/chromeos/network/onc/onc_translator_shill_to_onc.cc b/chromeos/network/onc/onc_translator_shill_to_onc.cc
index 19e7eff0b853eafc35ca31e6530a9863b60a5dad..df76dd4b597ad51d7b4c562cd33a9302c27f3ffe 100644
--- a/chromeos/network/onc/onc_translator_shill_to_onc.cc
+++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc
@@ -89,6 +89,12 @@ class ShillToONCTranslator {
   // |onc_field_name|.
   void TranslateAndAddNestedObject(const std::string& onc_field_name);
 
+  // Sets |onc_field_name| in dictionary |onc_dictionary_name| in |onc_object_|
+  // to |value| if the dictionary exists.
+  void SetNestedOncValue(const std::string& onc_dictionary_name,
+                         const std::string& onc_field_name,
+                         const base::Value& value);
+
   // Translates a list of nested objects and adds the list to |onc_object_| at
   // |onc_field_name|. If there are errors while parsing individual objects or
   // if the resulting list contains no entries, the result will not be added to
@@ -117,6 +123,9 @@ class ShillToONCTranslator {
                                 const StringTranslationEntry table[],
                                 const std::string& onc_field_name);
 
+  // Returns the name provided in |shill_dictionary_| for debugging.

[pneubeck (no reviews), 2014/08/20 19:49:36]

nit: 'name' -> 'name of the Shill Service'

[stevenjb, 2014/08/20 20:40:04]

Done.

+  std::string GetName();
+
   const base::DictionaryValue* shill_dictionary_;
   const OncValueSignature* onc_signature_;
   const FieldTranslationEntry* field_translation_table_;
@@ -182,8 +191,7 @@ void ShillToONCTranslator::TranslateOpenVPN() {
   for (const OncFieldSignature* field_signature = onc_signature_->fields;
        field_signature->onc_field_name != NULL; ++field_signature) {
     const std::string& onc_field_name = field_signature->onc_field_name;
-    if (onc_field_name == ::onc::vpn::kSaveCredentials ||
-        onc_field_name == ::onc::openvpn::kRemoteCertKU ||
+    if (onc_field_name == ::onc::openvpn::kRemoteCertKU ||
         onc_field_name == ::onc::openvpn::kServerCAPEMs) {
       CopyProperty(field_signature);
       continue;
@@ -213,7 +221,8 @@ void ShillToONCTranslator::TranslateOpenVPN() {
         LOG(ERROR) << "Shill property '" << shill_property_name
                    << "' with value " << *shill_value
                    << " couldn't be converted to base::Value::Type "
-                   << field_signature->value_signature->onc_type;
+                   << field_signature->value_signature->onc_type
+                   << ": " << GetName();
       } else {
         onc_object_->SetWithoutPathExpansion(onc_field_name,
                                              translated.release());
@@ -221,7 +230,7 @@ void ShillToONCTranslator::TranslateOpenVPN() {
     } else {
       LOG(ERROR) << "Shill property '" << shill_property_name
                  << "' has value " << *shill_value
-                 << ", but expected a string";
+                 << ", but expected a string: " << GetName();
     }
   }
 }
@@ -233,19 +242,48 @@ void ShillToONCTranslator::TranslateIPsec() {
 }
 
 void ShillToONCTranslator::TranslateVPN() {
-  TranslateWithTableAndSet(
-      shill::kProviderTypeProperty, kVPNTypeTable, ::onc::vpn::kType);
   CopyPropertiesAccordingToSignature();
 
-  std::string vpn_type;
-  if (onc_object_->GetStringWithoutPathExpansion(::onc::vpn::kType,
-                                                 &vpn_type)) {
-    if (vpn_type == ::onc::vpn::kTypeL2TP_IPsec) {
-      TranslateAndAddNestedObject(::onc::vpn::kIPsec);
-      TranslateAndAddNestedObject(::onc::vpn::kL2TP);
-    } else {
-      TranslateAndAddNestedObject(vpn_type);
-    }
+  // Parse Shill Provider dictionary. Note, this may not exist, e.g. if we are
+  // just translating network state in network_util::TranslateNetworkStateToONC.
+  const base::DictionaryValue* provider = NULL;
+  if (!shill_dictionary_->GetDictionaryWithoutPathExpansion(
+          shill::kProviderProperty, &provider)) {
+    return;
+  }
+  std::string shill_provider_type, onc_provider_type;
+  provider->GetStringWithoutPathExpansion(shill::kTypeProperty,
+                                          &shill_provider_type);
+  if (!TranslateStringToONC(
+          kVPNTypeTable, shill_provider_type, &onc_provider_type)) {
+    return;
+  }
+  onc_object_->SetStringWithoutPathExpansion(::onc::vpn::kType,
+                                             onc_provider_type);
+  std::string provider_host;
+  if (provider->GetStringWithoutPathExpansion(shill::kHostProperty,
+                                              &provider_host)) {
+    onc_object_->SetStringWithoutPathExpansion(::onc::vpn::kHost,
+                                               provider_host);
+  }
+
+  // Translate the nested dictionary.
+  std::string provider_type_dictionary;
+  if (onc_provider_type == ::onc::vpn::kTypeL2TP_IPsec) {
+    TranslateAndAddNestedObject(::onc::vpn::kIPsec, *provider);
+    TranslateAndAddNestedObject(::onc::vpn::kL2TP, *provider);
+    provider_type_dictionary = ::onc::vpn::kIPsec;
+  } else {
+    TranslateAndAddNestedObject(onc_provider_type, *provider);
+    provider_type_dictionary = onc_provider_type;
+  }
+
+  bool save_credentials;
+  if (shill_dictionary_->GetBooleanWithoutPathExpansion(
+          shill::kSaveCredentialsProperty, &save_credentials)) {
+    SetNestedOncValue(provider_type_dictionary,
+                      ::onc::vpn::kSaveCredentials,
+                      base::FundamentalValue(save_credentials));
   }
 }
 
@@ -411,6 +449,19 @@ void ShillToONCTranslator::TranslateAndAddNestedObject(
   onc_object_->SetWithoutPathExpansion(onc_field_name, nested_object.release());
 }
 
+void ShillToONCTranslator::SetNestedOncValue(
+    const std::string& onc_dictionary_name,
+    const std::string& onc_field_name,
+    const base::Value& value) {
+  base::DictionaryValue* nested;
+  if (!onc_object_->GetDictionaryWithoutPathExpansion(
+          onc_dictionary_name, &nested)) {
+    nested = new base::DictionaryValue;
+    onc_object_->SetWithoutPathExpansion(onc_dictionary_name, nested);
+  }
+  nested->SetWithoutPathExpansion(onc_field_name, value.DeepCopy());
+}
+
 void ShillToONCTranslator::TranslateAndAddListOfObjects(
     const std::string& onc_field_name,
     const base::ListValue& list) {
@@ -419,7 +470,7 @@ void ShillToONCTranslator::TranslateAndAddListOfObjects(
   if (field_signature->value_signature->onc_type != base::Value::TYPE_LIST) {
     LOG(ERROR) << "ONC Field name: '" << onc_field_name << "' has type '"
                << field_signature->value_signature->onc_type
-               << "', expected: base::Value::TYPE_LIST.";
+               << "', expected: base::Value::TYPE_LIST: " << GetName();
     return;
   }
   DCHECK(field_signature->value_signature->onc_array_entry_signature);
@@ -478,7 +529,8 @@ void ShillToONCTranslator::CopyProperty(
                << " has base::Value::Type " << shill_value->GetType()
                << " but ONC field '" << field_signature->onc_field_name
                << "' requires type "
-               << field_signature->value_signature->onc_type << ".";
+               << field_signature->value_signature->onc_type
+               << ": " << GetName();
     return;
   }
 
@@ -501,7 +553,15 @@ void ShillToONCTranslator::TranslateWithTableAndSet(
     return;
   }
   LOG(ERROR) << "Shill property '" << shill_property_name << "' with value "
-             << shill_value << " couldn't be translated to ONC";
+             << shill_value << " couldn't be translated to ONC: " << GetName();
+}
+
+std::string ShillToONCTranslator::GetName() {
+  if (!shill_dictionary_)

[pneubeck (no reviews), 2014/08/20 19:49:36]

optional nit: DCHECK
(the constructors don't allow for shill_dictionary_ == NULL)

[stevenjb, 2014/08/20 20:40:04]

Done.

+    return "<no dictionary>";
+  std::string name;
+  shill_dictionary_->GetStringWithoutPathExpansion(shill::kNameProperty, &name);
+  return name;
 }
 
 }  // namespace