A bit of buffer metadata reshuffling to accommodate flow_id

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

diff --git a/src/vpp-api/vom/acl_binding.cpp b/src/vpp-api/vom/acl_binding.cpp
index 1ebefda..73f015d 100644 (file)
--- a/src/vpp-api/vom/acl_binding.cpp
+++ b/src/vpp-api/vom/acl_binding.cpp
@@ -14,18 +14,26 @@
  */
 
 #include "vom/acl_binding.hpp"
-#include "vom/om.hpp"
+#include "vom/acl_binding_cmds.hpp"
 
 namespace VOM {
 namespace ACL {
+template <>
+l2_binding::event_handler::event_handler()
+{
+  OM::register_listener(this);
+  inspect::register_handler({ "l2-acl-binding" }, "L2 ACL bindings", this);
+}
+
 template <>
 void
 l2_binding::event_handler::handle_populate(const client_db::key_t& key)
 {
   /*
-* dump VPP Bridge domains
-*/
-  std::shared_ptr<l2_binding::dump_cmd> cmd(new l2_binding::dump_cmd());
+   * dump VPP Bridge domains
+   */
+  std::shared_ptr<binding_cmds::l2_dump_cmd> cmd =
+    std::make_shared<binding_cmds::l2_dump_cmd>();
 
   HW::enqueue(cmd);
   HW::write();
@@ -45,11 +53,19 @@ l2_binding::event_handler::handle_populate(const client_db::key_t& key)
   }
 }
 
+template <>
+l3_binding::event_handler::event_handler()
+{
+  OM::register_listener(this);
+  inspect::register_handler({ "l3-acl-binding" }, "L3 ACL bindings", this);
+}
+
 template <>
 void
 l3_binding::event_handler::handle_populate(const client_db::key_t& key)
 {
-  std::shared_ptr<l3_binding::dump_cmd> cmd(new l3_binding::dump_cmd());
+  std::shared_ptr<binding_cmds::l3_dump_cmd> cmd =
+    std::make_shared<binding_cmds::l3_dump_cmd>();
 
   HW::enqueue(cmd);
   HW::write();
@@ -74,11 +90,75 @@ l3_binding::event_handler::handle_populate(const client_db::key_t& key)
     }
   }
 }
+
+template <>
+void
+l3_binding::update(const binding& obj)
+{
+  if (!m_binding) {
+    HW::enqueue(new binding_cmds::l3_bind_cmd(
+      m_binding, m_direction, m_itf->handle(), m_acl->handle()));
+  }
+  HW::write();
+}
+
+template <>
+void
+l3_binding::sweep(void)
+{
+  if (m_binding) {
+    HW::enqueue(new binding_cmds::l3_unbind_cmd(
+      m_binding, m_direction, m_itf->handle(), m_acl->handle()));
+  }
+  HW::write();
+}
+
+template <>
+void
+l3_binding::replay(void)
+{
+  if (m_binding) {
+    HW::enqueue(new binding_cmds::l3_bind_cmd(
+      m_binding, m_direction, m_itf->handle(), m_acl->handle()));
+  }
+}
+
+template <>
+void
+l2_binding::update(const binding& obj)
+{
+  if (!m_binding) {
+    HW::enqueue(new binding_cmds::l2_bind_cmd(
+      m_binding, m_direction, m_itf->handle(), m_acl->handle()));
+  }
+  HW::write();
+}
+
+template <>
+void
+l2_binding::sweep(void)
+{
+  if (m_binding) {
+    HW::enqueue(new binding_cmds::l2_unbind_cmd(
+      m_binding, m_direction, m_itf->handle(), m_acl->handle()));
+  }
+  HW::write();
+}
+
+template <>
+void
+l2_binding::replay(void)
+{
+  if (m_binding) {
+    HW::enqueue(new binding_cmds::l2_bind_cmd(
+      m_binding, m_direction, m_itf->handle(), m_acl->handle()));
+  }
+}
 };
 
 std::ostream&
 operator<<(std::ostream& os,
-           const std::pair<direction_t, interface::key_type>& key)
+           const std::pair<direction_t, interface::key_t>& key)
 {
   os << "[" << key.first.to_string() << " " << key.second << "]";