commit 34af218abe6a99144ffe01332ce36fbad94f2628
author Chris Masone <cmasone@chromium.org> Mon Aug 22 11:59:36 2011 -0700
committer Chris Masone <cmasone@chromium.org> Mon Aug 22 15:06:46 2011 -0700
tree 945f160f913a90aa85501df623d5b95e62d5126b
parent 3335b3773067671301a8a02a1f9eefd17a3ce607

[shill] Use flimflam-esque storage ids

Devices:
  device_<MAC>

IPConfig:
  ipconfig_<MAC of associated device>_0

Services:
  ethernet_<MAC of associated device>
  wifi_<MAC of associated device>_<SSID>_<mode>_<security>
  cellular_<MAC of associated device>_<Network_name>

BUG=chromium-os:17744
TEST=unit

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

device.cc

diff --git a/device.cc b/device.cc
index 8d7851c..69e6551 100644
--- a/device.cc
+++ b/device.cc
@@ -140,7 +140,7 @@
   string id = GetRpcIdentifier();
   ControlInterface::RpcIdToStorageId(&id);
   size_t needle = id.find('_');
-  LOG_IF(ERROR, needle == string::npos) << "No _ in storage id?!?!";
+  DLOG_IF(ERROR, needle == string::npos) << "No _ in storage id?!?!";
   id.replace(id.begin() + needle + 1, id.end(), hardware_address_);
   return id;
 }
@@ -167,8 +167,15 @@
 bool Device::Save(StoreInterface *storage) {
   const string id = GetStorageIdentifier();
   storage->SetBool(id, kStoragePowered, powered_);
-  if (ipconfig_.get())
-    storage->SetString(id, kStorageIPConfigs, SerializeIPConfigsForStorage());
+  if (ipconfig_.get()) {
+    // The _0 is an index into the list of IPConfigs that this device might
+    // have.  We only have one IPConfig right now, and I hope to never have
+    // to support more, as sleffler indicates that associating IPConfigs
+    // with devices is wrong and due to be changed in flimflam anyhow.
+    string suffix = hardware_address_ + "_0";
+    ipconfig_->Save(storage, suffix);
+    storage->SetString(id, kStorageIPConfigs, SerializeIPConfigs(suffix));
+  }
   return true;
 }
 
@@ -226,10 +233,8 @@
   connection_ = NULL;
 }
 
-string Device::SerializeIPConfigsForStorage() {
-  return StringPrintf("%s:%s",
-                      ipconfig_->GetStorageIdentifier().c_str(),
-                      ipconfig_->type().c_str());
+string Device::SerializeIPConfigs(const string &suffix) {
+  return StringPrintf("%s:%s", suffix.c_str(), ipconfig_->type().c_str());
 }
 
 vector<string> Device::AvailableIPConfigs() {