commit e4efaaf0c56d8a5c6b5a21d2c73dbd933d5589cf
author Alex Vakulenko <avakulenko@chromium.org> Tue Jul 22 08:08:44 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Jul 22 22:03:15 2014 +0000
tree a54eecfaba72ea026f68e1328a89792fb6ddc491
parent fd44869303ab7b495572ed239c8f3cf37b982e78

buffet: GCD command manager to load command .json files at startup

buffet daemon now loads the base command definition file from
/etc/buffet/gcd.json at startup. Also, static device command
defintions are load from .json file from /etc/buffet/commands
(if found).

BUG=chromium:374861
TEST=USE=buffet P2_TEST_FILTER="buffet::*" FEATURES=test emerge-link platform2
TEST=Manually deployed test image and copied /etc/buffet/gcd.json to
     /etc/buffet/commands/gcd.json and verified in /var/log/buffet/*
     that the static command definition is loaded at startup.

Change-Id: I1e6b13cabe8cc2ba1a941cc05cb1d0cfeedda480
Reviewed-on: https://chromium-review.googlesource.com/209311
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>

buffet/main.cc

diff --git a/buffet/main.cc b/buffet/main.cc
index 43ba4ab..cc2fea7 100644
--- a/buffet/main.cc
+++ b/buffet/main.cc
@@ -16,6 +16,7 @@
 #include <sysexits.h>
 
 #include "buffet/async_event_sequencer.h"
+#include "buffet/commands/command_manager.h"
 #include "buffet/dbus_constants.h"
 #include "buffet/exported_object_manager.h"
 #include "buffet/manager.h"
@@ -101,6 +102,9 @@
   // Release our handle on the sequencer so that it gets deleted after
   // both callbacks return.
   sequencer = nullptr;
+
+  buffet::CommandManager::Startup();
+
   LOG(INFO) << "Entering mainloop.";
   message_loop->Run();
 }