vxlan: vxlan/vxlan.api API cleanup

[vpp.git] / extras / vom / vom / bridge_domain.cpp

diff --git a/extras/vom/vom/bridge_domain.cpp b/extras/vom/vom/bridge_domain.cpp
index a2cf656..e86fc26 100644 (file)
--- a/extras/vom/vom/bridge_domain.cpp
+++ b/extras/vom/vom/bridge_domain.cpp
@@ -39,6 +39,16 @@ bridge_domain::flood_mode_t::flood_mode_t(int v, const std::string& s)
 {
 }
 
+const bridge_domain::uu_flood_mode_t bridge_domain::uu_flood_mode_t::ON(1,
+                                                                        "on");
+const bridge_domain::uu_flood_mode_t bridge_domain::uu_flood_mode_t::OFF(0,
+                                                                         "off");
+
+bridge_domain::uu_flood_mode_t::uu_flood_mode_t(int v, const std::string& s)
+  : enum_base<bridge_domain::uu_flood_mode_t>(v, s)
+{
+}
+
 const bridge_domain::mac_age_mode_t bridge_domain::mac_age_mode_t::ON(1, "on");
 const bridge_domain::mac_age_mode_t bridge_domain::mac_age_mode_t::OFF(0,
                                                                        "off");
@@ -58,6 +68,16 @@ bridge_domain::arp_term_mode_t::arp_term_mode_t(int v, const std::string& s)
 {
 }
 
+const bridge_domain::arp_ufwd_mode_t bridge_domain::arp_ufwd_mode_t::ON(1,
+                                                                        "on");
+const bridge_domain::arp_ufwd_mode_t bridge_domain::arp_ufwd_mode_t::OFF(0,
+                                                                         "off");
+
+bridge_domain::arp_ufwd_mode_t::arp_ufwd_mode_t(int v, const std::string& s)
+  : enum_base<bridge_domain::arp_ufwd_mode_t>(v, s)
+{
+}
+
 /**
  * A DB of al the interfaces, key on the name
  */
@@ -71,12 +91,16 @@ bridge_domain::event_handler bridge_domain::m_evh;
 bridge_domain::bridge_domain(uint32_t id,
                              const learning_mode_t& lmode,
                              const arp_term_mode_t& amode,
+                             const arp_ufwd_mode_t& aumode,
                              const flood_mode_t& fmode,
+                             const uu_flood_mode_t& uufmode,
                              const mac_age_mode_t& mmode)
   : m_id(id)
   , m_learning_mode(lmode)
   , m_arp_term_mode(amode)
+  , m_arp_ufwd_mode(aumode)
   , m_flood_mode(fmode)
+  , m_uu_flood_mode(uufmode)
   , m_mac_age_mode(mmode)
 {
 }
@@ -85,7 +109,9 @@ bridge_domain::bridge_domain(const bridge_domain& o)
   : m_id(o.m_id)
   , m_learning_mode(o.m_learning_mode)
   , m_arp_term_mode(o.m_arp_term_mode)
+  , m_arp_ufwd_mode(o.m_arp_ufwd_mode)
   , m_flood_mode(o.m_flood_mode)
+  , m_uu_flood_mode(o.m_uu_flood_mode)
   , m_mac_age_mode(o.m_mac_age_mode)
 {
 }
@@ -107,8 +133,10 @@ bridge_domain::operator==(const bridge_domain& b) const
 {
   return ((m_learning_mode == b.m_learning_mode) &&
           (m_flood_mode == b.m_flood_mode) &&
+          (m_uu_flood_mode == b.m_uu_flood_mode) &&
           (m_mac_age_mode == b.m_mac_age_mode) &&
-          (m_arp_term_mode == b.m_arp_term_mode) && id() == b.id());
+          (m_arp_term_mode == b.m_arp_term_mode) &&
+          (m_arp_ufwd_mode == b.m_arp_ufwd_mode) && id() == b.id());
 }
 
 void
@@ -125,7 +153,8 @@ bridge_domain::replay()
 {
   if (rc_t::OK == m_id.rc()) {
     HW::enqueue(new bridge_domain_cmds::create_cmd(
-      m_id, m_learning_mode, m_arp_term_mode, m_flood_mode, m_mac_age_mode));
+      m_id, m_learning_mode, m_arp_term_mode, m_arp_ufwd_mode, m_flood_mode,
+      m_uu_flood_mode, m_mac_age_mode));
   }
 }
 
@@ -161,7 +190,8 @@ bridge_domain::update(const bridge_domain& desired)
    */
   if (rc_t::OK != m_id.rc()) {
     HW::enqueue(new bridge_domain_cmds::create_cmd(
-      m_id, m_learning_mode, m_arp_term_mode, m_flood_mode, m_mac_age_mode));
+      m_id, m_learning_mode, m_arp_term_mode, m_arp_ufwd_mode, m_flood_mode,
+      m_uu_flood_mode, m_mac_age_mode));
   }
 }
 
@@ -198,7 +228,14 @@ bridge_domain::event_handler::handle_populate(const client_db::key_t& key)
   for (auto& record : *cmd) {
     auto& payload = record.get_payload();
 
-    bridge_domain bd(payload.bd_id);
+    bridge_domain bd(
+      payload.bd_id,
+      (payload.learn ? learning_mode_t::ON : learning_mode_t::OFF),
+      (payload.arp_term ? arp_term_mode_t::ON : arp_term_mode_t::OFF),
+      (payload.arp_ufwd ? arp_ufwd_mode_t::ON : arp_ufwd_mode_t::OFF),
+      (payload.flood ? flood_mode_t::ON : flood_mode_t::OFF),
+      (payload.uu_flood ? uu_flood_mode_t::ON : uu_flood_mode_t::OFF),
+      (payload.mac_age ? mac_age_mode_t::ON : mac_age_mode_t::OFF));
 
     VOM_LOG(log_level_t::DEBUG) << "dump: " << bd.to_string();
 
@@ -215,6 +252,9 @@ bridge_domain::event_handler::handle_populate(const client_db::key_t& key)
       l2_binding l2(*uu_fwd_itf, bd,
                     l2_binding::l2_port_type_t::L2_PORT_TYPE_UU_FWD);
       OM::commit(key, l2);
+    } else {
+      VOM_LOG(log_level_t::ERROR) << "no uu-fwd interface:"
+                                  << payload.uu_fwd_sw_if_index;
     }
 
     /**
@@ -226,6 +266,9 @@ bridge_domain::event_handler::handle_populate(const client_db::key_t& key)
       if (itf) {
         l2_binding l2(*itf, bd);
         OM::commit(key, l2);
+      } else {
+        VOM_LOG(log_level_t::ERROR) << "no interface:"
+                                    << payload.sw_if_details[ii].sw_if_index;
       }
     }
   }