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>

mock_adaptors.cc

diff --git a/mock_adaptors.cc b/mock_adaptors.cc
index 1bff5ad..61881e5 100644
--- a/mock_adaptors.cc
+++ b/mock_adaptors.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <string>
-
 #include "shill/mock_adaptors.h"
 
+#include <string>
+
 namespace shill {
 
 // static
-const char DeviceMockAdaptor::kRpcId[] = "device-rpc";
+const char DeviceMockAdaptor::kRpcId[] = "/device-rpc/";
 // static
-const char DeviceMockAdaptor::kRpcConnId[] = "device-rpc-conn";
+const char DeviceMockAdaptor::kRpcConnId[] = "/device-rpc-conn/";
 
 DeviceMockAdaptor::DeviceMockAdaptor()
     : rpc_id(kRpcId),
@@ -27,7 +27,7 @@
 }
 
 // static
-const char IPConfigMockAdaptor::kRpcId[] = "ipconfig-rpc";
+const char IPConfigMockAdaptor::kRpcId[] = "/ipconfig-rpc/";
 
 IPConfigMockAdaptor::IPConfigMockAdaptor() : rpc_id(kRpcId) {}
 
@@ -36,7 +36,7 @@
 const std::string &IPConfigMockAdaptor::GetRpcIdentifier() { return rpc_id; }
 
 // static
-const char ManagerMockAdaptor::kRpcId[] = "manager-rpc";
+const char ManagerMockAdaptor::kRpcId[] = "/manager-rpc/";
 
 ManagerMockAdaptor::ManagerMockAdaptor() : rpc_id(kRpcId) {}
 
@@ -45,7 +45,7 @@
 const std::string &ManagerMockAdaptor::GetRpcIdentifier() { return rpc_id; }
 
 // static
-const char ProfileMockAdaptor::kRpcId[] = "profile-rpc";
+const char ProfileMockAdaptor::kRpcId[] = "/profile-rpc/";
 
 ProfileMockAdaptor::ProfileMockAdaptor() : rpc_id(kRpcId) {}
 
@@ -54,7 +54,7 @@
 const std::string &ProfileMockAdaptor::GetRpcIdentifier() { return rpc_id; }
 
 // static
-const char ServiceMockAdaptor::kRpcId[] = "service-rpc";
+const char ServiceMockAdaptor::kRpcId[] = "/service-rpc/";
 
 ServiceMockAdaptor::ServiceMockAdaptor() : rpc_id(kRpcId) {}