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

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

diff --git a/src/vpp-api/vom/arp_proxy_binding.cpp b/src/vpp-api/vom/arp_proxy_binding.cpp
index 77b1bfa..73d3d84 100644 (file)
--- a/src/vpp-api/vom/arp_proxy_binding.cpp
+++ b/src/vpp-api/vom/arp_proxy_binding.cpp
@@ -14,14 +14,15 @@
  */
 
 #include "vom/arp_proxy_binding.hpp"
-#include "vom/cmd.hpp"
+#include "vom/arp_proxy_binding_cmds.hpp"
+#include "vom/singular_db_funcs.hpp"
 
 namespace VOM {
 
 /**
- * A DB of all LLDP configs
+ * A DB of all ARP proxy bindings configs
  */
-singular_db<interface::key_type, arp_proxy_binding> arp_proxy_binding::m_db;
+singular_db<interface::key_t, arp_proxy_binding> arp_proxy_binding::m_db;
 
 arp_proxy_binding::event_handler arp_proxy_binding::m_evh;
 
@@ -52,7 +53,8 @@ void
 arp_proxy_binding::sweep()
 {
   if (m_binding) {
-    HW::enqueue(new unbind_cmd(m_binding, m_itf->handle()));
+    HW::enqueue(
+      new arp_proxy_binding_cmds::unbind_cmd(m_binding, m_itf->handle()));
   }
   HW::write();
 }
@@ -60,14 +62,15 @@ arp_proxy_binding::sweep()
 void
 arp_proxy_binding::dump(std::ostream& os)
 {
-  m_db.dump(os);
+  db_dump(m_db, os);
 }
 
 void
 arp_proxy_binding::replay()
 {
   if (m_binding) {
-    HW::enqueue(new bind_cmd(m_binding, m_itf->handle()));
+    HW::enqueue(
+      new arp_proxy_binding_cmds::bind_cmd(m_binding, m_itf->handle()));
   }
 }
 
@@ -87,7 +90,8 @@ arp_proxy_binding::update(const arp_proxy_binding& desired)
  * the desired state is always that the interface should be created
  */
   if (!m_binding) {
-    HW::enqueue(new bind_cmd(m_binding, m_itf->handle()));
+    HW::enqueue(
+      new arp_proxy_binding_cmds::bind_cmd(m_binding, m_itf->handle()));
   }
 }
 
@@ -106,7 +110,8 @@ arp_proxy_binding::singular() const
 arp_proxy_binding::event_handler::event_handler()
 {
   OM::register_listener(this);
-  inspect::register_handler({ "arp-proxy" }, "ARP proxy bindings", this);
+  inspect::register_handler({ "arp-proxy-binding" }, "ARP proxy bindings",
+                            this);
 }
 
 void
@@ -130,7 +135,7 @@ arp_proxy_binding::event_handler::order() const
 void
 arp_proxy_binding::event_handler::show(std::ostream& os)
 {
-  m_db.dump(os);
+  db_dump(m_db, os);
 }
 }
 /*