From 04def7418b649a94e32149ee924a3743358b5c84 Mon Sep 17 00:00:00 2001 From: Mohsin Kazmi Date: Wed, 7 Mar 2018 19:53:51 +0100 Subject: VOM: acl: Add support for acl ethertype unbind and dump Change-Id: I667b9ccabe54c8f9cff5b1a2e63864965f5064f5 Signed-off-by: Mohsin Kazmi --- src/vpp-api/vom/acl_ethertype.cpp | 40 +++++++++++++++++- src/vpp-api/vom/acl_ethertype_cmds.cpp | 76 ++++++++++++++++++++++++++++++++++ src/vpp-api/vom/acl_ethertype_cmds.hpp | 67 ++++++++++++++++++++++++++++++ 3 files changed, 182 insertions(+), 1 deletion(-) (limited to 'src/vpp-api/vom') diff --git a/src/vpp-api/vom/acl_ethertype.cpp b/src/vpp-api/vom/acl_ethertype.cpp index 043f0b0e632..530a0aee604 100644 --- a/src/vpp-api/vom/acl_ethertype.cpp +++ b/src/vpp-api/vom/acl_ethertype.cpp @@ -95,6 +95,10 @@ acl_ethertype::~acl_ethertype() void acl_ethertype::sweep() { + if (m_binding) { + HW::enqueue(new acl_ethertype_cmds::unbind_cmd(m_binding, m_itf->handle())); + } + HW::write(); } const acl_ethertype::key_t& @@ -187,7 +191,41 @@ acl_ethertype::event_handler::handle_replay() void acl_ethertype::event_handler::handle_populate(const client_db::key_t& key) { - // FIXME + /* + * dump VPP acl ethertypes + */ + std::shared_ptr cmd = + std::make_shared(~0); + + HW::enqueue(cmd); + HW::write(); + + for (auto& record : *cmd) { + auto& payload = record.get_payload(); + handle_t hdl(payload.sw_if_index); + std::shared_ptr itf = interface::find(hdl); + uint8_t n_input = payload.n_input; + uint8_t count = payload.count; + ethertype_rules_t ler; + if (itf) { + for (int i = 0; i < count; i++) { + ethertype_t e = ethertype_t::from_numeric_val(payload.whitelist[i]); + if (n_input) { + ethertype_rule_t er(e, direction_t::INPUT); + ler.insert(er); + n_input--; + } else { + ethertype_rule_t er(e, direction_t::OUTPUT); + ler.insert(er); + } + } + if (!ler.empty()) { + acl_ethertype a_e(*itf, ler); + VOM_LOG(log_level_t::DEBUG) << "ethertype dump: " << a_e.to_string(); + OM::commit(key, a_e); + } + } + } } dependency_t diff --git a/src/vpp-api/vom/acl_ethertype_cmds.cpp b/src/vpp-api/vom/acl_ethertype_cmds.cpp index 91fc7ee6b01..c05a428c725 100644 --- a/src/vpp-api/vom/acl_ethertype_cmds.cpp +++ b/src/vpp-api/vom/acl_ethertype_cmds.cpp @@ -80,6 +80,82 @@ bind_cmd::to_string() const return (s.str()); } +unbind_cmd::unbind_cmd(HW::item& item, const handle_t& itf) + : rpc_cmd(item) + , m_itf(itf) +{ +} + +bool +unbind_cmd::operator==(const unbind_cmd& other) const +{ + return (m_itf == other.m_itf); +} + +rc_t +unbind_cmd::issue(connection& con) +{ + msg_t req(con.ctx(), 0, std::ref(*this)); + + auto& payload = req.get_request().get_payload(); + payload.sw_if_index = m_itf.value(); + payload.count = 0; + + payload.n_input = 0; + + VAPI_CALL(req.execute()); + + wait(); + m_hw_item.set(rc_t::NOOP); + + return rc_t::OK; +} + +std::string +unbind_cmd::to_string() const +{ + std::ostringstream s; + s << "ACL-Ethertype-Unbind: " << m_hw_item.to_string() + << " itf:" << m_itf.to_string(); + return (s.str()); +} + +dump_cmd::dump_cmd(const handle_t& hdl) + : m_itf(hdl) +{ +} + +dump_cmd::dump_cmd(const dump_cmd& d) + : m_itf(d.m_itf) +{ +} + +bool +dump_cmd::operator==(const dump_cmd& other) const +{ + return (true); +} + +rc_t +dump_cmd::issue(connection& con) +{ + m_dump.reset(new msg_t(con.ctx(), std::ref(*this))); + + auto& payload = m_dump->get_request().get_payload(); + payload.sw_if_index = m_itf.value(); + + VAPI_CALL(m_dump->execute()); + + wait(); + + return rc_t::OK; +} + +std::string +dump_cmd::to_string() const +{ + return ("acl-ethertype-dump"); +} }; // namespace acl_ethertype_cmds }; // namespace ACL }; // namespace VOM diff --git a/src/vpp-api/vom/acl_ethertype_cmds.hpp b/src/vpp-api/vom/acl_ethertype_cmds.hpp index a0af50e8297..f72a3fb97b5 100644 --- a/src/vpp-api/vom/acl_ethertype_cmds.hpp +++ b/src/vpp-api/vom/acl_ethertype_cmds.hpp @@ -65,6 +65,73 @@ private: */ const acl_ethertype::ethertype_rules_t& m_le; }; + +/** + * A command class that unbinds the ethertype list to the interface + */ +class unbind_cmd : public rpc_cmd, + rc_t, + vapi::Acl_interface_set_etype_whitelist> +{ +public: + /** + * Constructor + */ + unbind_cmd(HW::item& item, const handle_t& itf); + + /** + * Issue the command to VPP/HW + */ + rc_t issue(connection& con); + /** + * convert to string format for debug purposes + */ + std::string to_string() const; + + /** + * Comparison operator - only used for UT + */ + bool operator==(const unbind_cmd& i) const; + +private: + /** + * Reference to the HW::item of the interface to bind + */ + const handle_t m_itf; +}; + +/** + * A cmd class that Dumps all the acl ethertypes on given interface + */ +class dump_cmd : public VOM::dump_cmd +{ +public: + /** + * Constructor + */ + dump_cmd(const handle_t& itf); + dump_cmd(const dump_cmd& d); + + /** + * Issue the command to VPP/HW + */ + rc_t issue(connection& con); + /** + * convert to string format for debug purposes + */ + std::string to_string() const; + + /** + * Comparison operator - only used for UT + */ + bool operator==(const dump_cmd& i) const; + +private: + /** + * The interface to get the addresses for + */ + const handle_t m_itf; +}; }; }; }; -- cgit 1.2.3-korg