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

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

diff --git a/src/vpp-api/vom/arp_proxy_config.cpp b/src/vpp-api/vom/arp_proxy_config.cpp
index c07eef3..3973eba 100644 (file)
--- a/src/vpp-api/vom/arp_proxy_config.cpp
+++ b/src/vpp-api/vom/arp_proxy_config.cpp
@@ -14,12 +14,10 @@
  */
 
 #include "vom/arp_proxy_config.hpp"
-#include "vom/cmd.hpp"
+#include "vom/arp_proxy_config_cmds.hpp"
+#include "vom/singular_db_funcs.hpp"
 
 namespace VOM {
-/**
- * A DB of all LLDP configs
- */
 singular_db<arp_proxy_config::key_t, arp_proxy_config> arp_proxy_config::m_db;
 
 arp_proxy_config::event_handler arp_proxy_config::m_evh;
@@ -51,7 +49,8 @@ void
 arp_proxy_config::sweep()
 {
   if (m_config) {
-    HW::enqueue(new unconfig_cmd(m_config, m_low, m_high));
+    HW::enqueue(
+      new arp_proxy_config_cmds::unconfig_cmd(m_config, m_low, m_high));
   }
   HW::write();
 }
@@ -59,14 +58,14 @@ arp_proxy_config::sweep()
 void
 arp_proxy_config::dump(std::ostream& os)
 {
-  m_db.dump(os);
+  db_dump(m_db, os);
 }
 
 void
 arp_proxy_config::replay()
 {
   if (m_config) {
-    HW::enqueue(new config_cmd(m_config, m_low, m_high));
+    HW::enqueue(new arp_proxy_config_cmds::config_cmd(m_config, m_low, m_high));
   }
 }
 
@@ -84,7 +83,7 @@ void
 arp_proxy_config::update(const arp_proxy_config& desired)
 {
   if (!m_config) {
-    HW::enqueue(new config_cmd(m_config, m_low, m_high));
+    HW::enqueue(new arp_proxy_config_cmds::config_cmd(m_config, m_low, m_high));
   }
 }
 
@@ -103,7 +102,8 @@ arp_proxy_config::singular() const
 arp_proxy_config::event_handler::event_handler()
 {
   OM::register_listener(this);
-  inspect::register_handler({ "arp-proxy" }, "ARP Proxy configurations", this);
+  inspect::register_handler({ "arp-proxy-config" }, "ARP Proxy configurations",
+                            this);
 }
 
 void
@@ -127,7 +127,7 @@ arp_proxy_config::event_handler::order() const
 void
 arp_proxy_config::event_handler::show(std::ostream& os)
 {
-  m_db.dump(os);
+  db_dump(m_db, os);
 }
 
 std::ostream&