This adds the setProperties and getState functions to the networking API

chromeos/dbus/shill_manager_client_stub.cc

 // Copyright (c) 2013 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/dbus/shill_manager_client_stub.h"
 
 #include "base/bind.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 140 matching lines @@
   CallNotifyObserversPropertyChanged(flimflam::kServicesProperty, 0);
   CallNotifyObserversPropertyChanged(flimflam::kServiceWatchListProperty, 0);
  }
 
 void ShillManagerClientStub::ConfigureService(
     const base::DictionaryValue& properties,
     const ObjectPathCallback& callback,
     const ErrorCallback& error_callback) {
   if (callback.is_null())
     return;
+
+  // For the purposes of this stub, we're going to assume that the GUID property
+  // is set to the service path because we don't want to re-implement Shill's
+  // property matching magic here.

[stevenjb, 2013/03/07 00:43:22]

nit: move this commend below the next line (closer to the relevant code)

[pneubeck (no reviews), 2013/03/07 13:06:18]

we can do that for now, but it might be necessary to change that... sadly...

[Greg Spencer (Chromium), 2013/03/07 22:01:23]

Yeah, I know.  I hope we don't have to.

+  ShillServiceClient::TestInterface* service_client =
+      DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
+
+  std::string guid;
+  std::string type;
+  if (!properties.GetString(flimflam::kGuidProperty, &guid) ||
+      !properties.GetString(flimflam::kTypeProperty, &type)) {
+    // If the properties aren't filled out completely, then just return an empty
+    // object path.
+    MessageLoop::current()->PostTask(
+        FROM_HERE, base::Bind(callback, dbus::ObjectPath()));
+    return;
+  }
+
+  // Add the service to the service client stub if not already there.
+  service_client->AddService(guid, guid, type, flimflam::kStateIdle, true);
+
+  // Merge the new properties with existing properties, if any.
+  scoped_ptr<base::DictionaryValue> merged_properties;
+  const base::DictionaryValue* existing_properties =
+      service_client->GetServiceProperties(guid);
+  if (existing_properties) {
+      merged_properties.reset(existing_properties->DeepCopy());
+  } else {
+    merged_properties.reset(new base::DictionaryValue);
+  }
+  merged_properties->MergeDictionary(&properties);
+
+  // Now set all the properties.

[stevenjb, 2013/03/07 00:43:22]

Shouldn't we just set all of the new properties instead? I believe that will
have the same result as merging.

[pneubeck (no reviews), 2013/03/07 13:06:18]

+1

[Greg Spencer (Chromium), 2013/03/07 22:01:23]

Well, but (as I understand it) merging is recursive, and setting properties
isn't.  For instance, setting only "Security" in the WiFi property will mean
that all the existing WiFi properties are removed except "Security".  I was
trying to match Shill's behavior as much as possible, and since Shill only
merges when it does ConfigureService, that's what I was doing.

[pneubeck (no reviews), 2013/03/08 08:30:35]

Makes sense. Your solution is better for Dictionary-valued properties. I'd guess
it's also more similar to what Shill does, although I don't know its behavior
with certainty.

On 2013/03/07 22:01:23, Greg Spencer (Chromium) wrote:

+  for (base::DictionaryValue::Iterator iter(*merged_properties);
+       !iter.IsAtEnd(); iter.Advance()) {
+    service_client->SetServiceProperty(guid, iter.key(), iter.value());
+  }
+
   MessageLoop::current()->PostTask(
-      FROM_HERE, base::Bind(callback, dbus::ObjectPath()));
+      FROM_HERE, base::Bind(callback, dbus::ObjectPath(guid)));
 }
 
 void ShillManagerClientStub::GetService(
     const base::DictionaryValue& properties,
     const ObjectPathCallback& callback,
     const ErrorCallback& error_callback) {
   if (callback.is_null())
     return;
   MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(callback, dbus::ObjectPath()));
@@ skipping 282 matching lines @@
       std::string type;
       properties->GetString(flimflam::kTypeProperty, &type);
       if (TechnologyEnabled(type))
         new_service_list->Append((*iter)->DeepCopy());
     }
   }
   return new_service_list;
 }
 
 }  // namespace chromeos