Change chip-tool to put its platform KVS in its storage directory.

examples/chip-tool/commands/common/Commands.cpp

@@ -28,6 +28,7 @@
 #include <lib/support/Base64.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CodeUtils.h>
+#include <platform/KeyValueStoreManager.h>
 
 #include "../clusters/JsonParser.h"
 
@@ -41,6 +42,35 @@ constexpr const char * kJsonCommandKey              = "command";
 constexpr const char * kJsonCommandSpecifierKey     = "command_specifier";
 constexpr const char * kJsonArgumentsKey            = "arguments";
 
+template <typename T>
+struct HasInitWithString
+{
+    template <typename U>
+    static constexpr auto check(U *) -> typename std::is_same<decltype(std::declval<U>().Init("")), CHIP_ERROR>::type;
+
+    template <typename>
+    static constexpr std::false_type check(...);
+
+    typedef decltype(check<std::remove_reference_t<T>>(nullptr)) type;
+
+public:
+    static constexpr bool value = type::value;
+};
+
+// Template so we can do conditional enabling
+template <typename T, std::enable_if_t<HasInitWithString<T>::value, int> = 0>
+static void UseStorageDirectory(T & storageManagerImpl, const char * storageDirectory)
+{
+#if !CHIP_DISABLE_PLATFORM_KVS
+    std::string platformKVS = std::string(storageDirectory) + "/chip_tool_kvs";
+    storageManagerImpl.Init(platformKVS.c_str());
+#endif // !CHIP_DISABLE_PLATFORM_KVS
+}
+
+template <typename T, std::enable_if_t<!HasInitWithString<T>::value, int> = 0>
+static void UseStorageDirectory(T & storageManagerImpl, const char * storageDirectory)
+{}
+
 bool GetArgumentsFromJson(Command * command, Json::Value & value, bool optional, std::vector<std::string> & outArgs)
 {
     auto memberNames = value.getMemberNames();
@@ -290,6 +320,8 @@ CHIP_ERROR Commands::RunCommand(int argc, char ** argv, bool interactive,
     }
 
     chip::Logging::SetLogFilter(mStorage.GetLoggingLevel());
+
+    UseStorageDirectory(chip::DeviceLayer::PersistedStorage::KeyValueStoreMgrImpl(), mStorage.GetDirectory());
 #endif // CONFIG_USE_LOCAL_STORAGE
 
     return command->Run();

src/controller/ExamplePersistentStorage.cpp

@@ -39,7 +39,7 @@ constexpr const char kLocalNodeIdKey[]      = "LocalNodeId";
 constexpr const char kCommissionerCATsKey[] = "CommissionerCATs";
 constexpr LogCategory kDefaultLoggingLevel  = kLogCategory_Automation;
 
-std::string GetFilename(const char * directory, const char * name)
+const char * GetUsedDirectory(const char * directory)
 {
     const char * dir = directory;
 
@@ -53,6 +53,13 @@ std::string GetFilename(const char * directory, const char * name)
         dir = "/tmp";
     }
 
+    return dir;
+}
+
+std::string GetFilename(const char * directory, const char * name)
+{
+    const char * dir = GetUsedDirectory(directory);
+
     if (name == nullptr)
     {
         return std::string(dir) + "/chip_tool_config.ini";
@@ -182,6 +189,11 @@ CHIP_ERROR PersistentStorage::SyncClearAll()
     return CommitConfig(mDirectory, mName);
 }
 
+const char * PersistentStorage::GetDirectory() const
+{
+    return GetUsedDirectory(mDirectory);
+}
+
 CHIP_ERROR PersistentStorage::CommitConfig(const char * directory, const char * name)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;

src/controller/ExamplePersistentStorage.h

@@ -65,6 +65,9 @@ class PersistentStorage : public chip::PersistentStorageDelegate
     // Clear all of the persistent storage for running session.
     CHIP_ERROR SyncClearAll();
 
+    // Get the directory actually being used for the storage.
+    const char * GetDirectory() const;
+
 private:
     CHIP_ERROR CommitConfig(const char * directory, const char * name);
     inipp::Ini<char> mConfig;