aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2019-02-22 02:48:25 -0800
committerNeale Ranns <nranns@cisco.com>2019-02-22 13:45:38 +0000
commit533220058344d0dadc05ec82f7de6dbbf8b8b397 (patch)
tree828c4d26ac919f57ea70e29bf078f60bedd63943 /test
parentfb2e07d89a95272fbf166a500566a699a5fdfd5b (diff)
VOM: fix tests and namespacify l2_vtr
Change-Id: Ie59220a622c3a5195485cd6857b45f57d6eeaf95 Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'test')
-rw-r--r--test/ext/vom_test.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/test/ext/vom_test.cpp b/test/ext/vom_test.cpp
index c259bb071df..26653940d2e 100644
--- a/test/ext/vom_test.cpp
+++ b/test/ext/vom_test.cpp
@@ -25,6 +25,7 @@
#include "vom/bond_group_binding_cmds.hpp"
#include "vom/l2_binding.hpp"
#include "vom/l2_binding_cmds.hpp"
+#include "vom/l2_vtr_cmds.hpp"
#include "vom/l2_xconnect.hpp"
#include "vom/l2_xconnect_cmds.hpp"
#include "vom/l3_binding.hpp"
@@ -308,9 +309,9 @@ public:
{
rc = handle_derived<l2_binding_cmds::unbind_cmd>(f_exp, f_act);
}
- else if (typeid(*f_exp) == typeid(l2_binding_cmds::set_vtr_op_cmd))
+ else if (typeid(*f_exp) == typeid(l2_vtr_cmds::set_cmd))
{
- rc = handle_derived<l2_binding_cmds::set_vtr_op_cmd>(f_exp, f_act);
+ rc = handle_derived<l2_vtr_cmds::set_cmd>(f_exp, f_act);
}
else if (typeid(*f_exp) == typeid(l2_xconnect_cmds::bind_cmd))
{
@@ -988,14 +989,14 @@ BOOST_AUTO_TEST_CASE(test_bridge) {
TRY_CHECK_RC(OM::write(dante, bd1));
l2_binding *l2itf2 = new l2_binding(itf2, bd1);
- HW::item<l2_binding::l2_vtr_op_t> hw_set_vtr(l2_binding::l2_vtr_op_t::L2_VTR_POP_1, rc_t::OK);
- l2itf2->set(l2_binding::l2_vtr_op_t::L2_VTR_POP_1, 68);
+ HW::item<l2_vtr::option_t> hw_set_vtr(l2_vtr::option_t::POP_1, rc_t::OK);
+ l2itf2->set(l2_vtr::option_t::POP_1, 68);
ADD_EXPECT(l2_binding_cmds::bind_cmd(hw_l2_bind,
hw_ifh2.data(),
hw_bd.data(),
l2_binding::l2_port_type_t::L2_PORT_TYPE_NORMAL));
- ADD_EXPECT(l2_binding_cmds::set_vtr_op_cmd(hw_set_vtr, hw_ifh2.data(), 68));
+ ADD_EXPECT(l2_vtr_cmds::set_cmd(hw_set_vtr, hw_ifh2.data(), 68));
TRY_CHECK_RC(OM::write(dante, *l2itf2));
// Add some static entries to the bridge-domain