Fixes for 'make UNATTENDED=yes CC=clang CXX=clang verify'

[vpp.git] / src / vpp-api / vom / route_domain.cpp

diff --git a/src/vpp-api/vom/route_domain.cpp b/src/vpp-api/vom/route_domain.cpp
index c723f9f..b97faf6 100644 (file)
--- a/src/vpp-api/vom/route_domain.cpp
+++ b/src/vpp-api/vom/route_domain.cpp
@@ -16,6 +16,7 @@
 #include "vom/route_domain.hpp"
 #include "vom/cmd.hpp"
 #include "vom/route_domain_cmds.hpp"
+#include "vom/singular_db_funcs.hpp"
 
 namespace VOM {
 
@@ -101,35 +102,16 @@ route_domain::to_string() const
 {
   std::ostringstream s;
   s << "route-domain:["
-    << "table-id:" << m_table_id << " v4:" << m_hw_v4 << " v6:" << m_hw_v6
-    << "]";
+    << "table-id:" << m_table_id << " v4:" << m_hw_v4.to_string()
+    << " v6:" << m_hw_v6.to_string() << "]";
 
   return (s.str());
 }
 
 std::shared_ptr<route_domain>
-route_domain::find(const route_domain& temp)
+route_domain::find(const key_t& k)
 {
-  std::shared_ptr<route_domain> rd;
-
-  auto it = m_db.cbegin();
-
-  while (it != m_db.cend()) {
-    /*
- * The key in the DB is a pair of the interface's name and prefix.
- * If the keys match, save the L3-config
- */
-    auto key = it->first;
-
-    if (temp.table_id() == key) {
-      rd = it->second.lock();
-      break;
-    }
-
-    ++it;
-  }
-
-  return (rd);
+  return (m_db.find(k));
 }
 
 void
@@ -171,7 +153,7 @@ route_domain::singular() const
 void
 route_domain::dump(std::ostream& os)
 {
-  m_db.dump(os);
+  db_dump(m_db, os);
 }
 
 void
@@ -200,7 +182,7 @@ route_domain::event_handler::order() const
 void
 route_domain::event_handler::show(std::ostream& os)
 {
-  m_db.dump(os);
+  db_dump(m_db, os);
 }
 
 }; // namespace VOPM