commit 51d242a2816907d4a36788d97e93129e72269890
author Steve DiBenedetto <dibenede@cs.colostate.edu> Mon Mar 31 13:46:43 2014 -0600
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Mar 31 18:18:47 2014 -0700
tree affd47c6c80a1ccc692c73c38ecda8fd852d93ae
parent 98e29f473165d9a641c4e6b08931d572d0fdc034

mgmt: refactor management modules to use ControlCommand

Change-Id: Icf5e10f2f2d0b95c85fd871e6484c3ed58ed6c46

daemon/mgmt/strategy-choice-manager.cpp

diff --git a/daemon/mgmt/strategy-choice-manager.cpp b/daemon/mgmt/strategy-choice-manager.cpp
index bbedd34..a4c4e38 100644
--- a/daemon/mgmt/strategy-choice-manager.cpp
+++ b/daemon/mgmt/strategy-choice-manager.cpp
@@ -74,7 +74,7 @@
   const Name::Component& parameterComponent = command[COMMAND_PREFIX.size() + 1];
 
   ControlParameters parameters;
-  if (!extractParameters(parameterComponent, parameters) || !parameters.hasName())
+  if (!extractParameters(parameterComponent, parameters))
     {
       sendResponse(command, 400, "Malformed command");
       return;
@@ -95,15 +95,19 @@
       NFD_LOG_INFO("command result: unsupported verb: " << verb);
       setResponse(response, 501, "Unsupported command");
     }
+
   sendResponse(command, response);
 }
 
 void
-StrategyChoiceManager::setStrategy(const ControlParameters& parameters,
+StrategyChoiceManager::setStrategy(ControlParameters& parameters,
                                    ControlResponse& response)
 {
-  if (!parameters.hasStrategy())
+  ndn::nfd::StrategyChoiceSetCommand command;
+
+  if (!validateParameters(command, parameters))
     {
+      NFD_LOG_INFO("strategy-choice result: FAIL reason: malformed");
       setResponse(response, 400, "Malformed command");
       return;
     }
@@ -121,30 +125,41 @@
 
   if (m_strategyChoice.insert(prefix, selectedStrategy))
     {
+      NFD_LOG_INFO("strategy-choice result: SUCCESS");
       setResponse(response, 200, "Success", parameters.wireEncode());
     }
   else
     {
+      NFD_LOG_INFO("strategy-choice result: FAIL reason: not-installed");
       setResponse(response, 405, "Strategy not installed");
     }
 }
 
 void
-StrategyChoiceManager::unsetStrategy(const ControlParameters& parameters,
+StrategyChoiceManager::unsetStrategy(ControlParameters& parameters,
                                      ControlResponse& response)
 {
-  static const Name ROOT_PREFIX;
+  ndn::nfd::StrategyChoiceUnsetCommand command;
 
-  const Name& prefix = parameters.getName();
-  if (prefix == ROOT_PREFIX)
+  if (!validateParameters(command, parameters))
     {
-      NFD_LOG_INFO("strategy-choice result: FAIL reason: unknown-prefix: "
-                   << parameters.getName());
-      setResponse(response, 403, "Cannot unset root prefix strategy");
+      static const Name ROOT_PREFIX;
+      if (parameters.hasName() && parameters.getName() == ROOT_PREFIX)
+        {
+          NFD_LOG_INFO("strategy-choice result: FAIL reason: unset-root");
+          setResponse(response, 403, "Cannot unset root prefix strategy");
+        }
+      else
+        {
+          NFD_LOG_INFO("strategy-choice result: FAIL reason: malformed");
+          setResponse(response, 400, "Malformed command");
+        }
       return;
     }
 
-  m_strategyChoice.erase(prefix);
+  m_strategyChoice.erase(parameters.getName());
+
+  NFD_LOG_INFO("strategy-choice result: SUCCESS");
   setResponse(response, 200, "Success", parameters.wireEncode());
 }