commit 3c3f6a1dcc0533545f7efb5ffed5a3edc089f240
author Chris Masone <cmasone@chromium.org> Fri Jul 01 10:01:41 2011 -0700
committer Chris Masone <cmasone@chromium.org> Fri Jul 01 13:46:36 2011 -0700
tree 6bcd461022c21ceaf745a84f16c7d6d1fc03b912
parent c6c6c13e2543bd3ff5beae067b0320647fe1e141

[shill] Add a few more derived properties of the Manager class

Add properties like Devices, Services -- properties that return object
paths and must be calculated on the fly.

BUG=chromium-os:16343
TEST=unit tests

Change-Id: I4d7e478c2cc574a7006600a1bbcfe9b867d9cb34
Reviewed-on: http://gerrit.chromium.org/gerrit/3555
Reviewed-by: Chris Masone <cmasone@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>

manager.cc

diff --git a/manager.cc b/manager.cc
index 82a799b..b9ba72a 100644
--- a/manager.cc
+++ b/manager.cc
@@ -57,12 +57,19 @@
                         &Manager::CalculateState,
                         NULL);
 
+  RegisterDerivedStrings(flimflam::kDevicesProperty,
+                         &Manager::EnumerateDevices,
+                         NULL);
+  RegisterDerivedStrings(flimflam::kServicesProperty,
+                         &Manager::EnumerateAvailableServices,
+                         NULL);
+  RegisterDerivedStrings(flimflam::kServiceWatchListProperty,
+                         &Manager::EnumerateWatchedServices,
+                         NULL);
+
   // TODO(cmasone): Add support for R/O properties that return DBus object paths
   // known_properties_.push_back(flimflam::kActiveProfileProperty);
   // known_properties_.push_back(flimflam::kProfilesProperty);
-  // known_properties_.push_back(flimflam::kDevicesProperty);
-  // known_properties_.push_back(flimflam::kServicesProperty);
-  // known_properties_.push_back(flimflam::kServiceWatchListProperty);
 
   VLOG(2) << "Manager initialized.";
 }
@@ -197,4 +204,31 @@
   return vector<string>();
 }
 
+vector<string> Manager::EnumerateDevices() {
+  vector<string> device_rpc_ids;
+  for (vector<DeviceRefPtr>::const_iterator it = devices_.begin();
+       it != devices_.end();
+       ++it) {
+    device_rpc_ids.push_back((*it)->GetRpcIdentifier());
+  }
+  return device_rpc_ids;
+}
+
+vector<string> Manager::EnumerateAvailableServices() {
+  // TODO(cmasone): This should, instead, be returned by calling into the
+  // currently active profile.
+  vector<string> service_rpc_ids;
+  for (vector<ServiceRefPtr>::const_iterator it = services_.begin();
+       it != services_.end();
+       ++it) {
+    service_rpc_ids.push_back((*it)->GetRpcIdentifier());
+  }
+  return service_rpc_ids;
+}
+
+vector<string> Manager::EnumerateWatchedServices() {
+  // TODO(cmasone): Implement this for real by querying the active profile.
+  return EnumerateAvailableServices();
+}
+
 }  // namespace shill