commit 8fbcc642ff0d8fc86cd0171b1fcd3df21e007a17
author Alexander Afanasyev <aa@cs.fiu.edu> Sat Jul 27 16:53:37 2019 -0400
committer Alexander Afanasyev <aa@cs.fiu.edu> Sat May 30 23:55:38 2020 -0400
tree 1cb95c9dd9ca518f5eaf876b76886d8f6531f665
parent 5a80831cc83622b1392b158789ae116e760b3799

model: Remove deprecated "old" content store policies

Use policies and policy interface provided by NFD

Change-Id: I6d4b06225114d1680c9ff3c17b2616298959b0dc

helper/ndn-stack-helper.cpp

diff --git a/helper/ndn-stack-helper.cpp b/helper/ndn-stack-helper.cpp
index 863b191..09f0d8c 100644
--- a/helper/ndn-stack-helper.cpp
+++ b/helper/ndn-stack-helper.cpp
@@ -35,7 +35,6 @@
 #include "model/ndn-net-device-transport.hpp"
 #include "utils/ndn-time.hpp"
 #include "utils/dummy-keychain.hpp"
-#include "model/cs/ndn-content-store.hpp"
 
 #include <limits>
 #include <map>
@@ -64,7 +63,6 @@
   m_csPolicyCreationFunc = m_csPolicies["nfd::cs::lru"];
 
   m_ndnFactory.SetTypeId("ns3::ndn::L3Protocol");
-  m_contentStoreFactory.SetTypeId("ns3::ndn::cs::Lru");
 
   m_netDeviceCallbacks.push_back(
     std::make_pair(PointToPointNetDevice::GetTypeId(),
@@ -114,26 +112,6 @@
 }
 
 void
-StackHelper::SetOldContentStore(const std::string& contentStore, const std::string& attr1,
-                                const std::string& value1, const std::string& attr2,
-                                const std::string& value2, const std::string& attr3,
-                                const std::string& value3, const std::string& attr4,
-                                const std::string& value4)
-{
-  m_maxCsSize = 0;
-
-  m_contentStoreFactory.SetTypeId(contentStore);
-  if (attr1 != "")
-    m_contentStoreFactory.Set(attr1, StringValue(value1));
-  if (attr2 != "")
-    m_contentStoreFactory.Set(attr2, StringValue(value2));
-  if (attr3 != "")
-    m_contentStoreFactory.Set(attr3, StringValue(value3));
-  if (attr4 != "")
-    m_contentStoreFactory.Set(attr4, StringValue(value4));
-}
-
-void
 StackHelper::setCsSize(size_t maxSize)
 {
   m_maxCsSize = maxSize;
@@ -197,14 +175,7 @@
 
   ndn->getConfig().put("tables.cs_max_packets", (m_maxCsSize == 0) ? 1 : m_maxCsSize);
 
-  // Create and aggregate content store if NFD's contest store has been disabled
-  if (m_maxCsSize == 0) {
-    ndn->AggregateObject(m_contentStoreFactory.Create<ContentStore>());
-  }
-  // if NFD's CS is enabled, check if a replacement policy has been specified
-  else {
-    ndn->setCsReplacementPolicy(m_csPolicyCreationFunc);
-  }
+  ndn->setCsReplacementPolicy(m_csPolicyCreationFunc);
 
   // Aggregate L3Protocol on node (must be after setting ndnSIM CS)
   node->AggregateObject(ndn);

helper/ndn-stack-helper.hpp

diff --git a/helper/ndn-stack-helper.hpp b/helper/ndn-stack-helper.hpp
index 1237a15..c2ab6f0 100644
--- a/helper/ndn-stack-helper.hpp
+++ b/helper/ndn-stack-helper.hpp
@@ -85,19 +85,6 @@
   void
   setPolicy(const std::string& policy);
 
-  /**
-   * @brief Set ndnSIM 1.0 content store implementation and its attributes
-   * @param contentStoreClass string, representing class of the content store
-   * @note ndnSIM 1.0 content store implementation have limited support for Interest selectors
-   *       Do not use these implementations if your scenario relies on proper selector processing.
-   */
-  void
-  SetOldContentStore(const std::string& contentStoreClass, const std::string& attr1 = "",
-                  const std::string& value1 = "", const std::string& attr2 = "",
-                  const std::string& value2 = "", const std::string& attr3 = "",
-                  const std::string& value3 = "", const std::string& attr4 = "",
-                  const std::string& value4 = "");
-
   typedef Callback<shared_ptr<Face>, Ptr<Node>, Ptr<L3Protocol>, Ptr<NetDevice>>
     FaceCreateCallback;
 
@@ -266,7 +253,6 @@
 
 private:
   ObjectFactory m_ndnFactory;
-  ObjectFactory m_contentStoreFactory;
 
   bool m_needSetDefaultRoutes;
   size_t m_maxCsSize;