183 files changed, 74 insertions, 26 deletions
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
index 917dceb793d..917dceb793d 100644
--- a/src/vpp-api/vom/.clang-format
+++ b/extras/vom/vom/.clang-format
diff --git a/src/vpp-api/vom/Makefile.am b/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
index 73f015df377..73f015df377 100644
--- a/src/vpp-api/vom/acl_binding.cpp
+++ b/extras/vom/vom/acl_binding.cpp
diff --git a/src/vpp-api/vom/acl_binding.hpp b/extras/vom/vom/acl_binding.hpp
index 89db0eea219..89db0eea219 100644
--- a/src/vpp-api/vom/acl_binding.hpp
+++ b/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
index 8c33cd47b79..8c33cd47b79 100644
--- a/src/vpp-api/vom/acl_binding_cmds.cpp
+++ b/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
index b9af66e70c8..b9af66e70c8 100644
--- a/src/vpp-api/vom/acl_binding_cmds.hpp
+++ b/extras/vom/vom/acl_binding_cmds.hpp
diff --git a/src/vpp-api/vom/acl_ethertype.cpp b/extras/vom/vom/acl_ethertype.cpp
index 9092517194e..9092517194e 100644
--- a/src/vpp-api/vom/acl_ethertype.cpp
+++ b/extras/vom/vom/acl_ethertype.cpp
diff --git a/src/vpp-api/vom/acl_ethertype.hpp b/extras/vom/vom/acl_ethertype.hpp
index 98d3ce20707..98d3ce20707 100644
--- a/src/vpp-api/vom/acl_ethertype.hpp
+++ b/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
index c05a428c725..c05a428c725 100644
--- a/src/vpp-api/vom/acl_ethertype_cmds.cpp
+++ b/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
index f72a3fb97b5..f72a3fb97b5 100644
--- a/src/vpp-api/vom/acl_ethertype_cmds.hpp
+++ b/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
index 2b12e68c184..2b12e68c184 100644
--- a/src/vpp-api/vom/acl_l2_rule.cpp
+++ b/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
index 8c094aef5f4..8c094aef5f4 100644
--- a/src/vpp-api/vom/acl_l2_rule.hpp
+++ b/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
index 417dc5f2eb7..417dc5f2eb7 100644
--- a/src/vpp-api/vom/acl_l3_rule.cpp
+++ b/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
index c1f1ceea5a1..c1f1ceea5a1 100644
--- a/src/vpp-api/vom/acl_l3_rule.hpp
+++ b/extras/vom/vom/acl_l3_rule.hpp
diff --git a/src/vpp-api/vom/acl_list.cpp b/extras/vom/vom/acl_list.cpp
index 651eb87a4a9..651eb87a4a9 100644
--- a/src/vpp-api/vom/acl_list.cpp
+++ b/extras/vom/vom/acl_list.cpp
diff --git a/src/vpp-api/vom/acl_list.hpp b/extras/vom/vom/acl_list.hpp
index eff5e1c5a52..eff5e1c5a52 100644
--- a/src/vpp-api/vom/acl_list.hpp
+++ b/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
index 2e59763f4fe..2e59763f4fe 100644
--- a/src/vpp-api/vom/acl_list_cmds.cpp
+++ b/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
index d24e75229de..d24e75229de 100644
--- a/src/vpp-api/vom/acl_list_cmds.hpp
+++ b/extras/vom/vom/acl_list_cmds.hpp
diff --git a/src/vpp-api/vom/acl_types.cpp b/extras/vom/vom/acl_types.cpp
index b2c0c7f0b9d..b2c0c7f0b9d 100644
--- a/src/vpp-api/vom/acl_types.cpp
+++ b/extras/vom/vom/acl_types.cpp
diff --git a/src/vpp-api/vom/acl_types.hpp b/extras/vom/vom/acl_types.hpp
index cf5bee3e478..cf5bee3e478 100644
--- a/src/vpp-api/vom/acl_types.hpp
+++ b/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
index 73d3d844f53..73d3d844f53 100644
--- a/src/vpp-api/vom/arp_proxy_binding.cpp
+++ b/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
index f57f6971991..f57f6971991 100644
--- a/src/vpp-api/vom/arp_proxy_binding.hpp
+++ b/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
index 675feef9b8d..675feef9b8d 100644
--- a/src/vpp-api/vom/arp_proxy_binding_cmds.cpp
+++ b/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
index c73bb13aee3..c73bb13aee3 100644
--- a/src/vpp-api/vom/arp_proxy_binding_cmds.hpp
+++ b/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
index 3973eba55f9..3973eba55f9 100644
--- a/src/vpp-api/vom/arp_proxy_config.cpp
+++ b/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
index 3a50633de4d..3a50633de4d 100644
--- a/src/vpp-api/vom/arp_proxy_config.hpp
+++ b/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
index cf7fad5d90d..cf7fad5d90d 100644
--- a/src/vpp-api/vom/arp_proxy_config_cmds.cpp
+++ b/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
index ac0e1fd1702..ac0e1fd1702 100644
--- a/src/vpp-api/vom/arp_proxy_config_cmds.hpp
+++ b/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
index 60721dd4265..60721dd4265 100644
--- a/src/vpp-api/vom/bond_group_binding.cpp
+++ b/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
index bfac4881a44..bfac4881a44 100644
--- a/src/vpp-api/vom/bond_group_binding.hpp
+++ b/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
index 3ffe9810173..3ffe9810173 100644
--- a/src/vpp-api/vom/bond_group_binding_cmds.cpp
+++ b/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
index 71c4f9fad64..71c4f9fad64 100644
--- a/src/vpp-api/vom/bond_group_binding_cmds.hpp
+++ b/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
index 32a00ad7f43..32a00ad7f43 100644
--- a/src/vpp-api/vom/bond_interface.cpp
+++ b/extras/vom/vom/bond_interface.cpp
diff --git a/src/vpp-api/vom/bond_interface.hpp b/extras/vom/vom/bond_interface.hpp
index 4584bd14be2..4584bd14be2 100644
--- a/src/vpp-api/vom/bond_interface.hpp
+++ b/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
index d59560d4f5f..d59560d4f5f 100644
--- a/src/vpp-api/vom/bond_interface_cmds.cpp
+++ b/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
index 06a8ac15009..06a8ac15009 100644
--- a/src/vpp-api/vom/bond_interface_cmds.hpp
+++ b/extras/vom/vom/bond_interface_cmds.hpp
diff --git a/src/vpp-api/vom/bond_member.cpp b/extras/vom/vom/bond_member.cpp
index f1a27b3d1c6..f1a27b3d1c6 100644
--- a/src/vpp-api/vom/bond_member.cpp
+++ b/extras/vom/vom/bond_member.cpp
diff --git a/src/vpp-api/vom/bond_member.hpp b/extras/vom/vom/bond_member.hpp
index 066933b74d7..066933b74d7 100644
--- a/src/vpp-api/vom/bond_member.hpp
+++ b/extras/vom/vom/bond_member.hpp
diff --git a/src/vpp-api/vom/bridge_domain.cpp b/extras/vom/vom/bridge_domain.cpp
index b8c89e10bd9..b8c89e10bd9 100644
--- a/src/vpp-api/vom/bridge_domain.cpp
+++ b/extras/vom/vom/bridge_domain.cpp
diff --git a/src/vpp-api/vom/bridge_domain.hpp b/extras/vom/vom/bridge_domain.hpp
index d345da238ca..d345da238ca 100644
--- a/src/vpp-api/vom/bridge_domain.hpp
+++ b/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
index a203a76744e..a203a76744e 100644
--- a/src/vpp-api/vom/bridge_domain_arp_entry.cpp
+++ b/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
index b4af6a0f62e..b4af6a0f62e 100644
--- a/src/vpp-api/vom/bridge_domain_arp_entry.hpp
+++ b/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
index 824dcadad02..824dcadad02 100644
--- a/src/vpp-api/vom/bridge_domain_arp_entry_cmds.cpp
+++ b/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
index 094de4c7fb6..094de4c7fb6 100644
--- a/src/vpp-api/vom/bridge_domain_arp_entry_cmds.hpp
+++ b/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
index d1d536f6d39..d1d536f6d39 100644
--- a/src/vpp-api/vom/bridge_domain_cmds.cpp
+++ b/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
index 0216236d42c..0216236d42c 100644
--- a/src/vpp-api/vom/bridge_domain_cmds.hpp
+++ b/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
index 241de953771..241de953771 100644
--- a/src/vpp-api/vom/bridge_domain_entry.cpp
+++ b/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
index 2aef697ebca..2aef697ebca 100644
--- a/src/vpp-api/vom/bridge_domain_entry.hpp
+++ b/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
index f2a3ed9c2cc..f2a3ed9c2cc 100644
--- a/src/vpp-api/vom/bridge_domain_entry_cmds.cpp
+++ b/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
index dc46719ffda..dc46719ffda 100644
--- a/src/vpp-api/vom/bridge_domain_entry_cmds.hpp
+++ b/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
index 41463d1dd74..41463d1dd74 100644
--- a/src/vpp-api/vom/client_db.cpp
+++ b/extras/vom/vom/client_db.cpp
diff --git a/src/vpp-api/vom/client_db.hpp b/extras/vom/vom/client_db.hpp
index 34204c1d839..34204c1d839 100644
--- a/src/vpp-api/vom/client_db.hpp
+++ b/extras/vom/vom/client_db.hpp
diff --git a/src/vpp-api/vom/cmd.cpp b/extras/vom/vom/cmd.cpp
index 5623507a63f..5623507a63f 100644
--- a/src/vpp-api/vom/cmd.cpp
+++ b/extras/vom/vom/cmd.cpp
diff --git a/src/vpp-api/vom/cmd.hpp b/extras/vom/vom/cmd.hpp
index 9c87d31218a..9c87d31218a 100644
--- a/src/vpp-api/vom/cmd.hpp
+++ b/extras/vom/vom/cmd.hpp
diff --git a/src/vpp-api/vom/connection.cpp b/extras/vom/vom/connection.cpp
index c03ef99c172..c03ef99c172 100644
--- a/src/vpp-api/vom/connection.cpp
+++ b/extras/vom/vom/connection.cpp
diff --git a/src/vpp-api/vom/connection.hpp b/extras/vom/vom/connection.hpp
index 06fe840232d..06fe840232d 100644
--- a/src/vpp-api/vom/connection.hpp
+++ b/extras/vom/vom/connection.hpp
diff --git a/src/vpp-api/vom/dhcp_config.cpp b/extras/vom/vom/dhcp_config.cpp
index 7d97fa15d6e..7d97fa15d6e 100644
--- a/src/vpp-api/vom/dhcp_config.cpp
+++ b/extras/vom/vom/dhcp_config.cpp
diff --git a/src/vpp-api/vom/dhcp_config.hpp b/extras/vom/vom/dhcp_config.hpp
index 8ea608d809d..8ea608d809d 100644
--- a/src/vpp-api/vom/dhcp_config.hpp
+++ b/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
index 76ce58b6b92..76ce58b6b92 100644
--- a/src/vpp-api/vom/dhcp_config_cmds.cpp
+++ b/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
index 726ff992577..726ff992577 100644
--- a/src/vpp-api/vom/dhcp_config_cmds.hpp
+++ b/extras/vom/vom/dhcp_config_cmds.hpp
diff --git a/src/vpp-api/vom/dump_cmd.hpp b/extras/vom/vom/dump_cmd.hpp
index 4dad02b911e..4dad02b911e 100644
--- a/src/vpp-api/vom/dump_cmd.hpp
+++ b/extras/vom/vom/dump_cmd.hpp
diff --git a/src/vpp-api/vom/enum_base.hpp b/extras/vom/vom/enum_base.hpp
index 6756e2498de..6756e2498de 100644
--- a/src/vpp-api/vom/enum_base.hpp
+++ b/extras/vom/vom/enum_base.hpp
diff --git a/src/vpp-api/vom/event_cmd.hpp b/extras/vom/vom/event_cmd.hpp
index a0e9b4af112..a0e9b4af112 100644
--- a/src/vpp-api/vom/event_cmd.hpp
+++ b/extras/vom/vom/event_cmd.hpp
diff --git a/src/vpp-api/vom/gbp_contract.cpp b/extras/vom/vom/gbp_contract.cpp
index 8b27269249c..8b27269249c 100644
--- a/src/vpp-api/vom/gbp_contract.cpp
+++ b/extras/vom/vom/gbp_contract.cpp
diff --git a/src/vpp-api/vom/gbp_contract.hpp b/extras/vom/vom/gbp_contract.hpp
index 7a0696de7b3..7a0696de7b3 100644
--- a/src/vpp-api/vom/gbp_contract.hpp
+++ b/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
index a98dc62bc59..a98dc62bc59 100644
--- a/src/vpp-api/vom/gbp_contract_cmds.cpp
+++ b/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
index 705c1a0a3db..705c1a0a3db 100644
--- a/src/vpp-api/vom/gbp_contract_cmds.hpp
+++ b/extras/vom/vom/gbp_contract_cmds.hpp
diff --git a/src/vpp-api/vom/gbp_endpoint.cpp b/extras/vom/vom/gbp_endpoint.cpp
index 9762a91429a..9762a91429a 100644
--- a/src/vpp-api/vom/gbp_endpoint.cpp
+++ b/extras/vom/vom/gbp_endpoint.cpp
diff --git a/src/vpp-api/vom/gbp_endpoint.hpp b/extras/vom/vom/gbp_endpoint.hpp
index f6466a6077d..f6466a6077d 100644
--- a/src/vpp-api/vom/gbp_endpoint.hpp
+++ b/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
index 88d2f377bc7..88d2f377bc7 100644
--- a/src/vpp-api/vom/gbp_endpoint_cmds.cpp
+++ b/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
index 2893ef51eec..2893ef51eec 100644
--- a/src/vpp-api/vom/gbp_endpoint_cmds.hpp
+++ b/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
index d9f0d38d594..d9f0d38d594 100644
--- a/src/vpp-api/vom/gbp_endpoint_group.cpp
+++ b/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
index f7c900f20be..f7c900f20be 100644
--- a/src/vpp-api/vom/gbp_endpoint_group.hpp
+++ b/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
index 55e81d3a528..55e81d3a528 100644
--- a/src/vpp-api/vom/gbp_endpoint_group_cmds.cpp
+++ b/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
index 4da3a4247b4..4da3a4247b4 100644
--- a/src/vpp-api/vom/gbp_endpoint_group_cmds.hpp
+++ b/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
index 250e3048f8a..250e3048f8a 100644
--- a/src/vpp-api/vom/gbp_recirc.cpp
+++ b/extras/vom/vom/gbp_recirc.cpp
diff --git a/src/vpp-api/vom/gbp_recirc.hpp b/extras/vom/vom/gbp_recirc.hpp
index fee4f6c2502..fee4f6c2502 100644
--- a/src/vpp-api/vom/gbp_recirc.hpp
+++ b/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
index 757fcb99065..757fcb99065 100644
--- a/src/vpp-api/vom/gbp_recirc_cmds.cpp
+++ b/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
index fe17834ebf5..fe17834ebf5 100644
--- a/src/vpp-api/vom/gbp_recirc_cmds.hpp
+++ b/extras/vom/vom/gbp_recirc_cmds.hpp
diff --git a/src/vpp-api/vom/gbp_subnet.cpp b/extras/vom/vom/gbp_subnet.cpp
index 1a9ee86e06b..1a9ee86e06b 100644
--- a/src/vpp-api/vom/gbp_subnet.cpp
+++ b/extras/vom/vom/gbp_subnet.cpp
diff --git a/src/vpp-api/vom/gbp_subnet.hpp b/extras/vom/vom/gbp_subnet.hpp
index b4adb40ae45..b4adb40ae45 100644
--- a/src/vpp-api/vom/gbp_subnet.hpp
+++ b/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
index d087e5c67d8..d087e5c67d8 100644
--- a/src/vpp-api/vom/gbp_subnet_cmds.cpp
+++ b/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
index 3dbc8db2359..3dbc8db2359 100644
--- a/src/vpp-api/vom/gbp_subnet_cmds.hpp
+++ b/extras/vom/vom/gbp_subnet_cmds.hpp
diff --git a/src/vpp-api/vom/hw.cpp b/extras/vom/vom/hw.cpp
index 0952b60f9d9..0952b60f9d9 100644
--- a/src/vpp-api/vom/hw.cpp
+++ b/extras/vom/vom/hw.cpp
diff --git a/src/vpp-api/vom/hw.hpp b/extras/vom/vom/hw.hpp
index 9ba47505619..9ba47505619 100644
--- a/src/vpp-api/vom/hw.hpp
+++ b/extras/vom/vom/hw.hpp
diff --git a/src/vpp-api/vom/hw_cmds.cpp b/extras/vom/vom/hw_cmds.cpp
index e628c354d71..e628c354d71 100644
--- a/src/vpp-api/vom/hw_cmds.cpp
+++ b/extras/vom/vom/hw_cmds.cpp
diff --git a/src/vpp-api/vom/hw_cmds.hpp b/extras/vom/vom/hw_cmds.hpp
index b499ccecca0..b499ccecca0 100644
--- a/src/vpp-api/vom/hw_cmds.hpp
+++ b/extras/vom/vom/hw_cmds.hpp
diff --git a/src/vpp-api/vom/inspect.cpp b/extras/vom/vom/inspect.cpp
index 605a921b5ac..605a921b5ac 100644
--- a/src/vpp-api/vom/inspect.cpp
+++ b/extras/vom/vom/inspect.cpp
diff --git a/src/vpp-api/vom/inspect.hpp b/extras/vom/vom/inspect.hpp
index d5bca3040d2..d5bca3040d2 100644
--- a/src/vpp-api/vom/inspect.hpp
+++ b/extras/vom/vom/inspect.hpp
diff --git a/src/vpp-api/vom/interface.cpp b/extras/vom/vom/interface.cpp
index 6faf3491e6f..6faf3491e6f 100644
--- a/src/vpp-api/vom/interface.cpp
+++ b/extras/vom/vom/interface.cpp
diff --git a/src/vpp-api/vom/interface.hpp b/extras/vom/vom/interface.hpp
index f6708b30176..f6708b30176 100644
--- a/src/vpp-api/vom/interface.hpp
+++ b/extras/vom/vom/interface.hpp
diff --git a/src/vpp-api/vom/interface_cmds.cpp b/extras/vom/vom/interface_cmds.cpp
index 49a24c1301b..49a24c1301b 100644
--- a/src/vpp-api/vom/interface_cmds.cpp
+++ b/extras/vom/vom/interface_cmds.cpp
diff --git a/src/vpp-api/vom/interface_cmds.hpp b/extras/vom/vom/interface_cmds.hpp
index 7a0040deb0a..7a0040deb0a 100644
--- a/src/vpp-api/vom/interface_cmds.hpp
+++ b/extras/vom/vom/interface_cmds.hpp
diff --git a/src/vpp-api/vom/interface_factory.cpp b/extras/vom/vom/interface_factory.cpp
index 417f4775a7a..417f4775a7a 100644
--- a/src/vpp-api/vom/interface_factory.cpp
+++ b/extras/vom/vom/interface_factory.cpp
diff --git a/src/vpp-api/vom/interface_factory.hpp b/extras/vom/vom/interface_factory.hpp
index dda52752352..dda52752352 100644
--- a/src/vpp-api/vom/interface_factory.hpp
+++ b/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
index 22f545acdbb..22f545acdbb 100644
--- a/src/vpp-api/vom/interface_ip6_nd.hpp
+++ b/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
index c6f53f04919..c6f53f04919 100644
--- a/src/vpp-api/vom/interface_ip6_nd_cmds.cpp
+++ b/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
index 283ea1ece54..283ea1ece54 100644
--- a/src/vpp-api/vom/interface_span.cpp
+++ b/extras/vom/vom/interface_span.cpp
diff --git a/src/vpp-api/vom/interface_span.hpp b/extras/vom/vom/interface_span.hpp
index baa2054a530..baa2054a530 100644
--- a/src/vpp-api/vom/interface_span.hpp
+++ b/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
index 3b8b8d25ec7..3b8b8d25ec7 100644
--- a/src/vpp-api/vom/interface_span_cmds.cpp
+++ b/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
index fa8096ebb10..fa8096ebb10 100644
--- a/src/vpp-api/vom/interface_span_cmds.hpp
+++ b/extras/vom/vom/interface_span_cmds.hpp
diff --git a/src/vpp-api/vom/interface_types.cpp b/extras/vom/vom/interface_types.cpp
index 139bdd52f9b..139bdd52f9b 100644
--- a/src/vpp-api/vom/interface_types.cpp
+++ b/extras/vom/vom/interface_types.cpp
diff --git a/src/vpp-api/vom/ip_unnumbered.cpp b/extras/vom/vom/ip_unnumbered.cpp
index caeeb419993..caeeb419993 100644
--- a/src/vpp-api/vom/ip_unnumbered.cpp
+++ b/extras/vom/vom/ip_unnumbered.cpp
diff --git a/src/vpp-api/vom/ip_unnumbered.hpp b/extras/vom/vom/ip_unnumbered.hpp
index b736919744c..b736919744c 100644
--- a/src/vpp-api/vom/ip_unnumbered.hpp
+++ b/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
index 4c1fcf6d465..4c1fcf6d465 100644
--- a/src/vpp-api/vom/ip_unnumbered_cmds.cpp
+++ b/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
index 0bb70276e45..0bb70276e45 100644
--- a/src/vpp-api/vom/ip_unnumbered_cmds.hpp
+++ b/extras/vom/vom/ip_unnumbered_cmds.hpp
diff --git a/src/vpp-api/vom/l2_binding.cpp b/extras/vom/vom/l2_binding.cpp
index 4118f74065a..4118f74065a 100644
--- a/src/vpp-api/vom/l2_binding.cpp
+++ b/extras/vom/vom/l2_binding.cpp
diff --git a/src/vpp-api/vom/l2_binding.hpp b/extras/vom/vom/l2_binding.hpp
index d24f69ee33d..d24f69ee33d 100644
--- a/src/vpp-api/vom/l2_binding.hpp
+++ b/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
index 0f91e4b3b7a..0f91e4b3b7a 100644
--- a/src/vpp-api/vom/l2_binding_cmds.cpp
+++ b/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
index d105c18a40d..d105c18a40d 100644
--- a/src/vpp-api/vom/l2_binding_cmds.hpp
+++ b/extras/vom/vom/l2_binding_cmds.hpp
diff --git a/src/vpp-api/vom/l2_emulation.cpp b/extras/vom/vom/l2_emulation.cpp
index 7bc7ed657d4..7bc7ed657d4 100644
--- a/src/vpp-api/vom/l2_emulation.cpp
+++ b/extras/vom/vom/l2_emulation.cpp
diff --git a/src/vpp-api/vom/l2_emulation.hpp b/extras/vom/vom/l2_emulation.hpp
index faf4df8b0a7..faf4df8b0a7 100644
--- a/src/vpp-api/vom/l2_emulation.hpp
+++ b/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
index 27f84830191..27f84830191 100644
--- a/src/vpp-api/vom/l2_emulation_cmds.cpp
+++ b/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
index aeff3a8ddd7..aeff3a8ddd7 100644
--- a/src/vpp-api/vom/l2_emulation_cmds.hpp
+++ b/extras/vom/vom/l2_emulation_cmds.hpp
diff --git a/src/vpp-api/vom/l3_binding.cpp b/extras/vom/vom/l3_binding.cpp
index 13bc1ffd575..13bc1ffd575 100644
--- a/src/vpp-api/vom/l3_binding.cpp
+++ b/extras/vom/vom/l3_binding.cpp
diff --git a/src/vpp-api/vom/l3_binding.hpp b/extras/vom/vom/l3_binding.hpp
index 0177e56ea2b..0177e56ea2b 100644
--- a/src/vpp-api/vom/l3_binding.hpp
+++ b/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
index 66691f86059..66691f86059 100644
--- a/src/vpp-api/vom/l3_binding_cmds.cpp
+++ b/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
index 1387bc47f5d..1387bc47f5d 100644
--- a/src/vpp-api/vom/l3_binding_cmds.hpp
+++ b/extras/vom/vom/l3_binding_cmds.hpp
diff --git a/src/vpp-api/vom/lldp_binding.cpp b/extras/vom/vom/lldp_binding.cpp
index 69b30c2ce94..69b30c2ce94 100644
--- a/src/vpp-api/vom/lldp_binding.cpp
+++ b/extras/vom/vom/lldp_binding.cpp
diff --git a/src/vpp-api/vom/lldp_binding.hpp b/extras/vom/vom/lldp_binding.hpp
index 0c5610013ac..0c5610013ac 100644
--- a/src/vpp-api/vom/lldp_binding.hpp
+++ b/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
index 7dacdafe20f..7dacdafe20f 100644
--- a/src/vpp-api/vom/lldp_binding_cmds.cpp
+++ b/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
index b3038017e06..b3038017e06 100644
--- a/src/vpp-api/vom/lldp_binding_cmds.hpp
+++ b/extras/vom/vom/lldp_binding_cmds.hpp
diff --git a/src/vpp-api/vom/lldp_global.cpp b/extras/vom/vom/lldp_global.cpp
index 6bae7993651..6bae7993651 100644
--- a/src/vpp-api/vom/lldp_global.cpp
+++ b/extras/vom/vom/lldp_global.cpp
diff --git a/src/vpp-api/vom/lldp_global.hpp b/extras/vom/vom/lldp_global.hpp
index f545a2828cc..f545a2828cc 100644
--- a/src/vpp-api/vom/lldp_global.hpp
+++ b/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
index 8237114f789..8237114f789 100644
--- a/src/vpp-api/vom/lldp_global_cmds.cpp
+++ b/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
index 621e73ff71d..621e73ff71d 100644
--- a/src/vpp-api/vom/lldp_global_cmds.hpp
+++ b/extras/vom/vom/lldp_global_cmds.hpp
diff --git a/src/vpp-api/vom/logger.cpp b/extras/vom/vom/logger.cpp
index 80f2d92c603..80f2d92c603 100644
--- a/src/vpp-api/vom/logger.cpp
+++ b/extras/vom/vom/logger.cpp
diff --git a/src/vpp-api/vom/logger.hpp b/extras/vom/vom/logger.hpp
index 6d2e3dd82f6..6d2e3dd82f6 100644
--- a/src/vpp-api/vom/logger.hpp
+++ b/extras/vom/vom/logger.hpp
diff --git a/src/vpp-api/vom/nat_binding.cpp b/extras/vom/vom/nat_binding.cpp
index 64b7a1007ac..64b7a1007ac 100644
--- a/src/vpp-api/vom/nat_binding.cpp
+++ b/extras/vom/vom/nat_binding.cpp
diff --git a/src/vpp-api/vom/nat_binding.hpp b/extras/vom/vom/nat_binding.hpp
index a99d23af601..a99d23af601 100644
--- a/src/vpp-api/vom/nat_binding.hpp
+++ b/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
index 4d98268249a..4d98268249a 100644
--- a/src/vpp-api/vom/nat_binding_cmds.cpp
+++ b/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
index aa5a200515e..aa5a200515e 100644
--- a/src/vpp-api/vom/nat_binding_cmds.hpp
+++ b/extras/vom/vom/nat_binding_cmds.hpp
diff --git a/src/vpp-api/vom/nat_static.cpp b/extras/vom/vom/nat_static.cpp
index bf8573d333e..bf8573d333e 100644
--- a/src/vpp-api/vom/nat_static.cpp
+++ b/extras/vom/vom/nat_static.cpp
diff --git a/src/vpp-api/vom/nat_static.hpp b/extras/vom/vom/nat_static.hpp
index 2dcadb3c904..2dcadb3c904 100644
--- a/src/vpp-api/vom/nat_static.hpp
+++ b/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
index a80e47416ea..a80e47416ea 100644
--- a/src/vpp-api/vom/nat_static_cmds.cpp
+++ b/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
index 95061cae1ad..95061cae1ad 100644
--- a/src/vpp-api/vom/nat_static_cmds.hpp
+++ b/extras/vom/vom/nat_static_cmds.hpp
diff --git a/src/vpp-api/vom/neighbour.cpp b/extras/vom/vom/neighbour.cpp
index 44e2760a1ec..44e2760a1ec 100644
--- a/src/vpp-api/vom/neighbour.cpp
+++ b/extras/vom/vom/neighbour.cpp
diff --git a/src/vpp-api/vom/neighbour.hpp b/extras/vom/vom/neighbour.hpp
index 500f03d0a61..500f03d0a61 100644
--- a/src/vpp-api/vom/neighbour.hpp
+++ b/extras/vom/vom/neighbour.hpp
diff --git a/src/vpp-api/vom/neighbour_cmds.cpp b/extras/vom/vom/neighbour_cmds.cpp
index 2f3c200d5fb..2f3c200d5fb 100644
--- a/src/vpp-api/vom/neighbour_cmds.cpp
+++ b/extras/vom/vom/neighbour_cmds.cpp
diff --git a/src/vpp-api/vom/neighbour_cmds.hpp b/extras/vom/vom/neighbour_cmds.hpp
index fe6dd155cd9..fe6dd155cd9 100644
--- a/src/vpp-api/vom/neighbour_cmds.hpp
+++ b/extras/vom/vom/neighbour_cmds.hpp
diff --git a/src/vpp-api/vom/object_base.cpp b/extras/vom/vom/object_base.cpp
index 6ab4ee5cadc..6ab4ee5cadc 100644
--- a/src/vpp-api/vom/object_base.cpp
+++ b/extras/vom/vom/object_base.cpp
diff --git a/src/vpp-api/vom/object_base.hpp b/extras/vom/vom/object_base.hpp
index 2edafc58466..2edafc58466 100644
--- a/src/vpp-api/vom/object_base.hpp
+++ b/extras/vom/vom/object_base.hpp
diff --git a/src/vpp-api/vom/om.cpp b/extras/vom/vom/om.cpp
index edfc046e740..edfc046e740 100644
--- a/src/vpp-api/vom/om.cpp
+++ b/extras/vom/vom/om.cpp
diff --git a/src/vpp-api/vom/om.hpp b/extras/vom/vom/om.hpp
index e68d5ea0017..e68d5ea0017 100644
--- a/src/vpp-api/vom/om.hpp
+++ b/extras/vom/vom/om.hpp
diff --git a/src/vpp-api/vom/prefix.cpp b/extras/vom/vom/prefix.cpp
index abd589eef9f..abd589eef9f 100644
--- a/src/vpp-api/vom/prefix.cpp
+++ b/extras/vom/vom/prefix.cpp
diff --git a/src/vpp-api/vom/prefix.hpp b/extras/vom/vom/prefix.hpp
index 3950f6fd036..3950f6fd036 100644
--- a/src/vpp-api/vom/prefix.hpp
+++ b/extras/vom/vom/prefix.hpp
diff --git a/src/vpp-api/vom/ra_config.cpp b/extras/vom/vom/ra_config.cpp
index de424a4d436..de424a4d436 100644
--- a/src/vpp-api/vom/ra_config.cpp
+++ b/extras/vom/vom/ra_config.cpp
diff --git a/src/vpp-api/vom/ra_config.hpp b/extras/vom/vom/ra_config.hpp
index 505ccb3c499..505ccb3c499 100644
--- a/src/vpp-api/vom/ra_config.hpp
+++ b/extras/vom/vom/ra_config.hpp
diff --git a/src/vpp-api/vom/ra_prefix.cpp b/extras/vom/vom/ra_prefix.cpp
index 1cf09637082..1cf09637082 100644
--- a/src/vpp-api/vom/ra_prefix.cpp
+++ b/extras/vom/vom/ra_prefix.cpp
diff --git a/src/vpp-api/vom/ra_prefix.hpp b/extras/vom/vom/ra_prefix.hpp
index 580aae146fd..580aae146fd 100644
--- a/src/vpp-api/vom/ra_prefix.hpp
+++ b/extras/vom/vom/ra_prefix.hpp
diff --git a/src/vpp-api/vom/route.cpp b/extras/vom/vom/route.cpp
index ec56c44a0d7..ec56c44a0d7 100644
--- a/src/vpp-api/vom/route.cpp
+++ b/extras/vom/vom/route.cpp
diff --git a/src/vpp-api/vom/route.hpp b/extras/vom/vom/route.hpp
index 65797b7c2f9..65797b7c2f9 100644
--- a/src/vpp-api/vom/route.hpp
+++ b/extras/vom/vom/route.hpp
diff --git a/src/vpp-api/vom/route_cmds.cpp b/extras/vom/vom/route_cmds.cpp
index 83d44ccc01d..83d44ccc01d 100644
--- a/src/vpp-api/vom/route_cmds.cpp
+++ b/extras/vom/vom/route_cmds.cpp
diff --git a/src/vpp-api/vom/route_cmds.hpp b/extras/vom/vom/route_cmds.hpp
index f2c10ff60ad..f2c10ff60ad 100644
--- a/src/vpp-api/vom/route_cmds.hpp
+++ b/extras/vom/vom/route_cmds.hpp
diff --git a/src/vpp-api/vom/route_domain.cpp b/extras/vom/vom/route_domain.cpp
index b97faf6ae49..b97faf6ae49 100644
--- a/src/vpp-api/vom/route_domain.cpp
+++ b/extras/vom/vom/route_domain.cpp
diff --git a/src/vpp-api/vom/route_domain.hpp b/extras/vom/vom/route_domain.hpp
index 19a3c18dddc..19a3c18dddc 100644
--- a/src/vpp-api/vom/route_domain.hpp
+++ b/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
index 845497f5989..845497f5989 100644
--- a/src/vpp-api/vom/route_domain_cmds.cpp
+++ b/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
index f3911bd59f0..f3911bd59f0 100644
--- a/src/vpp-api/vom/route_domain_cmds.hpp
+++ b/extras/vom/vom/route_domain_cmds.hpp
diff --git a/src/vpp-api/vom/rpc_cmd.hpp b/extras/vom/vom/rpc_cmd.hpp
index 84b6717c53b..84b6717c53b 100644
--- a/src/vpp-api/vom/rpc_cmd.hpp
+++ b/extras/vom/vom/rpc_cmd.hpp
diff --git a/src/vpp-api/vom/singular_db.hpp b/extras/vom/vom/singular_db.hpp
index afca9a3509e..afca9a3509e 100644
--- a/src/vpp-api/vom/singular_db.hpp
+++ b/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
index dddc6e4c229..dddc6e4c229 100644
--- a/src/vpp-api/vom/singular_db_funcs.hpp
+++ b/extras/vom/vom/singular_db_funcs.hpp
diff --git a/src/vpp-api/vom/sub_interface.cpp b/extras/vom/vom/sub_interface.cpp
index 42f75791968..42f75791968 100644
--- a/src/vpp-api/vom/sub_interface.cpp
+++ b/extras/vom/vom/sub_interface.cpp
diff --git a/src/vpp-api/vom/sub_interface.hpp b/extras/vom/vom/sub_interface.hpp
index 506133c900d..506133c900d 100644
--- a/src/vpp-api/vom/sub_interface.hpp
+++ b/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
index 47af69268d1..47af69268d1 100644
--- a/src/vpp-api/vom/sub_interface_cmds.cpp
+++ b/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
index a21323200bb..a21323200bb 100644
--- a/src/vpp-api/vom/sub_interface_cmds.hpp
+++ b/extras/vom/vom/sub_interface_cmds.hpp
diff --git a/src/vpp-api/vom/tap_interface.cpp b/extras/vom/vom/tap_interface.cpp
index d7f16f5c132..d7f16f5c132 100644
--- a/src/vpp-api/vom/tap_interface.cpp
+++ b/extras/vom/vom/tap_interface.cpp
diff --git a/src/vpp-api/vom/tap_interface.hpp b/extras/vom/vom/tap_interface.hpp
index d9df9a92a8d..d9df9a92a8d 100644
--- a/src/vpp-api/vom/tap_interface.hpp
+++ b/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
index b0885607742..b0885607742 100644
--- a/src/vpp-api/vom/tap_interface_cmds.cpp
+++ b/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
index 1c1a3468c9b..1c1a3468c9b 100644
--- a/src/vpp-api/vom/tap_interface_cmds.hpp
+++ b/extras/vom/vom/tap_interface_cmds.hpp
diff --git a/src/vpp-api/vom/types.cpp b/extras/vom/vom/types.cpp
index c6093ebd15d..c6093ebd15d 100644
--- a/src/vpp-api/vom/types.cpp
+++ b/extras/vom/vom/types.cpp
diff --git a/src/vpp-api/vom/types.hpp b/extras/vom/vom/types.hpp
index 53654c51ac5..53654c51ac5 100644
--- a/src/vpp-api/vom/types.hpp
+++ b/extras/vom/vom/types.hpp
diff --git a/src/vpp-api/vom/vxlan_tunnel.cpp b/extras/vom/vom/vxlan_tunnel.cpp
index 3d5ed64c5e0..3d5ed64c5e0 100644
--- a/src/vpp-api/vom/vxlan_tunnel.cpp
+++ b/extras/vom/vom/vxlan_tunnel.cpp
diff --git a/src/vpp-api/vom/vxlan_tunnel.hpp b/extras/vom/vom/vxlan_tunnel.hpp
index a0b3e9afa3e..a0b3e9afa3e 100644
--- a/src/vpp-api/vom/vxlan_tunnel.hpp
+++ b/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
index ca4ccf3c38a..ca4ccf3c38a 100644
--- a/src/vpp-api/vom/vxlan_tunnel_cmds.cpp
+++ b/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
index 4a8e5990391..4a8e5990391 100644
--- a/src/vpp-api/vom/vxlan_tunnel_cmds.hpp
+++ b/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
+