diff options
author | Neale Ranns <nranns@cisco.com> | 2019-02-22 02:48:25 -0800 |
---|---|---|
committer | Neale Ranns <nranns@cisco.com> | 2019-02-22 13:45:38 +0000 |
commit | 533220058344d0dadc05ec82f7de6dbbf8b8b397 (patch) | |
tree | 828c4d26ac919f57ea70e29bf078f60bedd63943 /extras/vom/vom/l2_binding.cpp | |
parent | fb2e07d89a95272fbf166a500566a699a5fdfd5b (diff) |
VOM: fix tests and namespacify l2_vtr
Change-Id: Ie59220a622c3a5195485cd6857b45f57d6eeaf95
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'extras/vom/vom/l2_binding.cpp')
-rw-r--r-- | extras/vom/vom/l2_binding.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/extras/vom/vom/l2_binding.cpp b/extras/vom/vom/l2_binding.cpp index 5f0c7a79f94..37039a0b930 100644 --- a/extras/vom/vom/l2_binding.cpp +++ b/extras/vom/vom/l2_binding.cpp @@ -47,7 +47,7 @@ l2_binding::l2_binding(const interface& itf, const bridge_domain& bd) , m_bd(bd.singular()) , m_port_type(l2_port_type_t::L2_PORT_TYPE_NORMAL) , m_binding(0) - , m_vtr_op(l2_vtr_op_t::L2_VTR_DISABLED, rc_t::UNSET) + , m_vtr_op(l2_vtr::option_t::DISABLED, rc_t::UNSET) , m_vtr_op_tag(0) { if (interface::type_t::BVI == m_itf->type()) @@ -64,7 +64,7 @@ l2_binding::l2_binding(const interface& itf, , m_bd(bd.singular()) , m_port_type(port_type) , m_binding(0) - , m_vtr_op(l2_vtr_op_t::L2_VTR_DISABLED, rc_t::UNSET) + , m_vtr_op(l2_vtr::option_t::DISABLED, rc_t::UNSET) , m_vtr_op_tag(0) { } @@ -119,7 +119,8 @@ l2_binding::replay() } if (m_vtr_op && handle_t::INVALID != m_itf->handle()) { - HW::enqueue(new set_vtr_op_cmd(m_vtr_op, m_itf->handle(), m_vtr_op_tag)); + HW::enqueue( + new l2_vtr_cmds::set_cmd(m_vtr_op, m_itf->handle(), m_vtr_op_tag)); } } @@ -142,7 +143,7 @@ l2_binding::to_string() const } void -l2_binding::set(const l2_vtr_op_t& op, uint16_t tag) +l2_binding::set(const l2_vtr::option_t& op, uint16_t tag) { assert(rc_t::UNSET == m_vtr_op.rc()); m_vtr_op.set(rc_t::NOOP); @@ -174,7 +175,8 @@ l2_binding::update(const l2_binding& desired) * set the VTR operation if request */ if (m_vtr_op.update(desired.m_vtr_op)) { - HW::enqueue(new set_vtr_op_cmd(m_vtr_op, m_itf->handle(), m_vtr_op_tag)); + HW::enqueue( + new l2_vtr_cmds::set_cmd(m_vtr_op, m_itf->handle(), m_vtr_op_tag)); } } |