commit b925cc8f481d21fddd9569fc68861f6e5b6e3eae
author Chris Masone <cmasone@chromium.org> Wed Jun 22 15:39:57 2011 -0700
committer Chris Masone <cmasone@chromium.org> Fri Jun 24 11:26:09 2011 -0700
tree 114efb732f5a56011bed40ec316979f45df1bd37
parent c39f1134c8f1ca15324a7eb2ba9ccc243bc82531

[shill] Add properties to Manager, Device and subclasses. Clean up unit tests

1) Pull much of the properties stuff (the maps, Register*(), Contains()) up
   into PropertyStore, and make it a class, not an interface.
2) Add proper property stuff to Manager and Device.  Move Cellular- and Wifi-
   specific properties to Cellular, CellularService, WiFi, WiFiService as
   appropriate.
3) clean up unit tests.

BUG=chromium-os:16343
TEST=unit tests

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

device.h

diff --git a/device.h b/device.h
index 133b7a5..03d425a 100644
--- a/device.h
+++ b/device.h
@@ -15,7 +15,7 @@
 
 #include "shill/device_config_interface.h"
 #include "shill/ipconfig.h"
-#include "shill/property_store_interface.h"
+#include "shill/property_store.h"
 #include "shill/service.h"
 #include "shill/shill_event.h"
 
@@ -35,7 +35,9 @@
 
 // Device superclass.  Individual network interfaces types will inherit from
 // this class.
-class Device : public DeviceConfigInterface, public PropertyStoreInterface {
+// DeviceConfigInterface is RefCounted, so this class and derived classes
+// are as well.
+class Device : public DeviceConfigInterface, public PropertyStore {
  public:
   enum Technology {
     kEthernet,
@@ -66,8 +68,7 @@
   // Implementation of DeviceConfigInterface
   virtual void ConfigIP() {}
 
-  // Implementation of PropertyStoreInterface
-  virtual bool Contains(const std::string &property);
+  // Implementation of PropertyStore
   virtual bool SetBoolProperty(const std::string& name,
                                bool value,
                                Error *error);
@@ -77,6 +78,9 @@
   virtual bool SetUint16Property(const std::string& name,
                                  uint16 value,
                                  Error *error);
+  virtual bool SetStringProperty(const std::string &name,
+                                 const std::string &value,
+                                 Error *error);
 
   const std::string &link_name() const { return link_name_; }
 
@@ -99,12 +103,24 @@
   // request was successfully sent.
   bool AcquireDHCPConfig();
 
+  void RegisterDerivedString(const std::string &name,
+                             std::string(Device::*get)(void),
+                             bool(Device::*set)(const std::string&));
+
+  // Properties
+  std::string hardware_address_;
+  std::string bgscan_method_;
+  uint16 bgscan_short_interval_;
+  int32 bgscan_signal_threshold_;
+  bool powered_;  // TODO(pstew): Is this what |running_| is for?
+  bool reconnect_;
+  uint16 scan_interval_;
+
   std::vector<ServiceRefPtr> services_;
   int interface_index_;
   bool running_;
   Manager *manager_;
   IPConfigRefPtr ipconfig_;
-  std::vector<std::string> known_properties_;
 
  private:
   friend class DeviceAdaptorInterface;