X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fext%2Fvom_test.cpp;h=f55dd3ebbc36bc0f7103949cfc9ab4ec6dddc91d;hb=097fa66b986f06281f603767d321ab13ab6c88c3;hp=7d7325413bda90817f72866560fdc5aac394468e;hpb=003d5da298b2cd1e20400fb5fdcefce752ca616e;p=vpp.git diff --git a/test/ext/vom_test.cpp b/test/ext/vom_test.cpp index 7d7325413bd..f55dd3ebbc3 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" @@ -38,6 +39,7 @@ #include "vom/prefix.hpp" #include "vom/route.hpp" #include "vom/route_cmds.hpp" +#include "vom/mroute_cmds.hpp" #include "vom/route_domain.hpp" #include "vom/route_domain_cmds.hpp" #include "vom/vxlan_tunnel.hpp" @@ -46,7 +48,8 @@ #include "vom/sub_interface_cmds.hpp" #include "vom/acl_ethertype.hpp" #include "vom/acl_ethertype_cmds.hpp" -#include "vom/acl_list.hpp" +#include "vom/acl_l2_list.hpp" +#include "vom/acl_l3_list.hpp" #include "vom/acl_binding.hpp" #include "vom/acl_list_cmds.hpp" #include "vom/acl_binding_cmds.hpp" @@ -88,7 +91,7 @@ public: ExpException(unsigned int number) { // a neat place to add a break point - std::cout << " ExpException here: " << number << std::endl; + // std::cout << " ExpException here: " << number << std::endl; } }; @@ -187,6 +190,10 @@ public: { rc = handle_derived(f_exp, f_act); } + else if (typeid(*f_exp) == typeid(interface_cmds::bvi_create_cmd)) + { + rc = handle_derived(f_exp, f_act); + } else if (typeid(*f_exp) == typeid(interface_cmds::vhost_create_cmd)) { rc = handle_derived(f_exp, f_act); @@ -199,6 +206,10 @@ public: { rc = handle_derived(f_exp, f_act); } + else if (typeid(*f_exp) == typeid(interface_cmds::bvi_delete_cmd)) + { + rc = handle_derived(f_exp, f_act); + } else if (typeid(*f_exp) == typeid(interface_cmds::af_packet_delete_cmd)) { rc = handle_derived(f_exp, f_act); @@ -251,6 +262,14 @@ public: { rc = handle_derived(f_exp, f_act); } + else if (typeid(*f_exp) == typeid(route::ip_mroute_cmds::update_cmd)) + { + rc = handle_derived(f_exp, f_act); + } + else if (typeid(*f_exp) == typeid(route::ip_mroute_cmds::delete_cmd)) + { + rc = handle_derived(f_exp, f_act); + } else if (typeid(*f_exp) == typeid(neighbour_cmds::create_cmd)) { rc = handle_derived(f_exp, f_act); @@ -299,9 +318,9 @@ public: { rc = handle_derived(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(f_exp, f_act); + rc = handle_derived(f_exp, f_act); } else if (typeid(*f_exp) == typeid(l2_xconnect_cmds::bind_cmd)) { @@ -750,7 +769,7 @@ BOOST_AUTO_TEST_CASE(test_bvi) { HW::item hw_ifh(4, rc_t::OK); HW::item hw_pfx_10(pfx_10, rc_t::OK); - ADD_EXPECT(interface_cmds::loopback_create_cmd(hw_ifh, bvi_name)); + ADD_EXPECT(interface_cmds::bvi_create_cmd(hw_ifh, bvi_name)); ADD_EXPECT(interface_cmds::set_tag(hw_ifh, bvi_name)); ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh)); TRY_CHECK_RC(OM::write(ernest, itf)); @@ -788,7 +807,7 @@ BOOST_AUTO_TEST_CASE(test_bvi) { delete l3; ADD_EXPECT(l3_binding_cmds::unbind_cmd(hw_l3_unbind, hw_ifh.data(), pfx_10)); ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh)); - ADD_EXPECT(interface_cmds::loopback_delete_cmd(hw_ifh)); + ADD_EXPECT(interface_cmds::bvi_delete_cmd(hw_ifh)); TRY_CHECK(OM::remove(ernest)); /* @@ -814,7 +833,7 @@ BOOST_AUTO_TEST_CASE(test_bvi) { rd); HW::item hw_ifh2(5, rc_t::OK); - ADD_EXPECT(interface_cmds::loopback_create_cmd(hw_ifh2, bvi2_name)); + ADD_EXPECT(interface_cmds::bvi_create_cmd(hw_ifh2, bvi2_name)); ADD_EXPECT(interface_cmds::set_tag(hw_ifh2, bvi2_name)); ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh2)); ADD_EXPECT(interface_cmds::set_table_cmd(hw_rd4_bind, l3_proto_t::IPV4, hw_ifh2)); @@ -833,7 +852,7 @@ BOOST_AUTO_TEST_CASE(test_bvi) { ADD_EXPECT(interface_cmds::set_table_cmd(hw_rd4_unbind, l3_proto_t::IPV4, hw_ifh2)); ADD_EXPECT(interface_cmds::set_table_cmd(hw_rd6_unbind, l3_proto_t::IPV6, hw_ifh2)); ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh2)); - ADD_EXPECT(interface_cmds::loopback_delete_cmd(hw_ifh2)); + ADD_EXPECT(interface_cmds::bvi_delete_cmd(hw_ifh2)); ADD_EXPECT(route_domain_cmds::delete_cmd(hw_rd4_delete, l3_proto_t::IPV4, 1)); ADD_EXPECT(route_domain_cmds::delete_cmd(hw_rd6_delete, l3_proto_t::IPV6, 1)); TRY_CHECK(OM::remove(graham)); @@ -945,7 +964,9 @@ BOOST_AUTO_TEST_CASE(test_bridge) { ADD_EXPECT(bridge_domain_cmds::create_cmd(hw_bd, bridge_domain::learning_mode_t::ON, bridge_domain::arp_term_mode_t::ON, + bridge_domain::arp_ufwd_mode_t::ON, bridge_domain::flood_mode_t::ON, + bridge_domain::uu_flood_mode_t::ON, bridge_domain::mac_age_mode_t::OFF)); TRY_CHECK_RC(OM::write(franz, bd1)); @@ -979,14 +1000,14 @@ BOOST_AUTO_TEST_CASE(test_bridge) { TRY_CHECK_RC(OM::write(dante, bd1)); l2_binding *l2itf2 = new l2_binding(itf2, bd1); - HW::item 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 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 @@ -1042,7 +1063,9 @@ BOOST_AUTO_TEST_CASE(test_bridge) { ADD_EXPECT(bridge_domain_cmds::create_cmd(hw_bd2, bridge_domain::learning_mode_t::ON, bridge_domain::arp_term_mode_t::ON, + bridge_domain::arp_ufwd_mode_t::ON, bridge_domain::flood_mode_t::ON, + bridge_domain::uu_flood_mode_t::ON, bridge_domain::mac_age_mode_t::OFF)); TRY_CHECK_RC(OM::write(jkr, bd2)); @@ -1053,7 +1076,7 @@ BOOST_AUTO_TEST_CASE(test_bridge) { interface::admin_state_t::UP); HW::item hw_ifh3(5, rc_t::OK); - ADD_EXPECT(interface_cmds::loopback_create_cmd(hw_ifh3, itf3_name)); + ADD_EXPECT(interface_cmds::bvi_create_cmd(hw_ifh3, itf3_name)); ADD_EXPECT(interface_cmds::set_tag(hw_ifh3, itf3_name)); ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh3)); TRY_CHECK_RC(OM::write(jkr, itf3)); @@ -1080,7 +1103,7 @@ BOOST_AUTO_TEST_CASE(test_bridge) { l2_binding::l2_port_type_t::L2_PORT_TYPE_BVI)); ADD_EXPECT(bridge_domain_entry_cmds::delete_cmd(hw_be2, mac2, bd2.id(), true)); ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh3)); - ADD_EXPECT(interface_cmds::loopback_delete_cmd(hw_ifh3)); + ADD_EXPECT(interface_cmds::bvi_delete_cmd(hw_ifh3)); ADD_EXPECT(bridge_domain_cmds::delete_cmd(hw_bd2)); TRY_CHECK(OM::remove(jkr)); } @@ -1164,14 +1187,18 @@ BOOST_AUTO_TEST_CASE(test_vxlan) { // bridge-domain create bridge_domain bd1(33, bridge_domain::learning_mode_t::OFF, bridge_domain::arp_term_mode_t::OFF, + bridge_domain::arp_ufwd_mode_t::OFF, bridge_domain::flood_mode_t::OFF, + bridge_domain::uu_flood_mode_t::OFF, bridge_domain::mac_age_mode_t::ON); HW::item hw_bd(33, rc_t::OK); ADD_EXPECT(bridge_domain_cmds::create_cmd(hw_bd, bridge_domain::learning_mode_t::OFF, bridge_domain::arp_term_mode_t::OFF, + bridge_domain::arp_ufwd_mode_t::OFF, bridge_domain::flood_mode_t::OFF, + bridge_domain::uu_flood_mode_t::OFF, bridge_domain::mac_age_mode_t::ON)); TRY_CHECK_RC(OM::write(franz, bd1)); @@ -1723,23 +1750,39 @@ BOOST_AUTO_TEST_CASE(test_routing) { * A route via interface 1 in the default table */ route::prefix_t pfx_5("5.5.5.5", 32); + boost::asio::ip::address nh_9 = boost::asio::ip::address::from_string("10.10.10.9"); + route::path *path_9 = new route::path(nh_9, itf1); boost::asio::ip::address nh_10 = boost::asio::ip::address::from_string("10.10.10.11"); route::path *path_10 = new route::path(nh_10, itf1); route::ip_route *route_5 = new route::ip_route(pfx_5); route_5->add(*path_10); + route_5->add(*path_9); HW::item hw_route_5(true, rc_t::OK); - ADD_EXPECT(route::ip_route_cmds::update_cmd(hw_route_5, 0, pfx_5, {*path_10})); + ADD_EXPECT(route::ip_route_cmds::update_cmd(hw_route_5, 0, pfx_5, *path_9)); + ADD_EXPECT(route::ip_route_cmds::update_cmd(hw_route_5, 0, pfx_5, *path_10)); + TRY_CHECK_RC(OM::write(ian, *route_5)); + + route_5->remove(*path_9); + ADD_EXPECT(route::ip_route_cmds::delete_cmd(hw_route_5, 0, pfx_5, *path_9)); TRY_CHECK_RC(OM::write(ian, *route_5)); + delete path_9; + /* * A route via interface 2 in the non-default table */ boost::asio::ip::address nh_11 = boost::asio::ip::address::from_string("11.11.11.10"); route::path *path_11 = new route::path(nh_11, *itf2); + boost::asio::ip::address nh_12 = boost::asio::ip::address::from_string("11.11.11.12"); + route::path *path_12 = new route::path(nh_12, *itf2); route::ip_route *route_5_2 = new route::ip_route(rd4, pfx_5); route_5_2->add(*path_11); HW::item hw_route_5_2(true, rc_t::OK); - ADD_EXPECT(route::ip_route_cmds::update_cmd(hw_route_5_2, 1, pfx_5, {*path_11})); + ADD_EXPECT(route::ip_route_cmds::update_cmd(hw_route_5_2, 1, pfx_5, *path_11)); + TRY_CHECK_RC(OM::write(ian, *route_5_2)); + + route_5_2->add(*path_12); + ADD_EXPECT(route::ip_route_cmds::update_cmd(hw_route_5_2, 1, pfx_5, *path_12)); TRY_CHECK_RC(OM::write(ian, *route_5_2)); /* @@ -1748,7 +1791,9 @@ BOOST_AUTO_TEST_CASE(test_routing) { HW::item hw_neighbour(true, rc_t::OK); mac_address_t mac_n({0,1,2,4,5,6}); neighbour *ne = new neighbour(itf1, nh_10, mac_n); - ADD_EXPECT(neighbour_cmds::create_cmd(hw_neighbour, hw_ifh.data(), mac_n, nh_10)); + ADD_EXPECT(neighbour_cmds::create_cmd(hw_neighbour, hw_ifh.data(), + mac_n, nh_10, + neighbour::flags_t::STATIC)); TRY_CHECK_RC(OM::write(ian, *ne)); /* @@ -1759,9 +1804,29 @@ BOOST_AUTO_TEST_CASE(test_routing) { route::ip_route *route_dvr = new route::ip_route(pfx_6); route_dvr->add(*path_l2); HW::item hw_route_dvr(true, rc_t::OK); - ADD_EXPECT(route::ip_route_cmds::update_cmd(hw_route_dvr, 0, pfx_6, {*path_l2})); + ADD_EXPECT(route::ip_route_cmds::update_cmd(hw_route_dvr, 0, pfx_6, *path_l2)); TRY_CHECK_RC(OM::write(ian, *route_dvr)); + /* + * a multicast route + */ + route::mprefix_t mpfx_4(boost::asio::ip::address::from_string("232.1.1.1"), 32); + route::ip_mroute *mroute_4 = new route::ip_mroute(mpfx_4); + + route::path *mp1 = new route::path(itf1, nh_proto_t::IPV4); + route::path *mp2 = new route::path(*itf2, nh_proto_t::IPV4); + mroute_4->add(*mp1, route::itf_flags_t::FORWARD); + mroute_4->add(*mp1, route::itf_flags_t::ACCEPT); + mroute_4->add(*mp2, route::itf_flags_t::FORWARD); + HW::item hw_mroute_4(true, rc_t::OK); + ADD_EXPECT(route::ip_mroute_cmds::update_cmd(hw_mroute_4, 0, mpfx_4, + *mp1, route::itf_flags_t::FORWARD)); + ADD_EXPECT(route::ip_mroute_cmds::update_cmd(hw_mroute_4, 0, mpfx_4, + *mp2, route::itf_flags_t::FORWARD)); + ADD_EXPECT(route::ip_mroute_cmds::update_cmd(hw_mroute_4, 0, mpfx_4, + *mp1, route::itf_flags_t::ACCEPT)); + TRY_CHECK_RC(OM::write(ian, *mroute_4)); + STRICT_ORDER_OFF(); // delete the stack objects that hold references to others // so the OM::remove is the call that removes the last reference @@ -1769,16 +1834,34 @@ BOOST_AUTO_TEST_CASE(test_routing) { delete l3_10; delete itf2; delete route_5; - delete path_10; delete route_5_2; - delete path_11; delete route_dvr; - delete path_l2; delete ne; - ADD_EXPECT(neighbour_cmds::delete_cmd(hw_neighbour, hw_ifh.data(), mac_n, nh_10)); - ADD_EXPECT(route::ip_route_cmds::delete_cmd(hw_route_dvr, 0, pfx_6)); - ADD_EXPECT(route::ip_route_cmds::delete_cmd(hw_route_5_2, 1, pfx_5)); - ADD_EXPECT(route::ip_route_cmds::delete_cmd(hw_route_5, 0, pfx_5)); + delete mroute_4; + + ADD_EXPECT(route::ip_mroute_cmds::delete_cmd(hw_mroute_4, 0, mpfx_4, + *mp1, route::itf_flags_t::FORWARD)); + ADD_EXPECT(route::ip_mroute_cmds::delete_cmd(hw_mroute_4, 0, mpfx_4, + *mp2, route::itf_flags_t::FORWARD)); + ADD_EXPECT(route::ip_mroute_cmds::delete_cmd(hw_mroute_4, 0, mpfx_4, + *mp1, route::itf_flags_t::ACCEPT)); + + delete mp1; + delete mp2; + + ADD_EXPECT(neighbour_cmds::delete_cmd(hw_neighbour, hw_ifh.data(), + mac_n, nh_10, + neighbour::flags_t::STATIC)); + ADD_EXPECT(route::ip_route_cmds::delete_cmd(hw_route_dvr, 0, pfx_6, *path_l2)); + ADD_EXPECT(route::ip_route_cmds::delete_cmd(hw_route_5_2, 1, pfx_5, *path_11)); + ADD_EXPECT(route::ip_route_cmds::delete_cmd(hw_route_5_2, 1, pfx_5, *path_12)); + ADD_EXPECT(route::ip_route_cmds::delete_cmd(hw_route_5, 0, pfx_5, *path_10)); + + delete path_10; + delete path_11; + delete path_12; + delete path_l2; + ADD_EXPECT(l3_binding_cmds::unbind_cmd(hw_l3_10_unbind, hw_ifh.data(), pfx_10)); ADD_EXPECT(l3_binding_cmds::unbind_cmd(hw_l3_11_unbind, hw_ifh2.data(), pfx_11)); ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh)); @@ -2044,14 +2127,18 @@ BOOST_AUTO_TEST_CASE(test_pipes) { // put each end of the pipe in a BD bridge_domain bd1(33, bridge_domain::learning_mode_t::OFF, bridge_domain::arp_term_mode_t::OFF, + bridge_domain::arp_ufwd_mode_t::ON, bridge_domain::flood_mode_t::OFF, + bridge_domain::uu_flood_mode_t::ON, bridge_domain::mac_age_mode_t::ON); HW::item hw_bd(33, rc_t::OK); ADD_EXPECT(bridge_domain_cmds::create_cmd(hw_bd, bridge_domain::learning_mode_t::OFF, bridge_domain::arp_term_mode_t::OFF, + bridge_domain::arp_ufwd_mode_t::ON, bridge_domain::flood_mode_t::OFF, + bridge_domain::uu_flood_mode_t::ON, bridge_domain::mac_age_mode_t::ON)); TRY_CHECK_RC(OM::write(gk, bd1));