From 164e5f8c63652028ecb9c3570e1ea8618b163071 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Wed, 25 Apr 2018 19:11:15 +0200 Subject: [PATCH] Move VOM to extras/vom Change-Id: Iea174f03dfba3bd06024db0f0cc373532300dcae Signed-off-by: Damjan Marion --- Makefile | 4 +- build-data/packages/vom.mk | 6 +++ build-data/platforms/vpp.mk | 6 +-- extras/vom/Makefile.am | 5 +++ extras/vom/configure.ac | 20 ++++++++++ {src/vpp-api => extras/vom}/vom/.clang-format | 0 {src/vpp-api => extras/vom}/vom/Makefile.am | 4 +- {src/vpp-api => extras/vom}/vom/acl_binding.cpp | 0 {src/vpp-api => extras/vom}/vom/acl_binding.hpp | 0 .../vom}/vom/acl_binding_cmds.cpp | 0 .../vom}/vom/acl_binding_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/acl_ethertype.cpp | 0 {src/vpp-api => extras/vom}/vom/acl_ethertype.hpp | 0 .../vom}/vom/acl_ethertype_cmds.cpp | 0 .../vom}/vom/acl_ethertype_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/acl_l2_rule.cpp | 0 {src/vpp-api => extras/vom}/vom/acl_l2_rule.hpp | 0 {src/vpp-api => extras/vom}/vom/acl_l3_rule.cpp | 0 {src/vpp-api => extras/vom}/vom/acl_l3_rule.hpp | 0 {src/vpp-api => extras/vom}/vom/acl_list.cpp | 0 {src/vpp-api => extras/vom}/vom/acl_list.hpp | 0 {src/vpp-api => extras/vom}/vom/acl_list_cmds.cpp | 0 {src/vpp-api => extras/vom}/vom/acl_list_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/acl_types.cpp | 0 {src/vpp-api => extras/vom}/vom/acl_types.hpp | 0 .../vom}/vom/arp_proxy_binding.cpp | 0 .../vom}/vom/arp_proxy_binding.hpp | 0 .../vom}/vom/arp_proxy_binding_cmds.cpp | 0 .../vom}/vom/arp_proxy_binding_cmds.hpp | 0 .../vom}/vom/arp_proxy_config.cpp | 0 .../vom}/vom/arp_proxy_config.hpp | 0 .../vom}/vom/arp_proxy_config_cmds.cpp | 0 .../vom}/vom/arp_proxy_config_cmds.hpp | 0 .../vom}/vom/bond_group_binding.cpp | 0 .../vom}/vom/bond_group_binding.hpp | 0 .../vom}/vom/bond_group_binding_cmds.cpp | 0 .../vom}/vom/bond_group_binding_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/bond_interface.cpp | 0 {src/vpp-api => extras/vom}/vom/bond_interface.hpp | 0 .../vom}/vom/bond_interface_cmds.cpp | 0 .../vom}/vom/bond_interface_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/bond_member.cpp | 0 {src/vpp-api => extras/vom}/vom/bond_member.hpp | 0 {src/vpp-api => extras/vom}/vom/bridge_domain.cpp | 0 {src/vpp-api => extras/vom}/vom/bridge_domain.hpp | 0 .../vom}/vom/bridge_domain_arp_entry.cpp | 0 .../vom}/vom/bridge_domain_arp_entry.hpp | 0 .../vom}/vom/bridge_domain_arp_entry_cmds.cpp | 0 .../vom}/vom/bridge_domain_arp_entry_cmds.hpp | 0 .../vom}/vom/bridge_domain_cmds.cpp | 0 .../vom}/vom/bridge_domain_cmds.hpp | 0 .../vom}/vom/bridge_domain_entry.cpp | 0 .../vom}/vom/bridge_domain_entry.hpp | 0 .../vom}/vom/bridge_domain_entry_cmds.cpp | 0 .../vom}/vom/bridge_domain_entry_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/client_db.cpp | 0 {src/vpp-api => extras/vom}/vom/client_db.hpp | 0 {src/vpp-api => extras/vom}/vom/cmd.cpp | 0 {src/vpp-api => extras/vom}/vom/cmd.hpp | 0 {src/vpp-api => extras/vom}/vom/connection.cpp | 0 {src/vpp-api => extras/vom}/vom/connection.hpp | 0 {src/vpp-api => extras/vom}/vom/dhcp_config.cpp | 0 {src/vpp-api => extras/vom}/vom/dhcp_config.hpp | 0 .../vom}/vom/dhcp_config_cmds.cpp | 0 .../vom}/vom/dhcp_config_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/dump_cmd.hpp | 0 {src/vpp-api => extras/vom}/vom/enum_base.hpp | 0 {src/vpp-api => extras/vom}/vom/event_cmd.hpp | 0 {src/vpp-api => extras/vom}/vom/gbp_contract.cpp | 0 {src/vpp-api => extras/vom}/vom/gbp_contract.hpp | 0 .../vom}/vom/gbp_contract_cmds.cpp | 0 .../vom}/vom/gbp_contract_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/gbp_endpoint.cpp | 0 {src/vpp-api => extras/vom}/vom/gbp_endpoint.hpp | 0 .../vom}/vom/gbp_endpoint_cmds.cpp | 0 .../vom}/vom/gbp_endpoint_cmds.hpp | 0 .../vom}/vom/gbp_endpoint_group.cpp | 0 .../vom}/vom/gbp_endpoint_group.hpp | 0 .../vom}/vom/gbp_endpoint_group_cmds.cpp | 0 .../vom}/vom/gbp_endpoint_group_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/gbp_recirc.cpp | 0 {src/vpp-api => extras/vom}/vom/gbp_recirc.hpp | 0 .../vpp-api => extras/vom}/vom/gbp_recirc_cmds.cpp | 0 .../vpp-api => extras/vom}/vom/gbp_recirc_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/gbp_subnet.cpp | 0 {src/vpp-api => extras/vom}/vom/gbp_subnet.hpp | 0 .../vpp-api => extras/vom}/vom/gbp_subnet_cmds.cpp | 0 .../vpp-api => extras/vom}/vom/gbp_subnet_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/hw.cpp | 0 {src/vpp-api => extras/vom}/vom/hw.hpp | 0 {src/vpp-api => extras/vom}/vom/hw_cmds.cpp | 0 {src/vpp-api => extras/vom}/vom/hw_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/inspect.cpp | 0 {src/vpp-api => extras/vom}/vom/inspect.hpp | 0 {src/vpp-api => extras/vom}/vom/interface.cpp | 0 {src/vpp-api => extras/vom}/vom/interface.hpp | 0 {src/vpp-api => extras/vom}/vom/interface_cmds.cpp | 0 {src/vpp-api => extras/vom}/vom/interface_cmds.hpp | 0 .../vom}/vom/interface_factory.cpp | 0 .../vom}/vom/interface_factory.hpp | 0 .../vom}/vom/interface_ip6_nd.hpp | 0 .../vom}/vom/interface_ip6_nd_cmds.cpp | 0 {src/vpp-api => extras/vom}/vom/interface_span.cpp | 0 {src/vpp-api => extras/vom}/vom/interface_span.hpp | 0 .../vom}/vom/interface_span_cmds.cpp | 0 .../vom}/vom/interface_span_cmds.hpp | 0 .../vpp-api => extras/vom}/vom/interface_types.cpp | 0 {src/vpp-api => extras/vom}/vom/ip_unnumbered.cpp | 0 {src/vpp-api => extras/vom}/vom/ip_unnumbered.hpp | 0 .../vom}/vom/ip_unnumbered_cmds.cpp | 0 .../vom}/vom/ip_unnumbered_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/l2_binding.cpp | 0 {src/vpp-api => extras/vom}/vom/l2_binding.hpp | 0 .../vpp-api => extras/vom}/vom/l2_binding_cmds.cpp | 0 .../vpp-api => extras/vom}/vom/l2_binding_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/l2_emulation.cpp | 0 {src/vpp-api => extras/vom}/vom/l2_emulation.hpp | 0 .../vom}/vom/l2_emulation_cmds.cpp | 0 .../vom}/vom/l2_emulation_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/l3_binding.cpp | 0 {src/vpp-api => extras/vom}/vom/l3_binding.hpp | 0 .../vpp-api => extras/vom}/vom/l3_binding_cmds.cpp | 0 .../vpp-api => extras/vom}/vom/l3_binding_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/lldp_binding.cpp | 0 {src/vpp-api => extras/vom}/vom/lldp_binding.hpp | 0 .../vom}/vom/lldp_binding_cmds.cpp | 0 .../vom}/vom/lldp_binding_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/lldp_global.cpp | 0 {src/vpp-api => extras/vom}/vom/lldp_global.hpp | 0 .../vom}/vom/lldp_global_cmds.cpp | 0 .../vom}/vom/lldp_global_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/logger.cpp | 0 {src/vpp-api => extras/vom}/vom/logger.hpp | 0 {src/vpp-api => extras/vom}/vom/nat_binding.cpp | 0 {src/vpp-api => extras/vom}/vom/nat_binding.hpp | 0 .../vom}/vom/nat_binding_cmds.cpp | 0 .../vom}/vom/nat_binding_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/nat_static.cpp | 0 {src/vpp-api => extras/vom}/vom/nat_static.hpp | 0 .../vpp-api => extras/vom}/vom/nat_static_cmds.cpp | 0 .../vpp-api => extras/vom}/vom/nat_static_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/neighbour.cpp | 0 {src/vpp-api => extras/vom}/vom/neighbour.hpp | 0 {src/vpp-api => extras/vom}/vom/neighbour_cmds.cpp | 0 {src/vpp-api => extras/vom}/vom/neighbour_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/object_base.cpp | 0 {src/vpp-api => extras/vom}/vom/object_base.hpp | 0 {src/vpp-api => extras/vom}/vom/om.cpp | 0 {src/vpp-api => extras/vom}/vom/om.hpp | 0 {src/vpp-api => extras/vom}/vom/prefix.cpp | 0 {src/vpp-api => extras/vom}/vom/prefix.hpp | 0 {src/vpp-api => extras/vom}/vom/ra_config.cpp | 0 {src/vpp-api => extras/vom}/vom/ra_config.hpp | 0 {src/vpp-api => extras/vom}/vom/ra_prefix.cpp | 0 {src/vpp-api => extras/vom}/vom/ra_prefix.hpp | 0 {src/vpp-api => extras/vom}/vom/route.cpp | 0 {src/vpp-api => extras/vom}/vom/route.hpp | 0 {src/vpp-api => extras/vom}/vom/route_cmds.cpp | 0 {src/vpp-api => extras/vom}/vom/route_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/route_domain.cpp | 0 {src/vpp-api => extras/vom}/vom/route_domain.hpp | 0 .../vom}/vom/route_domain_cmds.cpp | 0 .../vom}/vom/route_domain_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/rpc_cmd.hpp | 0 {src/vpp-api => extras/vom}/vom/singular_db.hpp | 0 .../vom}/vom/singular_db_funcs.hpp | 0 {src/vpp-api => extras/vom}/vom/sub_interface.cpp | 0 {src/vpp-api => extras/vom}/vom/sub_interface.hpp | 0 .../vom}/vom/sub_interface_cmds.cpp | 0 .../vom}/vom/sub_interface_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/tap_interface.cpp | 0 {src/vpp-api => extras/vom}/vom/tap_interface.hpp | 0 .../vom}/vom/tap_interface_cmds.cpp | 0 .../vom}/vom/tap_interface_cmds.hpp | 0 {src/vpp-api => extras/vom}/vom/types.cpp | 0 {src/vpp-api => extras/vom}/vom/types.hpp | 0 {src/vpp-api => extras/vom}/vom/vxlan_tunnel.cpp | 0 {src/vpp-api => extras/vom}/vom/vxlan_tunnel.hpp | 0 .../vom}/vom/vxlan_tunnel_cmds.cpp | 0 .../vom}/vom/vxlan_tunnel_cmds.hpp | 0 src/Makefile.am | 4 -- src/configure.ac | 5 +-- test/ext/Makefile | 46 +++++++++++++++++----- 183 files changed, 74 insertions(+), 26 deletions(-) create mode 100644 build-data/packages/vom.mk create mode 100644 extras/vom/Makefile.am create mode 100644 extras/vom/configure.ac rename {src/vpp-api => extras/vom}/vom/.clang-format (100%) rename {src/vpp-api => extras/vom}/vom/Makefile.am (96%) rename {src/vpp-api => extras/vom}/vom/acl_binding.cpp (100%) rename {src/vpp-api => extras/vom}/vom/acl_binding.hpp (100%) rename {src/vpp-api => extras/vom}/vom/acl_binding_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/acl_binding_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/acl_ethertype.cpp (100%) rename {src/vpp-api => extras/vom}/vom/acl_ethertype.hpp (100%) rename {src/vpp-api => extras/vom}/vom/acl_ethertype_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/acl_ethertype_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/acl_l2_rule.cpp (100%) rename {src/vpp-api => extras/vom}/vom/acl_l2_rule.hpp (100%) rename {src/vpp-api => extras/vom}/vom/acl_l3_rule.cpp (100%) rename {src/vpp-api => extras/vom}/vom/acl_l3_rule.hpp (100%) rename {src/vpp-api => extras/vom}/vom/acl_list.cpp (100%) rename {src/vpp-api => extras/vom}/vom/acl_list.hpp (100%) rename {src/vpp-api => extras/vom}/vom/acl_list_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/acl_list_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/acl_types.cpp (100%) rename {src/vpp-api => extras/vom}/vom/acl_types.hpp (100%) rename {src/vpp-api => extras/vom}/vom/arp_proxy_binding.cpp (100%) rename {src/vpp-api => extras/vom}/vom/arp_proxy_binding.hpp (100%) rename {src/vpp-api => extras/vom}/vom/arp_proxy_binding_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/arp_proxy_binding_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/arp_proxy_config.cpp (100%) rename {src/vpp-api => extras/vom}/vom/arp_proxy_config.hpp (100%) rename {src/vpp-api => extras/vom}/vom/arp_proxy_config_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/arp_proxy_config_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/bond_group_binding.cpp (100%) rename {src/vpp-api => extras/vom}/vom/bond_group_binding.hpp (100%) rename {src/vpp-api => extras/vom}/vom/bond_group_binding_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/bond_group_binding_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/bond_interface.cpp (100%) rename {src/vpp-api => extras/vom}/vom/bond_interface.hpp (100%) rename {src/vpp-api => extras/vom}/vom/bond_interface_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/bond_interface_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/bond_member.cpp (100%) rename {src/vpp-api => extras/vom}/vom/bond_member.hpp (100%) rename {src/vpp-api => extras/vom}/vom/bridge_domain.cpp (100%) rename {src/vpp-api => extras/vom}/vom/bridge_domain.hpp (100%) rename {src/vpp-api => extras/vom}/vom/bridge_domain_arp_entry.cpp (100%) rename {src/vpp-api => extras/vom}/vom/bridge_domain_arp_entry.hpp (100%) rename {src/vpp-api => extras/vom}/vom/bridge_domain_arp_entry_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/bridge_domain_arp_entry_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/bridge_domain_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/bridge_domain_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/bridge_domain_entry.cpp (100%) rename {src/vpp-api => extras/vom}/vom/bridge_domain_entry.hpp (100%) rename {src/vpp-api => extras/vom}/vom/bridge_domain_entry_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/bridge_domain_entry_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/client_db.cpp (100%) rename {src/vpp-api => extras/vom}/vom/client_db.hpp (100%) rename {src/vpp-api => extras/vom}/vom/cmd.cpp (100%) rename {src/vpp-api => extras/vom}/vom/cmd.hpp (100%) rename {src/vpp-api => extras/vom}/vom/connection.cpp (100%) rename {src/vpp-api => extras/vom}/vom/connection.hpp (100%) rename {src/vpp-api => extras/vom}/vom/dhcp_config.cpp (100%) rename {src/vpp-api => extras/vom}/vom/dhcp_config.hpp (100%) rename {src/vpp-api => extras/vom}/vom/dhcp_config_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/dhcp_config_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/dump_cmd.hpp (100%) rename {src/vpp-api => extras/vom}/vom/enum_base.hpp (100%) rename {src/vpp-api => extras/vom}/vom/event_cmd.hpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_contract.cpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_contract.hpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_contract_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_contract_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_endpoint.cpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_endpoint.hpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_endpoint_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_endpoint_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_endpoint_group.cpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_endpoint_group.hpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_endpoint_group_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_endpoint_group_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_recirc.cpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_recirc.hpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_recirc_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_recirc_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_subnet.cpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_subnet.hpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_subnet_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/gbp_subnet_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/hw.cpp (100%) rename {src/vpp-api => extras/vom}/vom/hw.hpp (100%) rename {src/vpp-api => extras/vom}/vom/hw_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/hw_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/inspect.cpp (100%) rename {src/vpp-api => extras/vom}/vom/inspect.hpp (100%) rename {src/vpp-api => extras/vom}/vom/interface.cpp (100%) rename {src/vpp-api => extras/vom}/vom/interface.hpp (100%) rename {src/vpp-api => extras/vom}/vom/interface_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/interface_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/interface_factory.cpp (100%) rename {src/vpp-api => extras/vom}/vom/interface_factory.hpp (100%) rename {src/vpp-api => extras/vom}/vom/interface_ip6_nd.hpp (100%) rename {src/vpp-api => extras/vom}/vom/interface_ip6_nd_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/interface_span.cpp (100%) rename {src/vpp-api => extras/vom}/vom/interface_span.hpp (100%) rename {src/vpp-api => extras/vom}/vom/interface_span_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/interface_span_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/interface_types.cpp (100%) rename {src/vpp-api => extras/vom}/vom/ip_unnumbered.cpp (100%) rename {src/vpp-api => extras/vom}/vom/ip_unnumbered.hpp (100%) rename {src/vpp-api => extras/vom}/vom/ip_unnumbered_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/ip_unnumbered_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/l2_binding.cpp (100%) rename {src/vpp-api => extras/vom}/vom/l2_binding.hpp (100%) rename {src/vpp-api => extras/vom}/vom/l2_binding_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/l2_binding_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/l2_emulation.cpp (100%) rename {src/vpp-api => extras/vom}/vom/l2_emulation.hpp (100%) rename {src/vpp-api => extras/vom}/vom/l2_emulation_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/l2_emulation_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/l3_binding.cpp (100%) rename {src/vpp-api => extras/vom}/vom/l3_binding.hpp (100%) rename {src/vpp-api => extras/vom}/vom/l3_binding_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/l3_binding_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/lldp_binding.cpp (100%) rename {src/vpp-api => extras/vom}/vom/lldp_binding.hpp (100%) rename {src/vpp-api => extras/vom}/vom/lldp_binding_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/lldp_binding_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/lldp_global.cpp (100%) rename {src/vpp-api => extras/vom}/vom/lldp_global.hpp (100%) rename {src/vpp-api => extras/vom}/vom/lldp_global_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/lldp_global_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/logger.cpp (100%) rename {src/vpp-api => extras/vom}/vom/logger.hpp (100%) rename {src/vpp-api => extras/vom}/vom/nat_binding.cpp (100%) rename {src/vpp-api => extras/vom}/vom/nat_binding.hpp (100%) rename {src/vpp-api => extras/vom}/vom/nat_binding_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/nat_binding_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/nat_static.cpp (100%) rename {src/vpp-api => extras/vom}/vom/nat_static.hpp (100%) rename {src/vpp-api => extras/vom}/vom/nat_static_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/nat_static_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/neighbour.cpp (100%) rename {src/vpp-api => extras/vom}/vom/neighbour.hpp (100%) rename {src/vpp-api => extras/vom}/vom/neighbour_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/neighbour_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/object_base.cpp (100%) rename {src/vpp-api => extras/vom}/vom/object_base.hpp (100%) rename {src/vpp-api => extras/vom}/vom/om.cpp (100%) rename {src/vpp-api => extras/vom}/vom/om.hpp (100%) rename {src/vpp-api => extras/vom}/vom/prefix.cpp (100%) rename {src/vpp-api => extras/vom}/vom/prefix.hpp (100%) rename {src/vpp-api => extras/vom}/vom/ra_config.cpp (100%) rename {src/vpp-api => extras/vom}/vom/ra_config.hpp (100%) rename {src/vpp-api => extras/vom}/vom/ra_prefix.cpp (100%) rename {src/vpp-api => extras/vom}/vom/ra_prefix.hpp (100%) rename {src/vpp-api => extras/vom}/vom/route.cpp (100%) rename {src/vpp-api => extras/vom}/vom/route.hpp (100%) rename {src/vpp-api => extras/vom}/vom/route_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/route_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/route_domain.cpp (100%) rename {src/vpp-api => extras/vom}/vom/route_domain.hpp (100%) rename {src/vpp-api => extras/vom}/vom/route_domain_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/route_domain_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/rpc_cmd.hpp (100%) rename {src/vpp-api => extras/vom}/vom/singular_db.hpp (100%) rename {src/vpp-api => extras/vom}/vom/singular_db_funcs.hpp (100%) rename {src/vpp-api => extras/vom}/vom/sub_interface.cpp (100%) rename {src/vpp-api => extras/vom}/vom/sub_interface.hpp (100%) rename {src/vpp-api => extras/vom}/vom/sub_interface_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/sub_interface_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/tap_interface.cpp (100%) rename {src/vpp-api => extras/vom}/vom/tap_interface.hpp (100%) rename {src/vpp-api => extras/vom}/vom/tap_interface_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/tap_interface_cmds.hpp (100%) rename {src/vpp-api => extras/vom}/vom/types.cpp (100%) rename {src/vpp-api => extras/vom}/vom/types.hpp (100%) rename {src/vpp-api => extras/vom}/vom/vxlan_tunnel.cpp (100%) rename {src/vpp-api => extras/vom}/vom/vxlan_tunnel.hpp (100%) rename {src/vpp-api => extras/vom}/vom/vxlan_tunnel_cmds.cpp (100%) rename {src/vpp-api => extras/vom}/vom/vxlan_tunnel_cmds.hpp (100%) diff --git a/Makefile b/Makefile index 278aef35f99..1c6fafaeb34 100644 --- a/Makefile +++ b/Makefile @@ -353,7 +353,7 @@ export VPP_PYTHON_PREFIX ?= $(BR)/python libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3))) define test - $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,) + $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install vom-install,) $(eval libs:=lib lib64) make -C test \ TEST_DIR=$(WS_ROOT)/test \ @@ -527,6 +527,8 @@ verify: install-dep $(BR)/.deps.ok dpdk-install-dev @make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install $(call banner,"Building libmemif") @make -C build-root PLATFORM=vpp TAG=vpp libmemif-install + $(call banner,"Building VOM") + @make -C build-root PLATFORM=vpp TAG=vpp vom-install $(call banner,"Building $(PKG) packages") @make pkg-$(PKG) ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04) diff --git a/build-data/packages/vom.mk b/build-data/packages/vom.mk new file mode 100644 index 00000000000..a156ea8671c --- /dev/null +++ b/build-data/packages/vom.mk @@ -0,0 +1,6 @@ +vom_configure_depend = vpp-install +vom_source = extras +vom_configure_subdir = vom +vom_CPPFLAGS = $(call installed_includes_fn, vpp) +vom_LDFLAGS = $(call installed_libs_fn, vpp) + diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk index 320609ded2b..57501819c7e 100644 --- a/build-data/platforms/vpp.mk +++ b/build-data/platforms/vpp.mk @@ -26,7 +26,7 @@ vpp_uses_dpdk = yes # Uncoment to enable building unit tests # vpp_enable_tests = yes -vpp_root_packages = vpp +vpp_root_packages = vpp vom # DPDK configuration parameters # vpp_uses_dpdk_mlx5_pmd = yes @@ -42,10 +42,6 @@ ifeq ($(MACHINE),i686) vpp_configure_args_vpp += --disable-lb-plugin endif -# To disable the VPP object model build - and save about half the build time - -# uncomment the following... -# vpp_configure_args_vpp += --disable-vom - vpp_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 \ -fstack-protector-all -fPIC -Werror vpp_debug_TAG_CXXFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 \ diff --git a/extras/vom/Makefile.am b/extras/vom/Makefile.am new file mode 100644 index 00000000000..51e8dab63de --- /dev/null +++ b/extras/vom/Makefile.am @@ -0,0 +1,5 @@ + + +AUTOMAKE_OPTIONS = foreign subdir-objects + +SUBDIRS = vom diff --git a/extras/vom/configure.ac b/extras/vom/configure.ac new file mode 100644 index 00000000000..0e15095e117 --- /dev/null +++ b/extras/vom/configure.ac @@ -0,0 +1,20 @@ +AC_INIT(vom, 18.07) +LT_INIT +AM_INIT_AUTOMAKE +AM_SILENT_RULES([yes]) +AC_PREFIX_DEFAULT([/usr]) + +PKG_CHECK_MODULES([CHECK], [check], [HAVE_CHECK=1], [HAVE_CHECK=0]) +AM_CONDITIONAL([USE_CHECK],[test "$HAVE_CHECK" -eq 1]) + +AC_PROG_CC +AC_PROG_CXX + +AM_CONDITIONAL(ENABLE_ACL_PLUGIN, test "yes" = "yes") +AM_CONDITIONAL(ENABLE_NAT_PLUGIN, test "yes" = "yes") +AM_CONDITIONAL(ENABLE_L2E_PLUGIN, test "yes" = "yes") +AM_CONDITIONAL(ENABLE_GBP_PLUGIN, test "yes" = "yes") + +AC_OUTPUT([Makefile vom/Makefile]) + +AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/vpp-api/vom/.clang-format b/extras/vom/vom/.clang-format similarity index 100% rename from src/vpp-api/vom/.clang-format rename to extras/vom/vom/.clang-format diff --git a/src/vpp-api/vom/Makefile.am b/extras/vom/vom/Makefile.am similarity index 96% rename from src/vpp-api/vom/Makefile.am rename to extras/vom/vom/Makefile.am index f802849d758..892f437976e 100644 --- a/src/vpp-api/vom/Makefile.am +++ b/extras/vom/vom/Makefile.am @@ -15,7 +15,7 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 AM_LIBTOOLFLAGS = --quiet -AM_CXXFLAGS = -Wall -Werror -std=gnu++11 -I${top_srcdir} -I${top_builddir}/vpp-api/vapi/ -I$(top_srcdir)/vpp-api/ -I${libdir}/../include +AM_CXXFLAGS = -Wall -Werror -std=gnu++11 -I${top_srcdir} bin_PROGRAMS = noinst_LTLIBRARIES = @@ -25,7 +25,7 @@ lib_LTLIBRARIES = libvom.la libvom_la_DEPENDENCIES = libvom_la_LIBADD = \ - $(top_builddir)/vpp-api/vapi/libvapiclient.la \ + -lvapiclient \ -lpthread \ -lboost_thread \ $(BOOST_SYSTEM_LIB) \ diff --git a/src/vpp-api/vom/acl_binding.cpp b/extras/vom/vom/acl_binding.cpp similarity index 100% rename from src/vpp-api/vom/acl_binding.cpp rename to extras/vom/vom/acl_binding.cpp diff --git a/src/vpp-api/vom/acl_binding.hpp b/extras/vom/vom/acl_binding.hpp similarity index 100% rename from src/vpp-api/vom/acl_binding.hpp rename to extras/vom/vom/acl_binding.hpp diff --git a/src/vpp-api/vom/acl_binding_cmds.cpp b/extras/vom/vom/acl_binding_cmds.cpp similarity index 100% rename from src/vpp-api/vom/acl_binding_cmds.cpp rename to extras/vom/vom/acl_binding_cmds.cpp diff --git a/src/vpp-api/vom/acl_binding_cmds.hpp b/extras/vom/vom/acl_binding_cmds.hpp similarity index 100% rename from src/vpp-api/vom/acl_binding_cmds.hpp rename to extras/vom/vom/acl_binding_cmds.hpp diff --git a/src/vpp-api/vom/acl_ethertype.cpp b/extras/vom/vom/acl_ethertype.cpp similarity index 100% rename from src/vpp-api/vom/acl_ethertype.cpp rename to extras/vom/vom/acl_ethertype.cpp diff --git a/src/vpp-api/vom/acl_ethertype.hpp b/extras/vom/vom/acl_ethertype.hpp similarity index 100% rename from src/vpp-api/vom/acl_ethertype.hpp rename to extras/vom/vom/acl_ethertype.hpp diff --git a/src/vpp-api/vom/acl_ethertype_cmds.cpp b/extras/vom/vom/acl_ethertype_cmds.cpp similarity index 100% rename from src/vpp-api/vom/acl_ethertype_cmds.cpp rename to extras/vom/vom/acl_ethertype_cmds.cpp diff --git a/src/vpp-api/vom/acl_ethertype_cmds.hpp b/extras/vom/vom/acl_ethertype_cmds.hpp similarity index 100% rename from src/vpp-api/vom/acl_ethertype_cmds.hpp rename to extras/vom/vom/acl_ethertype_cmds.hpp diff --git a/src/vpp-api/vom/acl_l2_rule.cpp b/extras/vom/vom/acl_l2_rule.cpp similarity index 100% rename from src/vpp-api/vom/acl_l2_rule.cpp rename to extras/vom/vom/acl_l2_rule.cpp diff --git a/src/vpp-api/vom/acl_l2_rule.hpp b/extras/vom/vom/acl_l2_rule.hpp similarity index 100% rename from src/vpp-api/vom/acl_l2_rule.hpp rename to extras/vom/vom/acl_l2_rule.hpp diff --git a/src/vpp-api/vom/acl_l3_rule.cpp b/extras/vom/vom/acl_l3_rule.cpp similarity index 100% rename from src/vpp-api/vom/acl_l3_rule.cpp rename to extras/vom/vom/acl_l3_rule.cpp diff --git a/src/vpp-api/vom/acl_l3_rule.hpp b/extras/vom/vom/acl_l3_rule.hpp similarity index 100% rename from src/vpp-api/vom/acl_l3_rule.hpp rename to extras/vom/vom/acl_l3_rule.hpp diff --git a/src/vpp-api/vom/acl_list.cpp b/extras/vom/vom/acl_list.cpp similarity index 100% rename from src/vpp-api/vom/acl_list.cpp rename to extras/vom/vom/acl_list.cpp diff --git a/src/vpp-api/vom/acl_list.hpp b/extras/vom/vom/acl_list.hpp similarity index 100% rename from src/vpp-api/vom/acl_list.hpp rename to extras/vom/vom/acl_list.hpp diff --git a/src/vpp-api/vom/acl_list_cmds.cpp b/extras/vom/vom/acl_list_cmds.cpp similarity index 100% rename from src/vpp-api/vom/acl_list_cmds.cpp rename to extras/vom/vom/acl_list_cmds.cpp diff --git a/src/vpp-api/vom/acl_list_cmds.hpp b/extras/vom/vom/acl_list_cmds.hpp similarity index 100% rename from src/vpp-api/vom/acl_list_cmds.hpp rename to extras/vom/vom/acl_list_cmds.hpp diff --git a/src/vpp-api/vom/acl_types.cpp b/extras/vom/vom/acl_types.cpp similarity index 100% rename from src/vpp-api/vom/acl_types.cpp rename to extras/vom/vom/acl_types.cpp diff --git a/src/vpp-api/vom/acl_types.hpp b/extras/vom/vom/acl_types.hpp similarity index 100% rename from src/vpp-api/vom/acl_types.hpp rename to extras/vom/vom/acl_types.hpp diff --git a/src/vpp-api/vom/arp_proxy_binding.cpp b/extras/vom/vom/arp_proxy_binding.cpp similarity index 100% rename from src/vpp-api/vom/arp_proxy_binding.cpp rename to extras/vom/vom/arp_proxy_binding.cpp diff --git a/src/vpp-api/vom/arp_proxy_binding.hpp b/extras/vom/vom/arp_proxy_binding.hpp similarity index 100% rename from src/vpp-api/vom/arp_proxy_binding.hpp rename to extras/vom/vom/arp_proxy_binding.hpp diff --git a/src/vpp-api/vom/arp_proxy_binding_cmds.cpp b/extras/vom/vom/arp_proxy_binding_cmds.cpp similarity index 100% rename from src/vpp-api/vom/arp_proxy_binding_cmds.cpp rename to extras/vom/vom/arp_proxy_binding_cmds.cpp diff --git a/src/vpp-api/vom/arp_proxy_binding_cmds.hpp b/extras/vom/vom/arp_proxy_binding_cmds.hpp similarity index 100% rename from src/vpp-api/vom/arp_proxy_binding_cmds.hpp rename to extras/vom/vom/arp_proxy_binding_cmds.hpp diff --git a/src/vpp-api/vom/arp_proxy_config.cpp b/extras/vom/vom/arp_proxy_config.cpp similarity index 100% rename from src/vpp-api/vom/arp_proxy_config.cpp rename to extras/vom/vom/arp_proxy_config.cpp diff --git a/src/vpp-api/vom/arp_proxy_config.hpp b/extras/vom/vom/arp_proxy_config.hpp similarity index 100% rename from src/vpp-api/vom/arp_proxy_config.hpp rename to extras/vom/vom/arp_proxy_config.hpp diff --git a/src/vpp-api/vom/arp_proxy_config_cmds.cpp b/extras/vom/vom/arp_proxy_config_cmds.cpp similarity index 100% rename from src/vpp-api/vom/arp_proxy_config_cmds.cpp rename to extras/vom/vom/arp_proxy_config_cmds.cpp diff --git a/src/vpp-api/vom/arp_proxy_config_cmds.hpp b/extras/vom/vom/arp_proxy_config_cmds.hpp similarity index 100% rename from src/vpp-api/vom/arp_proxy_config_cmds.hpp rename to extras/vom/vom/arp_proxy_config_cmds.hpp diff --git a/src/vpp-api/vom/bond_group_binding.cpp b/extras/vom/vom/bond_group_binding.cpp similarity index 100% rename from src/vpp-api/vom/bond_group_binding.cpp rename to extras/vom/vom/bond_group_binding.cpp diff --git a/src/vpp-api/vom/bond_group_binding.hpp b/extras/vom/vom/bond_group_binding.hpp similarity index 100% rename from src/vpp-api/vom/bond_group_binding.hpp rename to extras/vom/vom/bond_group_binding.hpp diff --git a/src/vpp-api/vom/bond_group_binding_cmds.cpp b/extras/vom/vom/bond_group_binding_cmds.cpp similarity index 100% rename from src/vpp-api/vom/bond_group_binding_cmds.cpp rename to extras/vom/vom/bond_group_binding_cmds.cpp diff --git a/src/vpp-api/vom/bond_group_binding_cmds.hpp b/extras/vom/vom/bond_group_binding_cmds.hpp similarity index 100% rename from src/vpp-api/vom/bond_group_binding_cmds.hpp rename to extras/vom/vom/bond_group_binding_cmds.hpp diff --git a/src/vpp-api/vom/bond_interface.cpp b/extras/vom/vom/bond_interface.cpp similarity index 100% rename from src/vpp-api/vom/bond_interface.cpp rename to extras/vom/vom/bond_interface.cpp diff --git a/src/vpp-api/vom/bond_interface.hpp b/extras/vom/vom/bond_interface.hpp similarity index 100% rename from src/vpp-api/vom/bond_interface.hpp rename to extras/vom/vom/bond_interface.hpp diff --git a/src/vpp-api/vom/bond_interface_cmds.cpp b/extras/vom/vom/bond_interface_cmds.cpp similarity index 100% rename from src/vpp-api/vom/bond_interface_cmds.cpp rename to extras/vom/vom/bond_interface_cmds.cpp diff --git a/src/vpp-api/vom/bond_interface_cmds.hpp b/extras/vom/vom/bond_interface_cmds.hpp similarity index 100% rename from src/vpp-api/vom/bond_interface_cmds.hpp rename to extras/vom/vom/bond_interface_cmds.hpp diff --git a/src/vpp-api/vom/bond_member.cpp b/extras/vom/vom/bond_member.cpp similarity index 100% rename from src/vpp-api/vom/bond_member.cpp rename to extras/vom/vom/bond_member.cpp diff --git a/src/vpp-api/vom/bond_member.hpp b/extras/vom/vom/bond_member.hpp similarity index 100% rename from src/vpp-api/vom/bond_member.hpp rename to extras/vom/vom/bond_member.hpp diff --git a/src/vpp-api/vom/bridge_domain.cpp b/extras/vom/vom/bridge_domain.cpp similarity index 100% rename from src/vpp-api/vom/bridge_domain.cpp rename to extras/vom/vom/bridge_domain.cpp diff --git a/src/vpp-api/vom/bridge_domain.hpp b/extras/vom/vom/bridge_domain.hpp similarity index 100% rename from src/vpp-api/vom/bridge_domain.hpp rename to extras/vom/vom/bridge_domain.hpp diff --git a/src/vpp-api/vom/bridge_domain_arp_entry.cpp b/extras/vom/vom/bridge_domain_arp_entry.cpp similarity index 100% rename from src/vpp-api/vom/bridge_domain_arp_entry.cpp rename to extras/vom/vom/bridge_domain_arp_entry.cpp diff --git a/src/vpp-api/vom/bridge_domain_arp_entry.hpp b/extras/vom/vom/bridge_domain_arp_entry.hpp similarity index 100% rename from src/vpp-api/vom/bridge_domain_arp_entry.hpp rename to extras/vom/vom/bridge_domain_arp_entry.hpp diff --git a/src/vpp-api/vom/bridge_domain_arp_entry_cmds.cpp b/extras/vom/vom/bridge_domain_arp_entry_cmds.cpp similarity index 100% rename from src/vpp-api/vom/bridge_domain_arp_entry_cmds.cpp rename to extras/vom/vom/bridge_domain_arp_entry_cmds.cpp diff --git a/src/vpp-api/vom/bridge_domain_arp_entry_cmds.hpp b/extras/vom/vom/bridge_domain_arp_entry_cmds.hpp similarity index 100% rename from src/vpp-api/vom/bridge_domain_arp_entry_cmds.hpp rename to extras/vom/vom/bridge_domain_arp_entry_cmds.hpp diff --git a/src/vpp-api/vom/bridge_domain_cmds.cpp b/extras/vom/vom/bridge_domain_cmds.cpp similarity index 100% rename from src/vpp-api/vom/bridge_domain_cmds.cpp rename to extras/vom/vom/bridge_domain_cmds.cpp diff --git a/src/vpp-api/vom/bridge_domain_cmds.hpp b/extras/vom/vom/bridge_domain_cmds.hpp similarity index 100% rename from src/vpp-api/vom/bridge_domain_cmds.hpp rename to extras/vom/vom/bridge_domain_cmds.hpp diff --git a/src/vpp-api/vom/bridge_domain_entry.cpp b/extras/vom/vom/bridge_domain_entry.cpp similarity index 100% rename from src/vpp-api/vom/bridge_domain_entry.cpp rename to extras/vom/vom/bridge_domain_entry.cpp diff --git a/src/vpp-api/vom/bridge_domain_entry.hpp b/extras/vom/vom/bridge_domain_entry.hpp similarity index 100% rename from src/vpp-api/vom/bridge_domain_entry.hpp rename to extras/vom/vom/bridge_domain_entry.hpp diff --git a/src/vpp-api/vom/bridge_domain_entry_cmds.cpp b/extras/vom/vom/bridge_domain_entry_cmds.cpp similarity index 100% rename from src/vpp-api/vom/bridge_domain_entry_cmds.cpp rename to extras/vom/vom/bridge_domain_entry_cmds.cpp diff --git a/src/vpp-api/vom/bridge_domain_entry_cmds.hpp b/extras/vom/vom/bridge_domain_entry_cmds.hpp similarity index 100% rename from src/vpp-api/vom/bridge_domain_entry_cmds.hpp rename to extras/vom/vom/bridge_domain_entry_cmds.hpp diff --git a/src/vpp-api/vom/client_db.cpp b/extras/vom/vom/client_db.cpp similarity index 100% rename from src/vpp-api/vom/client_db.cpp rename to extras/vom/vom/client_db.cpp diff --git a/src/vpp-api/vom/client_db.hpp b/extras/vom/vom/client_db.hpp similarity index 100% rename from src/vpp-api/vom/client_db.hpp rename to extras/vom/vom/client_db.hpp diff --git a/src/vpp-api/vom/cmd.cpp b/extras/vom/vom/cmd.cpp similarity index 100% rename from src/vpp-api/vom/cmd.cpp rename to extras/vom/vom/cmd.cpp diff --git a/src/vpp-api/vom/cmd.hpp b/extras/vom/vom/cmd.hpp similarity index 100% rename from src/vpp-api/vom/cmd.hpp rename to extras/vom/vom/cmd.hpp diff --git a/src/vpp-api/vom/connection.cpp b/extras/vom/vom/connection.cpp similarity index 100% rename from src/vpp-api/vom/connection.cpp rename to extras/vom/vom/connection.cpp diff --git a/src/vpp-api/vom/connection.hpp b/extras/vom/vom/connection.hpp similarity index 100% rename from src/vpp-api/vom/connection.hpp rename to extras/vom/vom/connection.hpp diff --git a/src/vpp-api/vom/dhcp_config.cpp b/extras/vom/vom/dhcp_config.cpp similarity index 100% rename from src/vpp-api/vom/dhcp_config.cpp rename to extras/vom/vom/dhcp_config.cpp diff --git a/src/vpp-api/vom/dhcp_config.hpp b/extras/vom/vom/dhcp_config.hpp similarity index 100% rename from src/vpp-api/vom/dhcp_config.hpp rename to extras/vom/vom/dhcp_config.hpp diff --git a/src/vpp-api/vom/dhcp_config_cmds.cpp b/extras/vom/vom/dhcp_config_cmds.cpp similarity index 100% rename from src/vpp-api/vom/dhcp_config_cmds.cpp rename to extras/vom/vom/dhcp_config_cmds.cpp diff --git a/src/vpp-api/vom/dhcp_config_cmds.hpp b/extras/vom/vom/dhcp_config_cmds.hpp similarity index 100% rename from src/vpp-api/vom/dhcp_config_cmds.hpp rename to extras/vom/vom/dhcp_config_cmds.hpp diff --git a/src/vpp-api/vom/dump_cmd.hpp b/extras/vom/vom/dump_cmd.hpp similarity index 100% rename from src/vpp-api/vom/dump_cmd.hpp rename to extras/vom/vom/dump_cmd.hpp diff --git a/src/vpp-api/vom/enum_base.hpp b/extras/vom/vom/enum_base.hpp similarity index 100% rename from src/vpp-api/vom/enum_base.hpp rename to extras/vom/vom/enum_base.hpp diff --git a/src/vpp-api/vom/event_cmd.hpp b/extras/vom/vom/event_cmd.hpp similarity index 100% rename from src/vpp-api/vom/event_cmd.hpp rename to extras/vom/vom/event_cmd.hpp diff --git a/src/vpp-api/vom/gbp_contract.cpp b/extras/vom/vom/gbp_contract.cpp similarity index 100% rename from src/vpp-api/vom/gbp_contract.cpp rename to extras/vom/vom/gbp_contract.cpp diff --git a/src/vpp-api/vom/gbp_contract.hpp b/extras/vom/vom/gbp_contract.hpp similarity index 100% rename from src/vpp-api/vom/gbp_contract.hpp rename to extras/vom/vom/gbp_contract.hpp diff --git a/src/vpp-api/vom/gbp_contract_cmds.cpp b/extras/vom/vom/gbp_contract_cmds.cpp similarity index 100% rename from src/vpp-api/vom/gbp_contract_cmds.cpp rename to extras/vom/vom/gbp_contract_cmds.cpp diff --git a/src/vpp-api/vom/gbp_contract_cmds.hpp b/extras/vom/vom/gbp_contract_cmds.hpp similarity index 100% rename from src/vpp-api/vom/gbp_contract_cmds.hpp rename to extras/vom/vom/gbp_contract_cmds.hpp diff --git a/src/vpp-api/vom/gbp_endpoint.cpp b/extras/vom/vom/gbp_endpoint.cpp similarity index 100% rename from src/vpp-api/vom/gbp_endpoint.cpp rename to extras/vom/vom/gbp_endpoint.cpp diff --git a/src/vpp-api/vom/gbp_endpoint.hpp b/extras/vom/vom/gbp_endpoint.hpp similarity index 100% rename from src/vpp-api/vom/gbp_endpoint.hpp rename to extras/vom/vom/gbp_endpoint.hpp diff --git a/src/vpp-api/vom/gbp_endpoint_cmds.cpp b/extras/vom/vom/gbp_endpoint_cmds.cpp similarity index 100% rename from src/vpp-api/vom/gbp_endpoint_cmds.cpp rename to extras/vom/vom/gbp_endpoint_cmds.cpp diff --git a/src/vpp-api/vom/gbp_endpoint_cmds.hpp b/extras/vom/vom/gbp_endpoint_cmds.hpp similarity index 100% rename from src/vpp-api/vom/gbp_endpoint_cmds.hpp rename to extras/vom/vom/gbp_endpoint_cmds.hpp diff --git a/src/vpp-api/vom/gbp_endpoint_group.cpp b/extras/vom/vom/gbp_endpoint_group.cpp similarity index 100% rename from src/vpp-api/vom/gbp_endpoint_group.cpp rename to extras/vom/vom/gbp_endpoint_group.cpp diff --git a/src/vpp-api/vom/gbp_endpoint_group.hpp b/extras/vom/vom/gbp_endpoint_group.hpp similarity index 100% rename from src/vpp-api/vom/gbp_endpoint_group.hpp rename to extras/vom/vom/gbp_endpoint_group.hpp diff --git a/src/vpp-api/vom/gbp_endpoint_group_cmds.cpp b/extras/vom/vom/gbp_endpoint_group_cmds.cpp similarity index 100% rename from src/vpp-api/vom/gbp_endpoint_group_cmds.cpp rename to extras/vom/vom/gbp_endpoint_group_cmds.cpp diff --git a/src/vpp-api/vom/gbp_endpoint_group_cmds.hpp b/extras/vom/vom/gbp_endpoint_group_cmds.hpp similarity index 100% rename from src/vpp-api/vom/gbp_endpoint_group_cmds.hpp rename to extras/vom/vom/gbp_endpoint_group_cmds.hpp diff --git a/src/vpp-api/vom/gbp_recirc.cpp b/extras/vom/vom/gbp_recirc.cpp similarity index 100% rename from src/vpp-api/vom/gbp_recirc.cpp rename to extras/vom/vom/gbp_recirc.cpp diff --git a/src/vpp-api/vom/gbp_recirc.hpp b/extras/vom/vom/gbp_recirc.hpp similarity index 100% rename from src/vpp-api/vom/gbp_recirc.hpp rename to extras/vom/vom/gbp_recirc.hpp diff --git a/src/vpp-api/vom/gbp_recirc_cmds.cpp b/extras/vom/vom/gbp_recirc_cmds.cpp similarity index 100% rename from src/vpp-api/vom/gbp_recirc_cmds.cpp rename to extras/vom/vom/gbp_recirc_cmds.cpp diff --git a/src/vpp-api/vom/gbp_recirc_cmds.hpp b/extras/vom/vom/gbp_recirc_cmds.hpp similarity index 100% rename from src/vpp-api/vom/gbp_recirc_cmds.hpp rename to extras/vom/vom/gbp_recirc_cmds.hpp diff --git a/src/vpp-api/vom/gbp_subnet.cpp b/extras/vom/vom/gbp_subnet.cpp similarity index 100% rename from src/vpp-api/vom/gbp_subnet.cpp rename to extras/vom/vom/gbp_subnet.cpp diff --git a/src/vpp-api/vom/gbp_subnet.hpp b/extras/vom/vom/gbp_subnet.hpp similarity index 100% rename from src/vpp-api/vom/gbp_subnet.hpp rename to extras/vom/vom/gbp_subnet.hpp diff --git a/src/vpp-api/vom/gbp_subnet_cmds.cpp b/extras/vom/vom/gbp_subnet_cmds.cpp similarity index 100% rename from src/vpp-api/vom/gbp_subnet_cmds.cpp rename to extras/vom/vom/gbp_subnet_cmds.cpp diff --git a/src/vpp-api/vom/gbp_subnet_cmds.hpp b/extras/vom/vom/gbp_subnet_cmds.hpp similarity index 100% rename from src/vpp-api/vom/gbp_subnet_cmds.hpp rename to extras/vom/vom/gbp_subnet_cmds.hpp diff --git a/src/vpp-api/vom/hw.cpp b/extras/vom/vom/hw.cpp similarity index 100% rename from src/vpp-api/vom/hw.cpp rename to extras/vom/vom/hw.cpp diff --git a/src/vpp-api/vom/hw.hpp b/extras/vom/vom/hw.hpp similarity index 100% rename from src/vpp-api/vom/hw.hpp rename to extras/vom/vom/hw.hpp diff --git a/src/vpp-api/vom/hw_cmds.cpp b/extras/vom/vom/hw_cmds.cpp similarity index 100% rename from src/vpp-api/vom/hw_cmds.cpp rename to extras/vom/vom/hw_cmds.cpp diff --git a/src/vpp-api/vom/hw_cmds.hpp b/extras/vom/vom/hw_cmds.hpp similarity index 100% rename from src/vpp-api/vom/hw_cmds.hpp rename to extras/vom/vom/hw_cmds.hpp diff --git a/src/vpp-api/vom/inspect.cpp b/extras/vom/vom/inspect.cpp similarity index 100% rename from src/vpp-api/vom/inspect.cpp rename to extras/vom/vom/inspect.cpp diff --git a/src/vpp-api/vom/inspect.hpp b/extras/vom/vom/inspect.hpp similarity index 100% rename from src/vpp-api/vom/inspect.hpp rename to extras/vom/vom/inspect.hpp diff --git a/src/vpp-api/vom/interface.cpp b/extras/vom/vom/interface.cpp similarity index 100% rename from src/vpp-api/vom/interface.cpp rename to extras/vom/vom/interface.cpp diff --git a/src/vpp-api/vom/interface.hpp b/extras/vom/vom/interface.hpp similarity index 100% rename from src/vpp-api/vom/interface.hpp rename to extras/vom/vom/interface.hpp diff --git a/src/vpp-api/vom/interface_cmds.cpp b/extras/vom/vom/interface_cmds.cpp similarity index 100% rename from src/vpp-api/vom/interface_cmds.cpp rename to extras/vom/vom/interface_cmds.cpp diff --git a/src/vpp-api/vom/interface_cmds.hpp b/extras/vom/vom/interface_cmds.hpp similarity index 100% rename from src/vpp-api/vom/interface_cmds.hpp rename to extras/vom/vom/interface_cmds.hpp diff --git a/src/vpp-api/vom/interface_factory.cpp b/extras/vom/vom/interface_factory.cpp similarity index 100% rename from src/vpp-api/vom/interface_factory.cpp rename to extras/vom/vom/interface_factory.cpp diff --git a/src/vpp-api/vom/interface_factory.hpp b/extras/vom/vom/interface_factory.hpp similarity index 100% rename from src/vpp-api/vom/interface_factory.hpp rename to extras/vom/vom/interface_factory.hpp diff --git a/src/vpp-api/vom/interface_ip6_nd.hpp b/extras/vom/vom/interface_ip6_nd.hpp similarity index 100% rename from src/vpp-api/vom/interface_ip6_nd.hpp rename to extras/vom/vom/interface_ip6_nd.hpp diff --git a/src/vpp-api/vom/interface_ip6_nd_cmds.cpp b/extras/vom/vom/interface_ip6_nd_cmds.cpp similarity index 100% rename from src/vpp-api/vom/interface_ip6_nd_cmds.cpp rename to extras/vom/vom/interface_ip6_nd_cmds.cpp diff --git a/src/vpp-api/vom/interface_span.cpp b/extras/vom/vom/interface_span.cpp similarity index 100% rename from src/vpp-api/vom/interface_span.cpp rename to extras/vom/vom/interface_span.cpp diff --git a/src/vpp-api/vom/interface_span.hpp b/extras/vom/vom/interface_span.hpp similarity index 100% rename from src/vpp-api/vom/interface_span.hpp rename to extras/vom/vom/interface_span.hpp diff --git a/src/vpp-api/vom/interface_span_cmds.cpp b/extras/vom/vom/interface_span_cmds.cpp similarity index 100% rename from src/vpp-api/vom/interface_span_cmds.cpp rename to extras/vom/vom/interface_span_cmds.cpp diff --git a/src/vpp-api/vom/interface_span_cmds.hpp b/extras/vom/vom/interface_span_cmds.hpp similarity index 100% rename from src/vpp-api/vom/interface_span_cmds.hpp rename to extras/vom/vom/interface_span_cmds.hpp diff --git a/src/vpp-api/vom/interface_types.cpp b/extras/vom/vom/interface_types.cpp similarity index 100% rename from src/vpp-api/vom/interface_types.cpp rename to extras/vom/vom/interface_types.cpp diff --git a/src/vpp-api/vom/ip_unnumbered.cpp b/extras/vom/vom/ip_unnumbered.cpp similarity index 100% rename from src/vpp-api/vom/ip_unnumbered.cpp rename to extras/vom/vom/ip_unnumbered.cpp diff --git a/src/vpp-api/vom/ip_unnumbered.hpp b/extras/vom/vom/ip_unnumbered.hpp similarity index 100% rename from src/vpp-api/vom/ip_unnumbered.hpp rename to extras/vom/vom/ip_unnumbered.hpp diff --git a/src/vpp-api/vom/ip_unnumbered_cmds.cpp b/extras/vom/vom/ip_unnumbered_cmds.cpp similarity index 100% rename from src/vpp-api/vom/ip_unnumbered_cmds.cpp rename to extras/vom/vom/ip_unnumbered_cmds.cpp diff --git a/src/vpp-api/vom/ip_unnumbered_cmds.hpp b/extras/vom/vom/ip_unnumbered_cmds.hpp similarity index 100% rename from src/vpp-api/vom/ip_unnumbered_cmds.hpp rename to extras/vom/vom/ip_unnumbered_cmds.hpp diff --git a/src/vpp-api/vom/l2_binding.cpp b/extras/vom/vom/l2_binding.cpp similarity index 100% rename from src/vpp-api/vom/l2_binding.cpp rename to extras/vom/vom/l2_binding.cpp diff --git a/src/vpp-api/vom/l2_binding.hpp b/extras/vom/vom/l2_binding.hpp similarity index 100% rename from src/vpp-api/vom/l2_binding.hpp rename to extras/vom/vom/l2_binding.hpp diff --git a/src/vpp-api/vom/l2_binding_cmds.cpp b/extras/vom/vom/l2_binding_cmds.cpp similarity index 100% rename from src/vpp-api/vom/l2_binding_cmds.cpp rename to extras/vom/vom/l2_binding_cmds.cpp diff --git a/src/vpp-api/vom/l2_binding_cmds.hpp b/extras/vom/vom/l2_binding_cmds.hpp similarity index 100% rename from src/vpp-api/vom/l2_binding_cmds.hpp rename to extras/vom/vom/l2_binding_cmds.hpp diff --git a/src/vpp-api/vom/l2_emulation.cpp b/extras/vom/vom/l2_emulation.cpp similarity index 100% rename from src/vpp-api/vom/l2_emulation.cpp rename to extras/vom/vom/l2_emulation.cpp diff --git a/src/vpp-api/vom/l2_emulation.hpp b/extras/vom/vom/l2_emulation.hpp similarity index 100% rename from src/vpp-api/vom/l2_emulation.hpp rename to extras/vom/vom/l2_emulation.hpp diff --git a/src/vpp-api/vom/l2_emulation_cmds.cpp b/extras/vom/vom/l2_emulation_cmds.cpp similarity index 100% rename from src/vpp-api/vom/l2_emulation_cmds.cpp rename to extras/vom/vom/l2_emulation_cmds.cpp diff --git a/src/vpp-api/vom/l2_emulation_cmds.hpp b/extras/vom/vom/l2_emulation_cmds.hpp similarity index 100% rename from src/vpp-api/vom/l2_emulation_cmds.hpp rename to extras/vom/vom/l2_emulation_cmds.hpp diff --git a/src/vpp-api/vom/l3_binding.cpp b/extras/vom/vom/l3_binding.cpp similarity index 100% rename from src/vpp-api/vom/l3_binding.cpp rename to extras/vom/vom/l3_binding.cpp diff --git a/src/vpp-api/vom/l3_binding.hpp b/extras/vom/vom/l3_binding.hpp similarity index 100% rename from src/vpp-api/vom/l3_binding.hpp rename to extras/vom/vom/l3_binding.hpp diff --git a/src/vpp-api/vom/l3_binding_cmds.cpp b/extras/vom/vom/l3_binding_cmds.cpp similarity index 100% rename from src/vpp-api/vom/l3_binding_cmds.cpp rename to extras/vom/vom/l3_binding_cmds.cpp diff --git a/src/vpp-api/vom/l3_binding_cmds.hpp b/extras/vom/vom/l3_binding_cmds.hpp similarity index 100% rename from src/vpp-api/vom/l3_binding_cmds.hpp rename to extras/vom/vom/l3_binding_cmds.hpp diff --git a/src/vpp-api/vom/lldp_binding.cpp b/extras/vom/vom/lldp_binding.cpp similarity index 100% rename from src/vpp-api/vom/lldp_binding.cpp rename to extras/vom/vom/lldp_binding.cpp diff --git a/src/vpp-api/vom/lldp_binding.hpp b/extras/vom/vom/lldp_binding.hpp similarity index 100% rename from src/vpp-api/vom/lldp_binding.hpp rename to extras/vom/vom/lldp_binding.hpp diff --git a/src/vpp-api/vom/lldp_binding_cmds.cpp b/extras/vom/vom/lldp_binding_cmds.cpp similarity index 100% rename from src/vpp-api/vom/lldp_binding_cmds.cpp rename to extras/vom/vom/lldp_binding_cmds.cpp diff --git a/src/vpp-api/vom/lldp_binding_cmds.hpp b/extras/vom/vom/lldp_binding_cmds.hpp similarity index 100% rename from src/vpp-api/vom/lldp_binding_cmds.hpp rename to extras/vom/vom/lldp_binding_cmds.hpp diff --git a/src/vpp-api/vom/lldp_global.cpp b/extras/vom/vom/lldp_global.cpp similarity index 100% rename from src/vpp-api/vom/lldp_global.cpp rename to extras/vom/vom/lldp_global.cpp diff --git a/src/vpp-api/vom/lldp_global.hpp b/extras/vom/vom/lldp_global.hpp similarity index 100% rename from src/vpp-api/vom/lldp_global.hpp rename to extras/vom/vom/lldp_global.hpp diff --git a/src/vpp-api/vom/lldp_global_cmds.cpp b/extras/vom/vom/lldp_global_cmds.cpp similarity index 100% rename from src/vpp-api/vom/lldp_global_cmds.cpp rename to extras/vom/vom/lldp_global_cmds.cpp diff --git a/src/vpp-api/vom/lldp_global_cmds.hpp b/extras/vom/vom/lldp_global_cmds.hpp similarity index 100% rename from src/vpp-api/vom/lldp_global_cmds.hpp rename to extras/vom/vom/lldp_global_cmds.hpp diff --git a/src/vpp-api/vom/logger.cpp b/extras/vom/vom/logger.cpp similarity index 100% rename from src/vpp-api/vom/logger.cpp rename to extras/vom/vom/logger.cpp diff --git a/src/vpp-api/vom/logger.hpp b/extras/vom/vom/logger.hpp similarity index 100% rename from src/vpp-api/vom/logger.hpp rename to extras/vom/vom/logger.hpp diff --git a/src/vpp-api/vom/nat_binding.cpp b/extras/vom/vom/nat_binding.cpp similarity index 100% rename from src/vpp-api/vom/nat_binding.cpp rename to extras/vom/vom/nat_binding.cpp diff --git a/src/vpp-api/vom/nat_binding.hpp b/extras/vom/vom/nat_binding.hpp similarity index 100% rename from src/vpp-api/vom/nat_binding.hpp rename to extras/vom/vom/nat_binding.hpp diff --git a/src/vpp-api/vom/nat_binding_cmds.cpp b/extras/vom/vom/nat_binding_cmds.cpp similarity index 100% rename from src/vpp-api/vom/nat_binding_cmds.cpp rename to extras/vom/vom/nat_binding_cmds.cpp diff --git a/src/vpp-api/vom/nat_binding_cmds.hpp b/extras/vom/vom/nat_binding_cmds.hpp similarity index 100% rename from src/vpp-api/vom/nat_binding_cmds.hpp rename to extras/vom/vom/nat_binding_cmds.hpp diff --git a/src/vpp-api/vom/nat_static.cpp b/extras/vom/vom/nat_static.cpp similarity index 100% rename from src/vpp-api/vom/nat_static.cpp rename to extras/vom/vom/nat_static.cpp diff --git a/src/vpp-api/vom/nat_static.hpp b/extras/vom/vom/nat_static.hpp similarity index 100% rename from src/vpp-api/vom/nat_static.hpp rename to extras/vom/vom/nat_static.hpp diff --git a/src/vpp-api/vom/nat_static_cmds.cpp b/extras/vom/vom/nat_static_cmds.cpp similarity index 100% rename from src/vpp-api/vom/nat_static_cmds.cpp rename to extras/vom/vom/nat_static_cmds.cpp diff --git a/src/vpp-api/vom/nat_static_cmds.hpp b/extras/vom/vom/nat_static_cmds.hpp similarity index 100% rename from src/vpp-api/vom/nat_static_cmds.hpp rename to extras/vom/vom/nat_static_cmds.hpp diff --git a/src/vpp-api/vom/neighbour.cpp b/extras/vom/vom/neighbour.cpp similarity index 100% rename from src/vpp-api/vom/neighbour.cpp rename to extras/vom/vom/neighbour.cpp diff --git a/src/vpp-api/vom/neighbour.hpp b/extras/vom/vom/neighbour.hpp similarity index 100% rename from src/vpp-api/vom/neighbour.hpp rename to extras/vom/vom/neighbour.hpp diff --git a/src/vpp-api/vom/neighbour_cmds.cpp b/extras/vom/vom/neighbour_cmds.cpp similarity index 100% rename from src/vpp-api/vom/neighbour_cmds.cpp rename to extras/vom/vom/neighbour_cmds.cpp diff --git a/src/vpp-api/vom/neighbour_cmds.hpp b/extras/vom/vom/neighbour_cmds.hpp similarity index 100% rename from src/vpp-api/vom/neighbour_cmds.hpp rename to extras/vom/vom/neighbour_cmds.hpp diff --git a/src/vpp-api/vom/object_base.cpp b/extras/vom/vom/object_base.cpp similarity index 100% rename from src/vpp-api/vom/object_base.cpp rename to extras/vom/vom/object_base.cpp diff --git a/src/vpp-api/vom/object_base.hpp b/extras/vom/vom/object_base.hpp similarity index 100% rename from src/vpp-api/vom/object_base.hpp rename to extras/vom/vom/object_base.hpp diff --git a/src/vpp-api/vom/om.cpp b/extras/vom/vom/om.cpp similarity index 100% rename from src/vpp-api/vom/om.cpp rename to extras/vom/vom/om.cpp diff --git a/src/vpp-api/vom/om.hpp b/extras/vom/vom/om.hpp similarity index 100% rename from src/vpp-api/vom/om.hpp rename to extras/vom/vom/om.hpp diff --git a/src/vpp-api/vom/prefix.cpp b/extras/vom/vom/prefix.cpp similarity index 100% rename from src/vpp-api/vom/prefix.cpp rename to extras/vom/vom/prefix.cpp diff --git a/src/vpp-api/vom/prefix.hpp b/extras/vom/vom/prefix.hpp similarity index 100% rename from src/vpp-api/vom/prefix.hpp rename to extras/vom/vom/prefix.hpp diff --git a/src/vpp-api/vom/ra_config.cpp b/extras/vom/vom/ra_config.cpp similarity index 100% rename from src/vpp-api/vom/ra_config.cpp rename to extras/vom/vom/ra_config.cpp diff --git a/src/vpp-api/vom/ra_config.hpp b/extras/vom/vom/ra_config.hpp similarity index 100% rename from src/vpp-api/vom/ra_config.hpp rename to extras/vom/vom/ra_config.hpp diff --git a/src/vpp-api/vom/ra_prefix.cpp b/extras/vom/vom/ra_prefix.cpp similarity index 100% rename from src/vpp-api/vom/ra_prefix.cpp rename to extras/vom/vom/ra_prefix.cpp diff --git a/src/vpp-api/vom/ra_prefix.hpp b/extras/vom/vom/ra_prefix.hpp similarity index 100% rename from src/vpp-api/vom/ra_prefix.hpp rename to extras/vom/vom/ra_prefix.hpp diff --git a/src/vpp-api/vom/route.cpp b/extras/vom/vom/route.cpp similarity index 100% rename from src/vpp-api/vom/route.cpp rename to extras/vom/vom/route.cpp diff --git a/src/vpp-api/vom/route.hpp b/extras/vom/vom/route.hpp similarity index 100% rename from src/vpp-api/vom/route.hpp rename to extras/vom/vom/route.hpp diff --git a/src/vpp-api/vom/route_cmds.cpp b/extras/vom/vom/route_cmds.cpp similarity index 100% rename from src/vpp-api/vom/route_cmds.cpp rename to extras/vom/vom/route_cmds.cpp diff --git a/src/vpp-api/vom/route_cmds.hpp b/extras/vom/vom/route_cmds.hpp similarity index 100% rename from src/vpp-api/vom/route_cmds.hpp rename to extras/vom/vom/route_cmds.hpp diff --git a/src/vpp-api/vom/route_domain.cpp b/extras/vom/vom/route_domain.cpp similarity index 100% rename from src/vpp-api/vom/route_domain.cpp rename to extras/vom/vom/route_domain.cpp diff --git a/src/vpp-api/vom/route_domain.hpp b/extras/vom/vom/route_domain.hpp similarity index 100% rename from src/vpp-api/vom/route_domain.hpp rename to extras/vom/vom/route_domain.hpp diff --git a/src/vpp-api/vom/route_domain_cmds.cpp b/extras/vom/vom/route_domain_cmds.cpp similarity index 100% rename from src/vpp-api/vom/route_domain_cmds.cpp rename to extras/vom/vom/route_domain_cmds.cpp diff --git a/src/vpp-api/vom/route_domain_cmds.hpp b/extras/vom/vom/route_domain_cmds.hpp similarity index 100% rename from src/vpp-api/vom/route_domain_cmds.hpp rename to extras/vom/vom/route_domain_cmds.hpp diff --git a/src/vpp-api/vom/rpc_cmd.hpp b/extras/vom/vom/rpc_cmd.hpp similarity index 100% rename from src/vpp-api/vom/rpc_cmd.hpp rename to extras/vom/vom/rpc_cmd.hpp diff --git a/src/vpp-api/vom/singular_db.hpp b/extras/vom/vom/singular_db.hpp similarity index 100% rename from src/vpp-api/vom/singular_db.hpp rename to extras/vom/vom/singular_db.hpp diff --git a/src/vpp-api/vom/singular_db_funcs.hpp b/extras/vom/vom/singular_db_funcs.hpp similarity index 100% rename from src/vpp-api/vom/singular_db_funcs.hpp rename to extras/vom/vom/singular_db_funcs.hpp diff --git a/src/vpp-api/vom/sub_interface.cpp b/extras/vom/vom/sub_interface.cpp similarity index 100% rename from src/vpp-api/vom/sub_interface.cpp rename to extras/vom/vom/sub_interface.cpp diff --git a/src/vpp-api/vom/sub_interface.hpp b/extras/vom/vom/sub_interface.hpp similarity index 100% rename from src/vpp-api/vom/sub_interface.hpp rename to extras/vom/vom/sub_interface.hpp diff --git a/src/vpp-api/vom/sub_interface_cmds.cpp b/extras/vom/vom/sub_interface_cmds.cpp similarity index 100% rename from src/vpp-api/vom/sub_interface_cmds.cpp rename to extras/vom/vom/sub_interface_cmds.cpp diff --git a/src/vpp-api/vom/sub_interface_cmds.hpp b/extras/vom/vom/sub_interface_cmds.hpp similarity index 100% rename from src/vpp-api/vom/sub_interface_cmds.hpp rename to extras/vom/vom/sub_interface_cmds.hpp diff --git a/src/vpp-api/vom/tap_interface.cpp b/extras/vom/vom/tap_interface.cpp similarity index 100% rename from src/vpp-api/vom/tap_interface.cpp rename to extras/vom/vom/tap_interface.cpp diff --git a/src/vpp-api/vom/tap_interface.hpp b/extras/vom/vom/tap_interface.hpp similarity index 100% rename from src/vpp-api/vom/tap_interface.hpp rename to extras/vom/vom/tap_interface.hpp diff --git a/src/vpp-api/vom/tap_interface_cmds.cpp b/extras/vom/vom/tap_interface_cmds.cpp similarity index 100% rename from src/vpp-api/vom/tap_interface_cmds.cpp rename to extras/vom/vom/tap_interface_cmds.cpp diff --git a/src/vpp-api/vom/tap_interface_cmds.hpp b/extras/vom/vom/tap_interface_cmds.hpp similarity index 100% rename from src/vpp-api/vom/tap_interface_cmds.hpp rename to extras/vom/vom/tap_interface_cmds.hpp diff --git a/src/vpp-api/vom/types.cpp b/extras/vom/vom/types.cpp similarity index 100% rename from src/vpp-api/vom/types.cpp rename to extras/vom/vom/types.cpp diff --git a/src/vpp-api/vom/types.hpp b/extras/vom/vom/types.hpp similarity index 100% rename from src/vpp-api/vom/types.hpp rename to extras/vom/vom/types.hpp diff --git a/src/vpp-api/vom/vxlan_tunnel.cpp b/extras/vom/vom/vxlan_tunnel.cpp similarity index 100% rename from src/vpp-api/vom/vxlan_tunnel.cpp rename to extras/vom/vom/vxlan_tunnel.cpp diff --git a/src/vpp-api/vom/vxlan_tunnel.hpp b/extras/vom/vom/vxlan_tunnel.hpp similarity index 100% rename from src/vpp-api/vom/vxlan_tunnel.hpp rename to extras/vom/vom/vxlan_tunnel.hpp diff --git a/src/vpp-api/vom/vxlan_tunnel_cmds.cpp b/extras/vom/vom/vxlan_tunnel_cmds.cpp similarity index 100% rename from src/vpp-api/vom/vxlan_tunnel_cmds.cpp rename to extras/vom/vom/vxlan_tunnel_cmds.cpp diff --git a/src/vpp-api/vom/vxlan_tunnel_cmds.hpp b/extras/vom/vom/vxlan_tunnel_cmds.hpp similarity index 100% rename from src/vpp-api/vom/vxlan_tunnel_cmds.hpp rename to extras/vom/vom/vxlan_tunnel_cmds.hpp diff --git a/src/Makefile.am b/src/Makefile.am index 7e6fda576b0..68cff7852ef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -82,10 +82,6 @@ if ENABLE_JAPI SUBDIRS += vpp-api/java endif -if ENABLE_VOM -SUBDIRS += vpp-api/vom -endif - ############################################################################### # API ############################################################################### diff --git a/src/configure.ac b/src/configure.ac index e408afcb056..2a54cd29d42 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -3,15 +3,13 @@ LT_INIT AC_CONFIG_AUX_DIR([.]) AM_INIT_AUTOMAKE([subdir-objects]) AM_SILENT_RULES([yes]) -AC_CONFIG_FILES([Makefile plugins/Makefile vpp-api/python/Makefile vpp-api/java/Makefile vpp-api/vapi/Makefile vpp-api/vom/Makefile]) +AC_CONFIG_FILES([Makefile plugins/Makefile vpp-api/python/Makefile vpp-api/java/Makefile vpp-api/vapi/Makefile]) AC_CONFIG_MACRO_DIR([m4]) AC_PROG_CC -AC_PROG_CXX AC_PROG_CPP AM_PROG_AS AM_PROG_LIBTOOL -AC_PROG_YACC AM_PATH_PYTHON AM_CONDITIONAL([CROSSCOMPILE], [test "$cross_compiling" == "yes"]) @@ -130,7 +128,6 @@ DISABLE_ARG(vlib, [Disable vlib and dependant libs and binaries]) DISABLE_ARG(svm, [Disable svm and dependant libs and binaries]) DISABLE_ARG(papi, [Disable Python API bindings]) DISABLE_ARG(japi, [Disable Java API bindings]) -DISABLE_ARG(vom, [Disable VPP object model bindings]) # --with-X diff --git a/test/ext/Makefile b/test/ext/Makefile index 3959ac6bf2f..d1f3a7b7a8a 100644 --- a/test/ext/Makefile +++ b/test/ext/Makefile @@ -8,14 +8,19 @@ ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID)) VAPI_CPPBIN= endif -VAPI_LIBS = -L$(VPP_TEST_BUILD_DIR)/vpp/.libs/ -L$(VPP_TEST_BUILD_DIR)/vpp/vpp-api/vapi/.libs/ -lvppinfra -lvlibmemoryclient -lsvm -lpthread -lcheck -lrt -lm -lvapiclient +VAPI_LIBS = \ + -L$(VPP_TEST_INSTALL_PATH)/vpp/lib64 \ + -lvppinfra -lvlibmemoryclient -lsvm -lpthread -lcheck -lrt -lm -lvapiclient + ifneq ($(filter centos opensuse,$(OS_ID)),$(OS_ID)) VAPI_LIBS += -lsubunit endif -CFLAGS = -std=gnu99 -g -Wall -pthread -I$(WS_ROOT)/src -I$(VPP_TEST_INSTALL_PATH)/vpp/include -I$(VAPI_BINDIR) -CPPFLAGS = -std=c++11 -g -Wall -pthread -I$(WS_ROOT)/src -I$(VPP_TEST_INSTALL_PATH)/vpp/include -I$(VAPI_BINDIR) -all: $(VAPI_CBIN) $(VAPI_CPPBIN) $(VOM_BINDIR) $(VOM_BIN) +FLAGS = -g -Wall -pthread -I$(WS_ROOT)/src -I$(VPP_TEST_INSTALL_PATH)/vpp/include -I$(VAPI_BINDIR) +CFLAGS = -std=gnu99 $(FLAGS) +CPPFLAGS = -std=c++11 $(FLAGS) -I$(WS_ROOT)/extras/vom + +all: $(VAPI_CBIN) $(VAPI_CPPBIN) $(VOM_BIN) $(VAPI_BINDIR): mkdir -p $(VAPI_BINDIR) @@ -28,21 +33,30 @@ $(VAPI_BINDIR)/fake.api.vapi.h: fake.api.json $(WS_ROOT)/src/vpp-api/vapi/vapi_c $(VAPI_BINDIR)/fake.api.vapi.hpp: fake.api.json $(WS_ROOT)/src/vpp-api/vapi/vapi_cpp_gen.py | $(VAPI_BINDIR) $(WS_ROOT)/src/vpp-api/vapi/vapi_cpp_gen.py --prefix $(VAPI_BINDIR) $< -$(VAPI_CBIN): $(CSRC) $(VPP_TEST_BUILD_DIR)/vpp/vpp-api/vapi/.libs/libvapiclient.so $(VPP_TEST_BUILD_DIR)/vpp/.libs/libvppinfra.so $(VPP_TEST_BUILD_DIR)/vpp/.libs/libvlibmemoryclient.so $(VPP_TEST_BUILD_DIR)/vpp/.libs/libsvm.so $(VAPI_BINDIR)/fake.api.vapi.h +$(VAPI_CBIN): $(CSRC) $(VAPI_BINDIR)/fake.api.vapi.h $(CC) -o $@ $(CFLAGS) $(CSRC) $(VAPI_LIBS) +$(VAPI_CBIN).d: $(CSRC) $(VAPI_BINDIR) + $(CC) -o $@ $(CFLAGS) -MM -MT '$(VAPI_CBIN)' $(CSRC) > $@ + + CPPSRC = vapi_cpp_test.cpp -$(VAPI_CPPBIN): $(CPPSRC) $(VPP_TEST_BUILD_DIR)/vpp/vpp-api/vapi/.libs/libvapiclient.so $(VPP_TEST_BUILD_DIR)/vpp/.libs/libvppinfra.so $(VPP_TEST_BUILD_DIR)/vpp/.libs/libvlibmemoryclient.so $(VPP_TEST_BUILD_DIR)/vpp/.libs/libsvm.so $(VAPI_BINDIR)/fake.api.vapi.hpp +$(VAPI_CPPBIN): $(CPPSRC) $(VAPI_BINDIR)/fake.api.vapi.hpp $(CXX) -o $@ $(CPPFLAGS) $(CPPSRC) $(VAPI_LIBS) +$(VAPI_CPPBIN).d: $(CPPSRC) $(VAPI_BINDIR) + $(CXX) -o $@ $(CPPFLAGS) -MM -MT '$(VAPI_CPPBIN)' $(CPPSRC) > $@ + VOM_CPPSRC = vom_test.cpp $(VOM_BINDIR): mkdir -p $(VOM_BINDIR) -LIB_VOM = $(VPP_TEST_BUILD_DIR)/vpp/vpp-api/vom/.libs/libvom.so -VOM_LIBS = $(LIB_VOM) \ +LIB_VOM = -lvom +VOM_LIBS = \ + -L$(VPP_TEST_INSTALL_PATH)/vom/lib64 \ + -lvom \ -lboost_thread \ -lboost_system \ -lboost_filesystem \ @@ -51,10 +65,22 @@ VOM_LIBS = $(LIB_VOM) \ VOM_CPPFLAGS = \ -I $(WS_ROOT)/src/vpp-api/ \ + -DBOOST_LOG_DYN_LINK \ $(CPPFLAGS) -$(VOM_BIN): $(VOM_CPPSRC) $(VOM_BINDIR) $(LIB_VOM) $(VPP_TEST_BUILD_DIR)/vpp/vpp-api/vapi/.libs/libvapiclient.so - $(CXX) -o $@ $(VOM_CPPFLAGS) -DBOOST_LOG_DYN_LINK -O0 -g $(VOM_CPPSRC) $(VOM_LIBS) +$(VOM_BIN): $(VOM_CPPSRC) $(VOM_BINDIR) + $(CXX) -o $@ $(VOM_CPPFLAGS) -O0 -g $(VOM_CPPSRC) $(VOM_LIBS) -Wl,-rpath,$(VPP_TEST_INSTALL_PATH)/vom/lib64 + +$(VOM_BIN).d: $(VOM_CPPSRC) $(VOM_BINDIR) + $(CXX) -o $@ $(VOM_CPPFLAGS) -MM -MT '$(VOM_BIN)' $(VOM_CPPSRC) > $@ + clean: rm -rf $(VAPI_BINDIR) $(VOM_BINDIR) + +ifneq ($(MAKECMDGOALS),clean) +-include $(VAPI_CPPBIN).d +-include $(VAPI_CBIN).d +-include $(VOM_BIN).d +endif + -- 2.16.6