commit 4f7778e492125ac566efd1302a695044aec8d2b5
author Alex Vakulenko <avakulenko@chromium.org> Thu Sep 11 16:57:24 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Sep 17 01:23:42 2014 +0000
tree 47d95722eebb09cf107c5fc1e430cb19c1686dde
parent 79e6a281e95a1226c90ff90084415df13fd858db

buffet: Add ability to add commands via buffet_client

Implemented "AddCommand" parameter in buffet_client that queues
a GCD command in buffet daemon.

BUG=chromium:412583
TEST=FEATURES=test emerge-link buffet

Change-Id: Ie5a6561efc8675ba5fb234c1151a0f1dbda39e5d
Reviewed-on: https://chromium-review.googlesource.com/217829
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Anton Muhin <antonm@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>

buffet/manager.cc

diff --git a/buffet/manager.cc b/buffet/manager.cc
index 7c3cbd5..3b0c4ef 100644
--- a/buffet/manager.cc
+++ b/buffet/manager.cc
@@ -9,6 +9,7 @@
 
 #include <base/bind.h>
 #include <base/bind_helpers.h>
+#include <base/json/json_reader.h>
 #include <base/json/json_writer.h>
 #include <chromeos/dbus/async_event_sequencer.h>
 #include <chromeos/dbus/exported_object_manager.h>
@@ -17,6 +18,7 @@
 #include <dbus/object_path.h>
 #include <dbus/values_util.h>
 
+#include "buffet/commands/command_instance.h"
 #include "buffet/commands/command_manager.h"
 #include "buffet/dbus_constants.h"
 
@@ -48,6 +50,9 @@
   itf->AddMethodHandler(dbus_constants::kManagerUpdateStateMethod,
                         base::Unretained(this),
                         &Manager::HandleUpdateState);
+  itf->AddMethodHandler(dbus_constants::kManagerAddCommand,
+                        base::Unretained(this),
+                        &Manager::HandleAddCommand);
   itf->AddMethodHandler(dbus_constants::kManagerTestMethod,
                         base::Unretained(this),
                         &Manager::HandleTestMethod);
@@ -118,6 +123,22 @@
   state_.SetValue(json_state_fragment);
 }
 
+void Manager::HandleAddCommand(
+    chromeos::ErrorPtr* error, const std::string& json_command) {
+  std::string error_message;
+  std::unique_ptr<base::Value> value(base::JSONReader::ReadAndReturnError(
+      json_command, base::JSON_PARSE_RFC, nullptr, &error_message));
+  if (!value) {
+    chromeos::Error::AddTo(error, chromeos::errors::json::kDomain,
+                           chromeos::errors::json::kParseError, error_message);
+    return;
+  }
+  auto command_instance = buffet::CommandInstance::FromJson(
+      value.get(), command_manager_->GetCommandDictionary(), error);
+  if (command_instance)
+    command_manager_->AddCommand(std::move(command_instance));
+}
+
 std::string Manager::HandleTestMethod(chromeos::ErrorPtr* error,
                                       const std::string& message) {
   LOG(INFO) << "Received call to test method: " << message;