fw: delete deprecated ClientControlStrategy
refs #3783
Change-Id: Ib26ac493a4481dfd26bf01e73d11521f8bb5fde9
diff --git a/daemon/fw/client-control-strategy.cpp b/daemon/fw/client-control-strategy.cpp
deleted file mode 100644
index f381c04..0000000
--- a/daemon/fw/client-control-strategy.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2014-2018, Regents of the University of California,
- * Arizona Board of Regents,
- * Colorado State University,
- * University Pierre & Marie Curie, Sorbonne University,
- * Washington University in St. Louis,
- * Beijing Institute of Technology,
- * The University of Memphis.
- *
- * This file is part of NFD (Named Data Networking Forwarding Daemon).
- * See AUTHORS.md for complete list of NFD authors and contributors.
- *
- * NFD is free software: you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
- *
- * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "client-control-strategy.hpp"
-#include "core/logger.hpp"
-
-namespace nfd {
-namespace fw {
-
-NFD_LOG_INIT(ClientControlStrategy);
-NFD_REGISTER_STRATEGY(ClientControlStrategy);
-
-ClientControlStrategy::ClientControlStrategy(Forwarder& forwarder, const Name& name)
- : BestRouteStrategyBase(forwarder)
-{
- ParsedInstanceName parsed = parseInstanceName(name);
- if (!parsed.parameters.empty()) {
- BOOST_THROW_EXCEPTION(std::invalid_argument("ClientControlStrategy does not accept parameters"));
- }
- if (parsed.version && *parsed.version != getStrategyName()[-1].toVersion()) {
- BOOST_THROW_EXCEPTION(std::invalid_argument(
- "ClientControlStrategy does not support version " + to_string(*parsed.version)));
- }
- this->setInstanceName(makeInstanceName(name, getStrategyName()));
-
- NFD_LOG_WARN("NextHopFaceId field is honored universally and "
- "it's unnecessary to set client-control strategy.");
-}
-
-const Name&
-ClientControlStrategy::getStrategyName()
-{
- static Name strategyName("/localhost/nfd/strategy/client-control/%FD%02");
- return strategyName;
-}
-
-} // namespace fw
-} // namespace nfd
diff --git a/daemon/fw/client-control-strategy.hpp b/daemon/fw/client-control-strategy.hpp
deleted file mode 100644
index 8d627dd..0000000
--- a/daemon/fw/client-control-strategy.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2016, Regents of the University of California,
- * Arizona Board of Regents,
- * Colorado State University,
- * University Pierre & Marie Curie, Sorbonne University,
- * Washington University in St. Louis,
- * Beijing Institute of Technology,
- * The University of Memphis.
- *
- * This file is part of NFD (Named Data Networking Forwarding Daemon).
- * See AUTHORS.md for complete list of NFD authors and contributors.
- *
- * NFD is free software: you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
- *
- * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef NFD_DAEMON_FW_CLIENT_CONTROL_STRATEGY_HPP
-#define NFD_DAEMON_FW_CLIENT_CONTROL_STRATEGY_HPP
-
-#include "best-route-strategy.hpp"
-
-namespace nfd {
-namespace fw {
-
-/** \brief identical to BestRouteStrategy v1, for backwards compatibility
- * \deprecated NextHopFaceId field is honored universally and it's unnecessary to set this strategy
- */
-class ClientControlStrategy : public BestRouteStrategyBase
-{
-public:
- explicit
- ClientControlStrategy(Forwarder& forwarder, const Name& name = getStrategyName());
-
- static const Name&
- getStrategyName();
-};
-
-} // namespace fw
-} // namespace nfd
-
-#endif // NFD_DAEMON_FW_CLIENT_CONTROL_STRATEGY_HPP
diff --git a/tests/daemon/fw/strategy-instantiation.t.cpp b/tests/daemon/fw/strategy-instantiation.t.cpp
index cde39bb..c6fe471 100644
--- a/tests/daemon/fw/strategy-instantiation.t.cpp
+++ b/tests/daemon/fw/strategy-instantiation.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2018, Regents of the University of California,
+ * Copyright (c) 2014-2019, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -32,7 +32,6 @@
#include "fw/asf-strategy.hpp"
#include "fw/best-route-strategy.hpp"
#include "fw/best-route-strategy2.hpp"
-#include "fw/client-control-strategy.hpp"
#include "fw/multicast-strategy.hpp"
#include "fw/ncc-strategy.hpp"
@@ -78,7 +77,6 @@
Test<AsfStrategy, true, 3>,
Test<BestRouteStrategy, false, 1>,
Test<BestRouteStrategy2, false, 5>,
- Test<ClientControlStrategy, false, 2>,
Test<MulticastStrategy, false, 3>,
Test<NccStrategy, false, 1>
>;