263 files changed, 2635 insertions, 250 deletions
diff --git a/extras/vom/CMakeLists.txt b/extras/deprecated/vom/CMakeLists.txt
index 4947235717e..4947235717e 100644
--- a/extras/vom/CMakeLists.txt
+++ b/extras/deprecated/vom/CMakeLists.txt
diff --git a/extras/vom/cmake/CMakeLists.txt b/extras/deprecated/vom/cmake/CMakeLists.txt
index dff24a99180..dff24a99180 100644
--- a/extras/vom/cmake/CMakeLists.txt
+++ b/extras/deprecated/vom/cmake/CMakeLists.txt
diff --git a/extras/vom/cmake/FindCheck.cmake b/extras/deprecated/vom/cmake/FindCheck.cmake
index e5f399c5449..e5f399c5449 100644
--- a/extras/vom/cmake/FindCheck.cmake
+++ b/extras/deprecated/vom/cmake/FindCheck.cmake
diff --git a/extras/vom/cmake/FindSubunit.cmake b/extras/deprecated/vom/cmake/FindSubunit.cmake
index 121cb5f10e2..121cb5f10e2 100644
--- a/extras/vom/cmake/FindSubunit.cmake
+++ b/extras/deprecated/vom/cmake/FindSubunit.cmake
diff --git a/extras/vom/cmake/VOMConfig.cmake b/extras/deprecated/vom/cmake/VOMConfig.cmake
index a2ea6b60491..a2ea6b60491 100644
--- a/extras/vom/cmake/VOMConfig.cmake
+++ b/extras/deprecated/vom/cmake/VOMConfig.cmake
diff --git a/extras/deprecated/vom/test/test_vom.py b/extras/deprecated/vom/test/test_vom.py
new file mode 100644
index 00000000000..7dea7697f8c
--- /dev/null
+++ b/extras/deprecated/vom/test/test_vom.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+""" VAPI test """
+
+import unittest
+import os
+import signal
+from framework import VppTestCase, running_extended_tests, \
+    VppTestRunner, Worker
+
+
+@unittest.skipUnless(running_extended_tests, "part of extended tests")
+class VOMTestCase(VppTestCase):
+    """ VPP Object Model Test """
+
+    @classmethod
+    def setUpClass(cls):
+        super(VOMTestCase, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(VOMTestCase, cls).tearDownClass()
+
+    def test_vom_cpp(self):
+        """ run C++ VOM tests """
+        var = "TEST_BR"
+        built_root = os.getenv(var, None)
+        self.assertIsNotNone(built_root,
+                             "Environment variable `%s' not set" % var)
+        executable = "%s/vom_test/vom_test" % built_root
+        worker = Worker(
+            [executable, "vpp object model", self.shm_prefix], self.logger)
+        worker.start()
+        timeout = 120
+        worker.join(timeout)
+        self.logger.info("Worker result is `%s'" % worker.result)
+        error = False
+        if worker.result is None:
+            try:
+                error = True
+                self.logger.error(
+                    "Timeout! Worker did not finish in %ss" % timeout)
+                os.killpg(os.getpgid(worker.process.pid), signal.SIGTERM)
+                worker.join()
+            except:
+                raise Exception("Couldn't kill worker-spawned process")
+        if error:
+            raise Exception(
+                "Timeout! Worker did not finish in %ss" % timeout)
+        self.assert_equal(worker.result, 0, "Binary test return code")
+
+
+if __name__ == '__main__':
+    unittest.main(testRunner=VppTestRunner)
diff --git a/extras/deprecated/vom/test/vom_test.cpp b/extras/deprecated/vom/test/vom_test.cpp
new file mode 100644
index 00000000000..fa9ecdafe80
--- /dev/null
+++ b/extras/deprecated/vom/test/vom_test.cpp
@@ -0,0 +1,2287 @@
+/*
+ * Test suite for class VppOM
+ *
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+#define BOOST_TEST_MODULE "VPP OBJECT MODEL"
+#define BOOST_TEST_DYN_LINK
+
+#include <boost/test/unit_test.hpp>
+#include <boost/assign/list_inserter.hpp>
+
+
+#include <iostream>
+#include <deque>
+
+#include "vom/om.hpp"
+#include "vom/interface.hpp"
+#include "vom/interface_cmds.hpp"
+#include "vom/bond_interface_cmds.hpp"
+#include "vom/bond_group_binding.hpp"
+#include "vom/bond_group_binding_cmds.hpp"
+#include "vom/l2_binding.hpp"
+#include "vom/l2_binding_cmds.hpp"
+#include "vom/l2_vtr_cmds.hpp"
+#include "vom/l2_xconnect.hpp"
+#include "vom/l2_xconnect_cmds.hpp"
+#include "vom/l3_binding.hpp"
+#include "vom/l3_binding_cmds.hpp"
+#include "vom/bridge_domain.hpp"
+#include "vom/bridge_domain_entry.hpp"
+#include "vom/bridge_domain_arp_entry.hpp"
+#include "vom/bridge_domain_cmds.hpp"
+#include "vom/bridge_domain_entry_cmds.hpp"
+#include "vom/bridge_domain_arp_entry_cmds.hpp"
+#include "vom/prefix.hpp"
+#include "vom/route.hpp"
+#include "vom/route_cmds.hpp"
+#include "vom/mroute_cmds.hpp"
+#include "vom/route_domain.hpp"
+#include "vom/route_domain_cmds.hpp"
+#include "vom/vxlan_tunnel.hpp"
+#include "vom/vxlan_tunnel_cmds.hpp"
+#include "vom/sub_interface.hpp"
+#include "vom/sub_interface_cmds.hpp"
+#include "vom/acl_ethertype.hpp"
+#include "vom/acl_ethertype_cmds.hpp"
+#include "vom/acl_l2_list.hpp"
+#include "vom/acl_l3_list.hpp"
+#include "vom/acl_binding.hpp"
+#include "vom/acl_list_cmds.hpp"
+#include "vom/acl_binding_cmds.hpp"
+#include "vom/acl_l3_rule.hpp"
+#include "vom/acl_l2_rule.hpp"
+#include "vom/arp_proxy_config.hpp"
+#include "vom/arp_proxy_binding.hpp"
+#include "vom/arp_proxy_config_cmds.hpp"
+#include "vom/arp_proxy_binding_cmds.hpp"
+#include "vom/igmp_binding.hpp"
+#include "vom/igmp_binding_cmds.hpp"
+#include "vom/igmp_listen.hpp"
+#include "vom/igmp_listen_cmds.hpp"
+#include "vom/ip_punt_redirect.hpp"
+#include "vom/ip_punt_redirect_cmds.hpp"
+#include "vom/ip_unnumbered.hpp"
+#include "vom/ip_unnumbered_cmds.hpp"
+#include "vom/interface_ip6_nd.hpp"
+#include "vom/interface_span.hpp"
+#include "vom/interface_span_cmds.hpp"
+#include "vom/neighbour.hpp"
+#include "vom/neighbour_cmds.hpp"
+#include "vom/nat_static.hpp"
+#include "vom/nat_static_cmds.hpp"
+#include "vom/nat_binding.hpp"
+#include "vom/nat_binding_cmds.hpp"
+#include "vom/pipe.hpp"
+#include "vom/pipe_cmds.hpp"
+#include "vom/qos_mark.hpp"
+#include "vom/qos_mark_cmds.hpp"
+#include "vom/qos_map.hpp"
+#include "vom/qos_map_cmds.hpp"
+#include "vom/qos_record.hpp"
+#include "vom/qos_record_cmds.hpp"
+#include "vom/qos_store.hpp"
+#include "vom/qos_store_cmds.hpp"
+
+using namespace boost;
+using namespace VOM;
+
+/**
+ * An expectation exception
+ */
+class ExpException
+{
+public:
+    ExpException(unsigned int number)
+    {
+        // a neat place to add a break point
+        // std::cout << "  ExpException here: " << number << std::endl;
+    }
+};
+
+class MockListener : public interface::event_listener,
+                     public interface::stat_listener
+{
+    void handle_interface_stat(const interface& itf)
+    {
+    }
+    void handle_interface_event(std::vector<VOM::interface::event> events)
+    {
+    }
+};
+
+class MockCmdQ : public HW::cmd_q
+{
+public:
+    MockCmdQ():
+        m_strict_order(true)
+    {
+    }
+    virtual ~MockCmdQ()
+    {
+    }
+    void expect(cmd *f)
+    {
+        m_exp_queue.push_back(f);
+    }
+    void enqueue(cmd *f)
+    {
+        m_act_queue.push_back(f);
+    }
+    void enqueue(std::queue<cmd*> &cmds)
+    {
+        while (cmds.size())
+        {
+            m_act_queue.push_back(cmds.front());
+            cmds.pop();
+        }
+    }
+    void enqueue(std::shared_ptr<cmd> f)
+    {
+        m_act_queue.push_back(f.get());
+    }
+
+    void dequeue(cmd *f)
+    {
+    }
+
+    void dequeue(std::shared_ptr<cmd> cmd)
+    {
+    }
+
+    void strict_order(bool on)
+    {
+        m_strict_order = on;
+    }
+
+    bool is_empty()
+    {
+        return ((0 == m_exp_queue.size()) &&
+                (0 == m_act_queue.size()));
+    }
+
+    rc_t write()
+    {
+        cmd *f_exp, *f_act;
+        rc_t rc = rc_t::OK;
+
+        while (m_act_queue.size())
+        {
+            bool matched = false;
+            auto it_exp = m_exp_queue.begin();
+            auto it_act = m_act_queue.begin();
+
+            f_act = *it_act;
+
+            std::cout << " Act: " << f_act->to_string() << std::endl;
+            while (it_exp != m_exp_queue.end())
+            {
+                f_exp = *it_exp;
+                try
+                {
+                    std::cout << "  Exp: " << f_exp->to_string() << std::endl;
+
+                    if (typeid(*f_exp) != typeid(*f_act))
+                    {
+                        throw ExpException(1);
+                    }
+
+                    if (typeid(*f_exp) == typeid(interface_cmds::af_packet_create_cmd))
+                    {
+                        rc = handle_derived<interface_cmds::af_packet_create_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(interface_cmds::loopback_create_cmd))
+                    {
+                        rc = handle_derived<interface_cmds::loopback_create_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(interface_cmds::bvi_create_cmd))
+                    {
+                        rc = handle_derived<interface_cmds::bvi_create_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(interface_cmds::vhost_create_cmd))
+                    {
+                        rc = handle_derived<interface_cmds::vhost_create_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(bond_interface_cmds::create_cmd))
+                    {
+                       rc = handle_derived<bond_interface_cmds::create_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(interface_cmds::loopback_delete_cmd))
+                    {
+                        rc = handle_derived<interface_cmds::loopback_delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(interface_cmds::bvi_delete_cmd))
+                    {
+                        rc = handle_derived<interface_cmds::bvi_delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(interface_cmds::af_packet_delete_cmd))
+                    {
+                        rc = handle_derived<interface_cmds::af_packet_delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(interface_cmds::vhost_delete_cmd))
+                    {
+                       rc = handle_derived<interface_cmds::vhost_delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(bond_interface_cmds::delete_cmd))
+                    {
+                       rc = handle_derived<bond_interface_cmds::delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(interface_cmds::state_change_cmd))
+                    {
+                        rc = handle_derived<interface_cmds::state_change_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(interface_cmds::set_table_cmd))
+                    {
+                        rc = handle_derived<interface_cmds::set_table_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(interface_cmds::set_mac_cmd))
+                    {
+                        rc = handle_derived<interface_cmds::set_mac_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(interface_cmds::set_tag))
+                    {
+                        rc = handle_derived<interface_cmds::set_tag>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(bond_group_binding_cmds::bind_cmd))
+                    {
+                       rc = handle_derived<bond_group_binding_cmds::bind_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(bond_group_binding_cmds::unbind_cmd))
+                    {
+                       rc = handle_derived<bond_group_binding_cmds::unbind_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(route_domain_cmds::create_cmd))
+                    {
+			rc = handle_derived<route_domain_cmds::create_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(route_domain_cmds::delete_cmd))
+                    {
+                        rc = handle_derived<route_domain_cmds::delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(route::ip_route_cmds::update_cmd))
+                    {
+			rc = handle_derived<route::ip_route_cmds::update_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(route::ip_route_cmds::delete_cmd))
+                    {
+                        rc = handle_derived<route::ip_route_cmds::delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(route::ip_mroute_cmds::update_cmd))
+                    {
+			rc = handle_derived<route::ip_mroute_cmds::update_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(route::ip_mroute_cmds::delete_cmd))
+                    {
+                        rc = handle_derived<route::ip_mroute_cmds::delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(neighbour_cmds::create_cmd))
+                    {
+			rc = handle_derived<neighbour_cmds::create_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(neighbour_cmds::delete_cmd))
+                    {
+                        rc = handle_derived<neighbour_cmds::delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(l3_binding_cmds::bind_cmd))
+                    {
+                        rc = handle_derived<l3_binding_cmds::bind_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(l3_binding_cmds::unbind_cmd))
+                    {
+                        rc = handle_derived<l3_binding_cmds::unbind_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(bridge_domain_cmds::create_cmd))
+                    {
+                        rc = handle_derived<bridge_domain_cmds::create_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(bridge_domain_cmds::delete_cmd))
+                    {
+                        rc = handle_derived<bridge_domain_cmds::delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(bridge_domain_entry_cmds::create_cmd))
+                    {
+                        rc = handle_derived<bridge_domain_entry_cmds::create_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(bridge_domain_entry_cmds::delete_cmd))
+                    {
+                        rc = handle_derived<bridge_domain_entry_cmds::delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(bridge_domain_arp_entry_cmds::create_cmd))
+                    {
+                        rc = handle_derived<bridge_domain_arp_entry_cmds::create_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(bridge_domain_arp_entry_cmds::delete_cmd))
+                    {
+                        rc = handle_derived<bridge_domain_arp_entry_cmds::delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(l2_binding_cmds::bind_cmd))
+                    {
+                        rc = handle_derived<l2_binding_cmds::bind_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(l2_binding_cmds::unbind_cmd))
+                    {
+                        rc = handle_derived<l2_binding_cmds::unbind_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(l2_vtr_cmds::set_cmd))
+                    {
+                        rc = handle_derived<l2_vtr_cmds::set_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(l2_xconnect_cmds::bind_cmd))
+                    {
+                        rc = handle_derived<l2_xconnect_cmds::bind_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(l2_xconnect_cmds::unbind_cmd))
+                    {
+                        rc = handle_derived<l2_xconnect_cmds::unbind_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(vxlan_tunnel_cmds::create_cmd))
+                    {
+                        rc = handle_derived<vxlan_tunnel_cmds::create_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(vxlan_tunnel_cmds::delete_cmd))
+                    {
+                        rc = handle_derived<vxlan_tunnel_cmds::delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(sub_interface_cmds::create_cmd))
+                    {
+                        rc = handle_derived<sub_interface_cmds::create_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(sub_interface_cmds::delete_cmd))
+                    {
+                        rc = handle_derived<sub_interface_cmds::delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(ACL::acl_ethertype_cmds::bind_cmd))
+                    {
+                        rc = handle_derived<ACL::acl_ethertype_cmds::bind_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(ACL::acl_ethertype_cmds::unbind_cmd))
+                    {
+                        rc = handle_derived<ACL::acl_ethertype_cmds::unbind_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(ACL::list_cmds::l3_update_cmd))
+                    {
+                        rc = handle_derived<ACL::list_cmds::l3_update_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(ACL::list_cmds::l3_delete_cmd))
+                    {
+                        rc = handle_derived<ACL::list_cmds::l3_delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(ACL::binding_cmds::l3_bind_cmd))
+                    {
+                        rc = handle_derived<ACL::binding_cmds::l3_bind_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(ACL::binding_cmds::l3_unbind_cmd))
+                    {
+                        rc = handle_derived<ACL::binding_cmds::l3_unbind_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(ACL::list_cmds::l2_update_cmd))
+                    {
+                        rc = handle_derived<ACL::list_cmds::l2_update_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(ACL::list_cmds::l2_delete_cmd))
+                    {
+                        rc = handle_derived<ACL::list_cmds::l2_delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(ACL::binding_cmds::l2_bind_cmd))
+                    {
+                        rc = handle_derived<ACL::binding_cmds::l2_bind_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(ACL::binding_cmds::l2_unbind_cmd))
+                    {
+                        rc = handle_derived<ACL::binding_cmds::l2_unbind_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(arp_proxy_binding_cmds::bind_cmd))
+                    {
+                        rc = handle_derived<arp_proxy_binding_cmds::bind_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(arp_proxy_binding_cmds::unbind_cmd))
+                    {
+                        rc = handle_derived<arp_proxy_binding_cmds::unbind_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(arp_proxy_config_cmds::config_cmd))
+                    {
+                        rc = handle_derived<arp_proxy_config_cmds::config_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(arp_proxy_config_cmds::unconfig_cmd))
+                    {
+                        rc = handle_derived<arp_proxy_config_cmds::unconfig_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(igmp_binding_cmds::bind_cmd))
+                    {
+                        rc = handle_derived<igmp_binding_cmds::bind_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(igmp_binding_cmds::unbind_cmd))
+                    {
+                        rc = handle_derived<igmp_binding_cmds::unbind_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(igmp_listen_cmds::listen_cmd))
+                    {
+                        rc = handle_derived<igmp_listen_cmds::listen_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(igmp_listen_cmds::unlisten_cmd))
+                    {
+                        rc = handle_derived<igmp_listen_cmds::unlisten_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(ip_punt_redirect_cmds::config_cmd))
+                    {
+                        rc = handle_derived<ip_punt_redirect_cmds::config_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(ip_punt_redirect_cmds::unconfig_cmd))
+                    {
+                        rc = handle_derived<ip_punt_redirect_cmds::unconfig_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(ip_unnumbered_cmds::config_cmd))
+                    {
+                        rc = handle_derived<ip_unnumbered_cmds::config_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(ip_unnumbered_cmds::unconfig_cmd))
+                    {
+                        rc = handle_derived<ip_unnumbered_cmds::unconfig_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(ip6nd_ra_config::config_cmd))
+                    {
+                        rc = handle_derived<ip6nd_ra_config::config_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(ip6nd_ra_config::unconfig_cmd))
+                    {
+                        rc = handle_derived<ip6nd_ra_config::unconfig_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(ip6nd_ra_prefix::config_cmd))
+                    {
+                        rc = handle_derived<ip6nd_ra_prefix::config_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(ip6nd_ra_prefix::unconfig_cmd))
+                    {
+                        rc = handle_derived<ip6nd_ra_prefix::unconfig_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(interface_span_cmds::config_cmd))
+                    {
+                        rc = handle_derived<interface_span_cmds::config_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(interface_span_cmds::unconfig_cmd))
+                    {
+                        rc = handle_derived<interface_span_cmds::unconfig_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(nat_static_cmds::create_44_cmd))
+                    {
+                        rc = handle_derived<nat_static_cmds::create_44_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(nat_static_cmds::delete_44_cmd))
+                    {
+                        rc = handle_derived<nat_static_cmds::delete_44_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(nat_binding_cmds::bind_44_input_cmd))
+                    {
+                        rc = handle_derived<nat_binding_cmds::bind_44_input_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(nat_binding_cmds::unbind_44_input_cmd))
+                    {
+                        rc = handle_derived<nat_binding_cmds::unbind_44_input_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(interface_cmds::events_cmd))
+                    {
+                        rc = handle_derived<interface_cmds::events_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(pipe_cmds::create_cmd))
+                    {
+                        rc = handle_derived<pipe_cmds::create_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(pipe_cmds::delete_cmd))
+                    {
+                        rc = handle_derived<pipe_cmds::delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(QoS::mark_cmds::create_cmd))
+                    {
+                        rc = handle_derived<QoS::mark_cmds::create_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(QoS::mark_cmds::delete_cmd))
+                    {
+                        rc = handle_derived<QoS::mark_cmds::delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(QoS::record_cmds::create_cmd))
+                    {
+                        rc = handle_derived<QoS::record_cmds::create_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(QoS::record_cmds::delete_cmd))
+                    {
+                        rc = handle_derived<QoS::record_cmds::delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(QoS::store_cmds::create_cmd))
+                    {
+                        rc = handle_derived<QoS::store_cmds::create_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(QoS::store_cmds::delete_cmd))
+                    {
+                        rc = handle_derived<QoS::store_cmds::delete_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(QoS::map_cmds::create_cmd))
+                    {
+                        rc = handle_derived<QoS::map_cmds::create_cmd>(f_exp, f_act);
+                    }
+                    else if (typeid(*f_exp) == typeid(QoS::map_cmds::delete_cmd))
+                    {
+                        rc = handle_derived<QoS::map_cmds::delete_cmd>(f_exp, f_act);
+                    }
+                    else
+                    {
+                        throw ExpException(2);
+                    }
+
+                    // if we get here then we found the match.
+                    m_exp_queue.erase(it_exp);
+                    m_act_queue.erase(it_act);
+                    delete f_exp;
+                    delete f_act;
+
+                    // return any injected failures to the agent
+                    if (rc_t::OK != rc && rc_t::NOOP != rc)
+                    {
+                        return (rc);
+                    }
+
+                    matched = true;
+                    break;
+                }
+                catch (ExpException &e)
+                {
+                    // The expected and actual do not match
+                    if (m_strict_order)
+                    {
+                        // in strict ordering mode this is fatal, so rethrow
+                        throw e;
+                    }
+                    else
+                    {
+                        // move the iterator onto the next in the expected list and
+                        // check for a match
+                        ++it_exp;
+                    }
+                }
+            }
+
+            if (!matched)
+                throw ExpException(3);
+        }
+
+        return (rc);
+    }
+private:
+
+    template <typename T>
+    rc_t handle_derived(const cmd *f_exp, cmd *f_act)
+    {
+        const T *i_exp;
+        T *i_act;
+
+        i_exp = dynamic_cast<const T*>(f_exp);
+        i_act = dynamic_cast<T*>(f_act);
+        if (!(*i_exp == *i_act))
+        {
+            throw ExpException(4);
+        }
+        // pass the data and return code to the agent
+        i_act->item() = i_exp->item();
+
+        return (i_act->item().rc());
+    }
+
+    // The Q to push the expectations on
+    std::deque<cmd*> m_exp_queue;
+
+    // the queue to push the actual events on
+    std::deque<cmd*> m_act_queue;
+
+    // control whether the expected queue is strictly ordered.
+    bool m_strict_order;
+};
+
+class VppInit {
+public:
+    std::string name;
+    MockCmdQ *f;
+
+    VppInit()
+        : name("vpp-ut"),
+          f(new MockCmdQ())
+    {
+        HW::init(f);
+        OM::init();
+        logger().set(log_level_t::DEBUG);
+    }
+
+    ~VppInit() {
+        delete f;
+    }
+};
+
+BOOST_AUTO_TEST_SUITE(vom)
+
+#define TRY_CHECK_RC(stmt)                    \
+{                                             \
+    try {                                     \
+        BOOST_CHECK(rc_t::OK == stmt);        \
+    }                                         \
+    catch (ExpException &e)                   \
+    {                                         \
+        BOOST_CHECK(false);                   \
+    }                                         \
+    BOOST_CHECK(vi.f->is_empty());            \
+}
+
+#define TRY_CHECK(stmt)                       \
+{                                             \
+    try {                                     \
+        stmt;                                 \
+    }                                         \
+    catch (ExpException &e)                   \
+    {                                         \
+        BOOST_CHECK(false);                   \
+    }                                         \
+    BOOST_CHECK(vi.f->is_empty());            \
+}
+
+#define ADD_EXPECT(stmt)                      \
+    vi.f->expect(new stmt)
+
+#define STRICT_ORDER_OFF()                        \
+    vi.f->strict_order(false)
+
+BOOST_AUTO_TEST_CASE(test_interface) {
+    VppInit vi;
+    const std::string go = "GeorgeOrwell";
+    const std::string js = "JohnSteinbeck";
+    rc_t rc = rc_t::OK;
+
+    /*
+     * George creates and deletes the interface
+     */
+    std::string itf1_name = "afpacket1";
+    interface itf1(itf1_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+
+    /*
+     * set the expectation for a afpacket interface create.
+     *  2 is the interface handle VPP [mock] assigns
+     */
+    HW::item<handle_t> hw_ifh(2, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf1_name));
+
+    HW::item<interface::admin_state_t> hw_as_up(interface::admin_state_t::UP, rc_t::OK);
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+
+    TRY_CHECK_RC(OM::write(go, itf1));
+
+    HW::item<interface::admin_state_t> hw_as_down(interface::admin_state_t::DOWN, rc_t::OK);
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf1_name));
+
+    TRY_CHECK(OM::remove(go));
+
+    /*
+     * George creates the interface, then John brings it down.
+     * George's remove is a no-op, sice John also owns the interface
+     */
+    interface itf1b(itf1_name,
+                    interface::type_t::AFPACKET,
+                    interface::admin_state_t::DOWN);
+
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf1_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+    TRY_CHECK_RC(OM::write(go, itf1));
+
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    TRY_CHECK_RC(OM::write(js, itf1b));
+
+    TRY_CHECK(OM::remove(go));
+
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf1_name));
+    TRY_CHECK(OM::remove(js));
+
+    /*
+     * George adds an interface, then we flush all of Geroge's state
+     */
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf1_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+    TRY_CHECK_RC(OM::write(go, itf1));
+
+    TRY_CHECK(OM::mark(go));
+
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf1_name));
+    TRY_CHECK(OM::sweep(go));
+
+    /*
+     * George adds an interface. mark stale. update the same interface. sweep
+     * and expect no delete
+     */
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf1_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    TRY_CHECK_RC(OM::write(go, itf1b));
+
+    TRY_CHECK(OM::mark(go));
+
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+    TRY_CHECK_RC(OM::write(go, itf1));
+
+    TRY_CHECK(OM::sweep(go));
+
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf1_name));
+    TRY_CHECK(OM::remove(go));
+
+    /*
+     * George adds an insterface, then we mark that state. Add a second interface
+     * an flush the first that is now stale.
+     */
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf1_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+    TRY_CHECK_RC(OM::write(go, itf1));
+
+    TRY_CHECK(OM::mark(go));
+
+    std::string itf2_name = "afpacket2";
+    std::string itf2_tag = "uuid-of-afpacket2-interface";
+    interface itf2(itf2_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP,
+                   itf2_tag);
+    HW::item<handle_t> hw_ifh2(3, rc_t::OK);
+
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh2, itf2_name));
+    ADD_EXPECT(interface_cmds::set_tag(hw_ifh2, itf2_tag));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh2));
+    TRY_CHECK_RC(OM::write(go, itf2));
+
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf1_name));
+    TRY_CHECK(OM::sweep(go));
+
+    TRY_CHECK(OM::mark(go));
+
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh2));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh2, itf2_name));
+    TRY_CHECK(OM::sweep(go));
+
+
+    std::string itf3_name = "/PATH/TO/vhost_user1.sock";
+    std::string itf3_tag = "uuid-of-vhost_user1-interface";
+    interface itf3(itf3_name,
+                   interface::type_t::VHOST,
+                   interface::admin_state_t::UP,
+                   itf3_tag);
+    HW::item<handle_t> hw_ifh3(4, rc_t::OK);
+
+    ADD_EXPECT(interface_cmds::vhost_create_cmd(hw_ifh3, itf3_name, itf3_tag));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh3));
+    TRY_CHECK_RC(OM::write(go, itf3));
+
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh3));
+    ADD_EXPECT(interface_cmds::vhost_delete_cmd(hw_ifh3, itf3_name));
+    TRY_CHECK(OM::remove(go));
+}
+
+BOOST_AUTO_TEST_CASE(test_bvi) {
+    VppInit vi;
+    const std::string ernest = "ErnestHemmingway";
+    const std::string graham = "GrahamGreene";
+    rc_t rc = rc_t::OK;
+    l3_binding *l3;
+
+    HW::item<interface::admin_state_t> hw_as_up(interface::admin_state_t::UP,
+                                                rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_down(interface::admin_state_t::DOWN,
+                                                  rc_t::OK);
+
+    /*
+     * Enrest creates a BVI with address 10.10.10.10/24
+     */
+    route::prefix_t pfx_10("10.10.10.10", 24);
+
+    const std::string bvi_name = "bvi1";
+    interface itf(bvi_name,
+                  interface::type_t::BVI,
+                  interface::admin_state_t::UP);
+    HW::item<handle_t> hw_ifh(4, rc_t::OK);
+    HW::item<route::prefix_t> hw_pfx_10(pfx_10, rc_t::OK);
+
+    ADD_EXPECT(interface_cmds::bvi_create_cmd(hw_ifh, bvi_name));
+    ADD_EXPECT(interface_cmds::set_tag(hw_ifh, bvi_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+    TRY_CHECK_RC(OM::write(ernest, itf));
+
+    l3 = new l3_binding(itf, pfx_10);
+    HW::item<bool> hw_l3_bind(true, rc_t::OK);
+    HW::item<bool> hw_l3_unbind(false, rc_t::OK);
+    ADD_EXPECT(l3_binding_cmds::bind_cmd(hw_l3_bind, hw_ifh.data(), pfx_10));
+    TRY_CHECK_RC(OM::write(ernest, *l3));
+
+    // change the MAC address on the BVI
+    interface itf_new_mac(bvi_name,
+                          interface::type_t::BVI,
+                          interface::admin_state_t::UP);
+    l2_address_t l2_addr({0,1,2,3,4,5});
+    HW::item<l2_address_t> hw_mac(l2_addr, rc_t::OK);
+    itf_new_mac.set(l2_addr);
+    ADD_EXPECT(interface_cmds::set_mac_cmd(hw_mac, hw_ifh));
+    TRY_CHECK_RC(OM::write(ernest, itf_new_mac));
+
+    // create/write the interface to the OM again but with an unset MAC
+    // this should not generate a MAC address update
+    TRY_CHECK_RC(OM::write(ernest, itf));
+
+    // change the MAC address on the BVI - again
+    interface itf_new_mac2(bvi_name,
+                           interface::type_t::BVI,
+                           interface::admin_state_t::UP);
+    l2_address_t l2_addr2({0,1,2,3,4,6});
+    HW::item<l2_address_t> hw_mac2(l2_addr2, rc_t::OK);
+    itf_new_mac2.set(l2_addr2);
+    ADD_EXPECT(interface_cmds::set_mac_cmd(hw_mac2, hw_ifh));
+    TRY_CHECK_RC(OM::write(ernest, itf_new_mac2));
+
+    delete l3;
+    ADD_EXPECT(l3_binding_cmds::unbind_cmd(hw_l3_unbind, hw_ifh.data(), pfx_10));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::bvi_delete_cmd(hw_ifh));
+    TRY_CHECK(OM::remove(ernest));
+
+    /*
+     * Graham creates a BVI with address 10.10.10.10/24 in Routing Domain
+     */
+    route_domain rd(1);
+    HW::item<bool> hw_rd4_create(true, rc_t::OK);
+    HW::item<bool> hw_rd4_delete(false, rc_t::OK);
+    HW::item<bool> hw_rd6_create(true, rc_t::OK);
+    HW::item<bool> hw_rd6_delete(false, rc_t::OK);
+    HW::item<route::table_id_t> hw_rd4_bind(1, rc_t::OK);
+    HW::item<route::table_id_t> hw_rd4_unbind(route::DEFAULT_TABLE, rc_t::OK);
+    HW::item<route::table_id_t> hw_rd6_bind(1, rc_t::OK);
+    HW::item<route::table_id_t> hw_rd6_unbind(route::DEFAULT_TABLE, rc_t::OK);
+    ADD_EXPECT(route_domain_cmds::create_cmd(hw_rd4_create, l3_proto_t::IPV4, 1));
+    ADD_EXPECT(route_domain_cmds::create_cmd(hw_rd6_create, l3_proto_t::IPV6, 1));
+    TRY_CHECK_RC(OM::write(graham, rd));
+
+    const std::string bvi2_name = "bvi2";
+    interface *itf2 = new interface(bvi2_name,
+                                    interface::type_t::BVI,
+                                    interface::admin_state_t::UP,
+                                    rd);
+    HW::item<handle_t> hw_ifh2(5, rc_t::OK);
+
+    ADD_EXPECT(interface_cmds::bvi_create_cmd(hw_ifh2, bvi2_name));
+    ADD_EXPECT(interface_cmds::set_tag(hw_ifh2, bvi2_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh2));
+    ADD_EXPECT(interface_cmds::set_table_cmd(hw_rd4_bind, l3_proto_t::IPV4, hw_ifh2));
+    ADD_EXPECT(interface_cmds::set_table_cmd(hw_rd6_bind, l3_proto_t::IPV6, hw_ifh2));
+
+    TRY_CHECK_RC(OM::write(graham, *itf2));
+
+    l3 = new l3_binding(*itf2, pfx_10);
+    ADD_EXPECT(l3_binding_cmds::bind_cmd(hw_l3_bind, hw_ifh2.data(), pfx_10));
+    TRY_CHECK_RC(OM::write(graham, *l3));
+
+    delete l3;
+    delete itf2;
+
+    ADD_EXPECT(l3_binding_cmds::unbind_cmd(hw_l3_unbind, hw_ifh2.data(), pfx_10));
+    ADD_EXPECT(interface_cmds::set_table_cmd(hw_rd4_unbind, l3_proto_t::IPV4, hw_ifh2));
+    ADD_EXPECT(interface_cmds::set_table_cmd(hw_rd6_unbind, l3_proto_t::IPV6, hw_ifh2));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh2));
+    ADD_EXPECT(interface_cmds::bvi_delete_cmd(hw_ifh2));
+    ADD_EXPECT(route_domain_cmds::delete_cmd(hw_rd4_delete, l3_proto_t::IPV4, 1));
+    ADD_EXPECT(route_domain_cmds::delete_cmd(hw_rd6_delete, l3_proto_t::IPV6, 1));
+    TRY_CHECK(OM::remove(graham));
+}
+
+BOOST_AUTO_TEST_CASE(test_bond) {
+    VppInit vi;
+    const std::string cb = "CarolBerg";
+    rc_t rc = rc_t::OK;
+
+    /*
+     * creates the interfaces
+     */
+    std::string itf1_name = "afpacket1";
+    interface itf1(itf1_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+
+    HW::item<handle_t> hw_ifh(2, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf1_name));
+
+    HW::item<interface::admin_state_t> hw_as_up(interface::admin_state_t::UP, rc_t::OK);
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+
+    TRY_CHECK_RC(OM::write(cb, itf1));
+
+    std::string itf2_name = "afpacket2";
+    interface itf2(itf2_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+
+
+    HW::item<handle_t> hw_ifh2(4, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh2, itf2_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh2));
+
+    TRY_CHECK_RC(OM::write(cb, itf2));
+
+    std::string bond_name = "bond";
+    bond_interface bond_itf(bond_name, interface::admin_state_t::UP,
+                                 bond_interface::mode_t::LACP);
+
+    HW::item<handle_t> hw_ifh3(6, rc_t::OK);
+    ADD_EXPECT(bond_interface_cmds::create_cmd(hw_ifh3, bond_name,
+      bond_interface::mode_t::LACP, bond_interface::lb_t::L2, l2_address_t::ZERO));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh3));
+
+    TRY_CHECK_RC(OM::write(cb, bond_itf));
+
+    bond_member *bm1 = new bond_member(itf1, bond_member::mode_t::ACTIVE,
+                                         bond_member::rate_t::SLOW);
+    bond_member *bm2 = new bond_member(itf2, bond_member::mode_t::ACTIVE,
+                                         bond_member::rate_t::SLOW);
+    bond_group_binding *bgb = new bond_group_binding(bond_itf, {*bm1, *bm2});
+
+    HW::item<bool> bond_hw_bind(true, rc_t::OK);
+    ADD_EXPECT(bond_group_binding_cmds::bind_cmd(bond_hw_bind, hw_ifh3.data(), *bm1));
+    ADD_EXPECT(bond_group_binding_cmds::bind_cmd(bond_hw_bind, hw_ifh3.data(), *bm2));
+
+    TRY_CHECK_RC(OM::write(cb, *bgb));
+
+    delete bgb;
+    delete bm2;
+    delete bm1;
+
+    STRICT_ORDER_OFF();
+    HW::item<interface::admin_state_t> hw_as_down(interface::admin_state_t::DOWN, rc_t::OK);
+    ADD_EXPECT(bond_group_binding_cmds::unbind_cmd(bond_hw_bind, hw_ifh.data()));
+    ADD_EXPECT(bond_group_binding_cmds::unbind_cmd(bond_hw_bind, hw_ifh2.data()));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh2));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh2, itf2_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh3));
+    ADD_EXPECT(bond_interface_cmds::delete_cmd(hw_ifh3));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf1_name));
+
+    TRY_CHECK(OM::remove(cb));
+}
+
+BOOST_AUTO_TEST_CASE(test_bridge) {
+    VppInit vi;
+    const std::string franz = "FranzKafka";
+    const std::string dante = "Dante";
+    const std::string jkr = "jkrowling";
+    rc_t rc = rc_t::OK;
+
+    /*
+     * Franz creates an interface, Bridge-domain, then binds the two
+     */
+
+    // interface create
+    std::string itf1_name = "afpacket1";
+    interface itf1(itf1_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+
+    HW::item<handle_t> hw_ifh(3, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_up(interface::admin_state_t::UP,
+                                                rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf1_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+
+    TRY_CHECK_RC(OM::write(franz, itf1));
+
+    // bridge-domain create
+    bridge_domain bd1(33);
+
+    HW::item<uint32_t> hw_bd(33, rc_t::OK);
+    ADD_EXPECT(bridge_domain_cmds::create_cmd(hw_bd,
+                                              bridge_domain::learning_mode_t::ON,
+                                              bridge_domain::arp_term_mode_t::ON,
+                                              bridge_domain::arp_ufwd_mode_t::ON,
+                                              bridge_domain::flood_mode_t::ON,
+                                              bridge_domain::uu_flood_mode_t::ON,
+                                              bridge_domain::mac_age_mode_t::OFF));
+
+    TRY_CHECK_RC(OM::write(franz, bd1));
+
+    // L2-interface create and bind
+    // this needs to be delete'd before the flush below, since it too maintains
+    // references to the BD and Interface
+    l2_binding *l2itf = new l2_binding(itf1, bd1);
+    HW::item<bool> hw_l2_bind(true, rc_t::OK);
+
+    ADD_EXPECT(l2_binding_cmds::bind_cmd(hw_l2_bind,
+                                         hw_ifh.data(),
+                                         hw_bd.data(),
+                                         l2_binding::l2_port_type_t::L2_PORT_TYPE_NORMAL));
+    TRY_CHECK_RC(OM::write(franz, *l2itf));
+
+    /*
+     * Dante adds an interface to the same BD
+     */
+    std::string itf2_name = "afpacket2";
+    interface itf2(itf2_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+
+    HW::item<handle_t> hw_ifh2(4, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh2, itf2_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh2));
+    TRY_CHECK_RC(OM::write(dante, itf2));
+
+    // BD add is a no-op since it exists
+    TRY_CHECK_RC(OM::write(dante, bd1));
+
+    l2_binding *l2itf2 = new l2_binding(itf2, bd1);
+    HW::item<l2_vtr::option_t> hw_set_vtr(l2_vtr::option_t::POP_1, rc_t::OK);
+    l2itf2->set(l2_vtr::option_t::POP_1, 68);
+
+    ADD_EXPECT(l2_binding_cmds::bind_cmd(hw_l2_bind,
+                                         hw_ifh2.data(),
+                                         hw_bd.data(),
+                                         l2_binding::l2_port_type_t::L2_PORT_TYPE_NORMAL));
+    ADD_EXPECT(l2_vtr_cmds::set_cmd(hw_set_vtr, hw_ifh2.data(), 68));
+    TRY_CHECK_RC(OM::write(dante, *l2itf2));
+
+    // Add some static entries to the bridge-domain
+    HW::item<bool> hw_be1(true, rc_t::OK);
+    mac_address_t mac1({0,1,2,3,4,5});
+    bridge_domain_entry *be1 = new bridge_domain_entry(bd1, mac1, itf2);
+    ADD_EXPECT(bridge_domain_entry_cmds::create_cmd(hw_be1, mac1, bd1.id(), hw_ifh2.data(),
+		                                    false));
+    TRY_CHECK_RC(OM::write(dante, *be1));
+
+    // Add some entries to the bridge-domain ARP termination table
+    HW::item<bool> hw_bea1(true, rc_t::OK);
+    boost::asio::ip::address ip1 = boost::asio::ip::address::from_string("10.10.10.10");
+
+    bridge_domain_arp_entry *bea1 = new bridge_domain_arp_entry(bd1, ip1, mac1);
+    ADD_EXPECT(bridge_domain_arp_entry_cmds::create_cmd(hw_be1, bd1.id(), mac1, ip1));
+    TRY_CHECK_RC(OM::write(dante, *bea1));
+
+    // flush Franz's state
+    delete l2itf;
+    HW::item<interface::admin_state_t> hw_as_down(interface::admin_state_t::DOWN,
+                                                  rc_t::OK);
+    ADD_EXPECT(l2_binding_cmds::unbind_cmd(hw_l2_bind,
+                                           hw_ifh.data(),
+                                           hw_bd.data(),
+                                           l2_binding::l2_port_type_t::L2_PORT_TYPE_NORMAL));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf1_name));
+    TRY_CHECK(OM::remove(franz));
+
+    // flush Dante's state - the order the interface and BD are deleted
+    // is an uncontrollable artifact of the C++ object destruction.
+    delete l2itf2;
+    delete be1;
+    delete bea1;
+    STRICT_ORDER_OFF();
+    ADD_EXPECT(bridge_domain_arp_entry_cmds::delete_cmd(hw_be1, bd1.id(), mac1, ip1));
+    ADD_EXPECT(bridge_domain_entry_cmds::delete_cmd(hw_be1, mac1, bd1.id(), false));
+    ADD_EXPECT(l2_binding_cmds::unbind_cmd(hw_l2_bind,
+                                           hw_ifh2.data(),
+                                           hw_bd.data(),
+                                           l2_binding::l2_port_type_t::L2_PORT_TYPE_NORMAL));
+
+    ADD_EXPECT(bridge_domain_cmds::delete_cmd(hw_bd));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh2));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh2, itf2_name));
+    TRY_CHECK(OM::remove(dante));
+
+    // test the BVI entry in l2fib
+    bridge_domain bd2(99);
+
+    HW::item<uint32_t> hw_bd2(99, rc_t::OK);
+    ADD_EXPECT(bridge_domain_cmds::create_cmd(hw_bd2,
+                                              bridge_domain::learning_mode_t::ON,
+                                              bridge_domain::arp_term_mode_t::ON,
+                                              bridge_domain::arp_ufwd_mode_t::ON,
+                                              bridge_domain::flood_mode_t::ON,
+                                              bridge_domain::uu_flood_mode_t::ON,
+                                              bridge_domain::mac_age_mode_t::OFF));
+
+    TRY_CHECK_RC(OM::write(jkr, bd2));
+
+    std::string itf3_name = "bvi";
+    interface itf3(itf3_name,
+                   interface::type_t::BVI,
+                   interface::admin_state_t::UP);
+
+    HW::item<handle_t> hw_ifh3(5, rc_t::OK);
+    ADD_EXPECT(interface_cmds::bvi_create_cmd(hw_ifh3, itf3_name));
+    ADD_EXPECT(interface_cmds::set_tag(hw_ifh3, itf3_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh3));
+    TRY_CHECK_RC(OM::write(jkr, itf3));
+
+    l2_binding *l2itf3 = new l2_binding(itf3, bd2);
+    ADD_EXPECT(l2_binding_cmds::bind_cmd(hw_l2_bind,
+                                         hw_ifh3.data(),
+                                         hw_bd2.data(),
+                                         l2_binding::l2_port_type_t::L2_PORT_TYPE_BVI));
+    TRY_CHECK_RC(OM::write(jkr, *l2itf3));
+
+    HW::item<bool> hw_be2(true, rc_t::OK);
+    mac_address_t mac2({0,1,2,3,4,5});
+    bridge_domain_entry *be2 = new bridge_domain_entry(bd2, mac2, itf3);
+    ADD_EXPECT(bridge_domain_entry_cmds::create_cmd(hw_be2, mac2, bd2.id(), hw_ifh3.data(), true));
+    TRY_CHECK_RC(OM::write(jkr, *be2));
+
+    delete l2itf3;
+    delete be2;
+    STRICT_ORDER_OFF();
+    ADD_EXPECT(l2_binding_cmds::unbind_cmd(hw_l2_bind,
+                                           hw_ifh3.data(),
+                                           hw_bd2.data(),
+                                           l2_binding::l2_port_type_t::L2_PORT_TYPE_BVI));
+    ADD_EXPECT(bridge_domain_entry_cmds::delete_cmd(hw_be2, mac2, bd2.id(), true));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh3));
+    ADD_EXPECT(interface_cmds::bvi_delete_cmd(hw_ifh3));
+    ADD_EXPECT(bridge_domain_cmds::delete_cmd(hw_bd2));
+    TRY_CHECK(OM::remove(jkr));
+}
+
+BOOST_AUTO_TEST_CASE(test_l2_xconnect) {
+    VppInit vi;
+    const std::string nicholas = "NicholasAbercrombie";
+    rc_t rc = rc_t::OK;
+
+    /*
+     * Interface 1
+     */
+    std::string itf1_name = "host1";
+    interface itf1(itf1_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+    HW::item<handle_t> hw_ifh(2, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_up(interface::admin_state_t::UP, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf1_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+    TRY_CHECK_RC(OM::write(nicholas, itf1));
+
+    /*
+     * Interface 2
+     */
+    std::string itf2_name = "host2";
+    interface itf2(itf2_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+
+    HW::item<handle_t> hw_ifh2(4, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh2, itf2_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh2));
+    TRY_CHECK_RC(OM::write(nicholas, itf2));
+
+    l2_xconnect *l2_xconn = new l2_xconnect(itf1, itf2);
+    HW::item<bool> xconnect_east(true, rc_t::OK);
+    HW::item<bool> xconnect_west(true, rc_t::OK);
+    HW::item<bool> xconnect_east_unbind(false, rc_t::OK);
+    HW::item<bool> xconnect_west_unbind(false, rc_t::OK);
+    ADD_EXPECT(l2_xconnect_cmds::bind_cmd(xconnect_east, hw_ifh.data(), hw_ifh2.data()));
+    ADD_EXPECT(l2_xconnect_cmds::bind_cmd(xconnect_west, hw_ifh2.data(), hw_ifh.data()));
+    TRY_CHECK_RC(OM::write(nicholas, *l2_xconn));
+
+    delete l2_xconn;
+
+    HW::item<interface::admin_state_t> hw_as_down(interface::admin_state_t::DOWN, rc_t::OK);
+    STRICT_ORDER_OFF();
+    ADD_EXPECT(l2_xconnect_cmds::unbind_cmd(xconnect_east_unbind, hw_ifh.data(), hw_ifh2.data()));
+    ADD_EXPECT(l2_xconnect_cmds::unbind_cmd(xconnect_west_unbind, hw_ifh2.data(), hw_ifh.data()));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh2));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh2, itf2_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf1_name));
+
+    TRY_CHECK(OM::remove(nicholas));
+}
+
+BOOST_AUTO_TEST_CASE(test_vxlan) {
+    VppInit vi;
+    const std::string franz = "FranzKafka";
+    rc_t rc = rc_t::OK;
+
+    /*
+     * Franz creates an interface, Bridge-domain, then binds the two
+     */
+
+    // VXLAN create
+    vxlan_tunnel::endpoint_t ep(boost::asio::ip::address::from_string("10.10.10.10"),
+                                boost::asio::ip::address::from_string("10.10.10.11"),
+                                322);
+
+    vxlan_tunnel vxt(ep.src, ep.dst, ep.vni);
+
+    HW::item<handle_t> hw_vxt(3, rc_t::OK);
+    ADD_EXPECT(vxlan_tunnel_cmds::create_cmd(hw_vxt, "don't-care", ep,
+                                             handle_t::INVALID));
+
+    TRY_CHECK_RC(OM::write(franz, vxt));
+
+    // bridge-domain create
+    bridge_domain bd1(33, bridge_domain::learning_mode_t::OFF,
+                      bridge_domain::arp_term_mode_t::OFF,
+                      bridge_domain::arp_ufwd_mode_t::OFF,
+                      bridge_domain::flood_mode_t::OFF,
+                      bridge_domain::uu_flood_mode_t::OFF,
+                      bridge_domain::mac_age_mode_t::ON);
+
+    HW::item<uint32_t> hw_bd(33, rc_t::OK);
+    ADD_EXPECT(bridge_domain_cmds::create_cmd(hw_bd,
+                                              bridge_domain::learning_mode_t::OFF,
+                                              bridge_domain::arp_term_mode_t::OFF,
+                                              bridge_domain::arp_ufwd_mode_t::OFF,
+                                              bridge_domain::flood_mode_t::OFF,
+                                              bridge_domain::uu_flood_mode_t::OFF,
+                                              bridge_domain::mac_age_mode_t::ON));
+
+    TRY_CHECK_RC(OM::write(franz, bd1));
+
+    // L2-interface create and bind
+    // this needs to be delete'd before the flush below, since it too maintains
+    // references to the BD and Interface
+    l2_binding *l2itf = new l2_binding(vxt, bd1);
+    HW::item<bool> hw_l2_bind(true, rc_t::OK);
+
+    ADD_EXPECT(l2_binding_cmds::bind_cmd(hw_l2_bind,
+                                         hw_vxt.data(),
+                                         hw_bd.data(),
+                                         l2_binding::l2_port_type_t::L2_PORT_TYPE_NORMAL));
+    TRY_CHECK_RC(OM::write(franz, *l2itf));
+
+    // flush Franz's state
+    delete l2itf;
+    HW::item<handle_t> hw_vxtdel(3, rc_t::NOOP);
+    STRICT_ORDER_OFF();
+    ADD_EXPECT(l2_binding_cmds::unbind_cmd(hw_l2_bind,
+                                           hw_vxt.data(),
+                                           hw_bd.data(),
+                                           l2_binding::l2_port_type_t::L2_PORT_TYPE_NORMAL));
+    ADD_EXPECT(bridge_domain_cmds::delete_cmd(hw_bd));
+    ADD_EXPECT(vxlan_tunnel_cmds::delete_cmd(hw_vxtdel, ep));
+    TRY_CHECK(OM::remove(franz));
+}
+
+BOOST_AUTO_TEST_CASE(test_vlan) {
+    VppInit vi;
+    const std::string noam = "NoamChomsky";
+    rc_t rc = rc_t::OK;
+
+    std::string itf1_name = "host1";
+    interface itf1(itf1_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+
+    HW::item<handle_t> hw_ifh(2, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf1_name));
+
+    HW::item<interface::admin_state_t> hw_as_up(interface::admin_state_t::UP, rc_t::OK);
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+
+    TRY_CHECK_RC(OM::write(noam, itf1));
+
+    sub_interface *vl33 = new sub_interface(itf1,
+                                            interface::admin_state_t::UP,
+                                            33);
+
+    HW::item<handle_t> hw_vl33(3, rc_t::OK);
+    ADD_EXPECT(sub_interface_cmds::create_cmd(hw_vl33, itf1_name+".33", hw_ifh.data(), 33));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_vl33));
+
+    TRY_CHECK_RC(OM::write(noam, *vl33));
+
+    delete vl33;
+    HW::item<interface::admin_state_t> hw_as_down(interface::admin_state_t::DOWN, rc_t::OK);
+    HW::item<handle_t> hw_vl33_down(3, rc_t::NOOP);
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_vl33));
+    ADD_EXPECT(sub_interface_cmds::delete_cmd(hw_vl33_down));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf1_name));
+
+    TRY_CHECK(OM::remove(noam));
+}
+
+BOOST_AUTO_TEST_CASE(test_acl) {
+    VppInit vi;
+    const std::string fyodor = "FyodorDostoyevsky";
+    const std::string leo = "LeoTolstoy";
+    rc_t rc = rc_t::OK;
+
+    /*
+     * Fyodor adds an ACL in the input direction
+     */
+    std::string itf1_name = "host1";
+    interface itf1(itf1_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+    HW::item<handle_t> hw_ifh(2, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_up(interface::admin_state_t::UP, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf1_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+    TRY_CHECK_RC(OM::write(fyodor, itf1));
+
+    ACL::ethertype_rule_t e1(ethertype_t::ARP, direction_t::INPUT);
+    ACL::ethertype_rule_t e2(ethertype_t::ARP, direction_t::OUTPUT);
+    ACL::ethertype_rule_t e3(ethertype_t::IPV4, direction_t::INPUT);
+    ACL::acl_ethertype::ethertype_rules_t l_e = {e1, e2, e3};
+    ACL::acl_ethertype *a_e = new ACL::acl_ethertype(itf1, l_e);
+    HW::item<bool> ae_binding(true, rc_t::OK);
+    ADD_EXPECT(ACL::acl_ethertype_cmds::bind_cmd(ae_binding, hw_ifh.data(), l_e));
+    TRY_CHECK_RC(OM::write(fyodor, *a_e));
+
+    route::prefix_t src("10.10.10.10", 32);
+    ACL::l3_rule r1(10, ACL::action_t::PERMIT, src, route::prefix_t::ZERO);
+    ACL::l3_rule r2(20, ACL::action_t::DENY, route::prefix_t::ZERO, route::prefix_t::ZERO);
+
+    std::string acl_name = "acl1";
+    ACL::l3_list acl1(acl_name);
+    acl1.insert(r2);
+    acl1.insert(r1);
+    ACL::l3_list::rules_t rules = {r1, r2};
+
+    HW::item<handle_t> hw_acl(2, rc_t::OK);
+    ADD_EXPECT(ACL::list_cmds::l3_update_cmd(hw_acl, acl_name, rules));
+    TRY_CHECK_RC(OM::write(fyodor, acl1));
+
+    ACL::l3_rule r3(30, ACL::action_t::PERMIT, route::prefix_t::ZERO, route::prefix_t::ZERO);
+    ACL::l3_list acl2(acl_name);
+    acl2.insert(r3);
+    ACL::l3_list::rules_t rules2 = {r3};
+    ADD_EXPECT(ACL::list_cmds::l3_update_cmd(hw_acl, acl_name, rules2));
+    TRY_CHECK_RC(OM::write(fyodor, acl2));
+
+    ACL::l3_binding *l3b = new ACL::l3_binding(direction_t::INPUT, itf1, acl1);
+    HW::item<bool> hw_binding(true, rc_t::OK);
+    ADD_EXPECT(ACL::binding_cmds::l3_bind_cmd(hw_binding, direction_t::INPUT,
+                                         hw_ifh.data(), hw_acl.data()));
+    TRY_CHECK_RC(OM::write(fyodor, *l3b));
+
+    /**
+     * Leo adds an L2 ACL in the output direction
+     */
+    TRY_CHECK_RC(OM::write(leo, itf1));
+
+    std::string l2_acl_name = "l2_acl1";
+    mac_address_t mac({0x0, 0x0, 0x1, 0x2, 0x3, 0x4});
+    mac_address_t mac_mask({0xff, 0xff, 0xff, 0x0, 0x0, 0x0});
+    ACL::l2_rule l2_r1(10, ACL::action_t::PERMIT, src, mac, mac_mask);
+    ACL::l2_rule l2_r2(20, ACL::action_t::DENY, src, {}, {});
+
+    ACL::l2_list l2_acl(l2_acl_name);
+    l2_acl.insert(l2_r2);
+    l2_acl.insert(l2_r1);
+
+    ACL::l2_list::rules_t l2_rules = {l2_r1, l2_r2};
+
+    HW::item<handle_t> l2_hw_acl(3, rc_t::OK);
+    ADD_EXPECT(ACL::list_cmds::l2_update_cmd(l2_hw_acl, l2_acl_name, l2_rules));
+    TRY_CHECK_RC(OM::write(leo, l2_acl));
+
+    ACL::l2_binding *l2b = new ACL::l2_binding(direction_t::OUTPUT, itf1, l2_acl);
+    HW::item<bool> l2_hw_binding(true, rc_t::OK);
+    ADD_EXPECT(ACL::binding_cmds::l2_bind_cmd(l2_hw_binding, direction_t::OUTPUT,
+                                       hw_ifh.data(), l2_hw_acl.data()));
+    TRY_CHECK_RC(OM::write(leo, *l2b));
+
+    delete l2b;
+    ADD_EXPECT(ACL::binding_cmds::l2_unbind_cmd(l2_hw_binding, direction_t::OUTPUT,
+                                                hw_ifh.data(), l2_hw_acl.data()));
+    ADD_EXPECT(ACL::list_cmds::l2_delete_cmd(l2_hw_acl));
+    TRY_CHECK(OM::remove(leo));
+
+    delete l3b;
+    delete a_e;
+    HW::item<interface::admin_state_t> hw_as_down(interface::admin_state_t::DOWN,
+                                                  rc_t::OK);
+    STRICT_ORDER_OFF();
+    ADD_EXPECT(ACL::binding_cmds::l3_unbind_cmd(hw_binding, direction_t::INPUT,
+                                         hw_ifh.data(), hw_acl.data()));
+    ADD_EXPECT(ACL::list_cmds::l3_delete_cmd(hw_acl));
+    ADD_EXPECT(ACL::acl_ethertype_cmds::unbind_cmd(ae_binding, hw_ifh.data()));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf1_name));
+
+    TRY_CHECK(OM::remove(fyodor));
+}
+
+BOOST_AUTO_TEST_CASE(test_igmp) {
+    VppInit vi;
+    const std::string Isaiah = "IsaiahBerlin";
+    rc_t rc = rc_t::OK;
+
+    boost::asio::ip::address_v4 gaddr = boost::asio::ip::address_v4::from_string("232.0.0.1");
+    boost::asio::ip::address_v4 saddr1 = boost::asio::ip::address_v4::from_string("192.168.0.20");
+    boost::asio::ip::address_v4 saddr2 = boost::asio::ip::address_v4::from_string("192.168.0.30");
+
+    std::string itf3_name = "host3";
+    interface itf3(itf3_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+    HW::item<handle_t> hw_ifh(2, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_up(interface::admin_state_t::UP, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf3_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+    TRY_CHECK_RC(OM::write(Isaiah, itf3));
+
+    igmp_binding *ib = new igmp_binding(itf3);
+    HW::item<bool> hw_binding(true, rc_t::OK);
+    ADD_EXPECT(igmp_binding_cmds::bind_cmd(hw_binding, hw_ifh.data()));
+    TRY_CHECK_RC(OM::write(Isaiah, *ib));
+
+    igmp_listen::src_addrs_t saddrs = {saddr1, saddr2};
+
+    igmp_listen *il = new igmp_listen(*ib, gaddr, saddrs);
+    HW::item<bool> hw_as_listen(true, rc_t::OK);
+    ADD_EXPECT(igmp_listen_cmds::listen_cmd(hw_as_listen, hw_ifh.data(), gaddr, saddrs));
+    TRY_CHECK_RC(OM::write(Isaiah, *il));
+
+    delete il;
+    delete ib;
+
+    HW::item<interface::admin_state_t> hw_as_down(interface::admin_state_t::DOWN,
+                                                  rc_t::OK);
+    STRICT_ORDER_OFF();
+    ADD_EXPECT(igmp_listen_cmds::unlisten_cmd(hw_as_listen, hw_ifh.data(), gaddr));
+    ADD_EXPECT(igmp_binding_cmds::unbind_cmd(hw_binding, hw_ifh.data()));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf3_name));
+
+    TRY_CHECK(OM::remove(Isaiah));
+}
+
+BOOST_AUTO_TEST_CASE(test_arp_proxy) {
+    VppInit vi;
+    const std::string kurt = "KurtVonnegut";
+    rc_t rc = rc_t::OK;
+
+    asio::ip::address_v4 low  = asio::ip::address_v4::from_string("10.0.0.0");
+    asio::ip::address_v4 high = asio::ip::address_v4::from_string("10.0.0.255");
+
+    arp_proxy_config ap(low, high);
+    HW::item<bool> hw_ap_cfg(true, rc_t::OK);
+    ADD_EXPECT(arp_proxy_config_cmds::config_cmd(hw_ap_cfg, low, high));
+    TRY_CHECK_RC(OM::write(kurt, ap));
+
+    std::string itf3_name = "host3";
+    interface itf3(itf3_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+    HW::item<handle_t> hw_ifh(2, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_up(interface::admin_state_t::UP, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf3_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+    TRY_CHECK_RC(OM::write(kurt, itf3));
+
+    arp_proxy_binding *apb = new arp_proxy_binding(itf3);
+    HW::item<bool> hw_binding(true, rc_t::OK);
+    ADD_EXPECT(arp_proxy_binding_cmds::bind_cmd(hw_binding, hw_ifh.data()));
+    TRY_CHECK_RC(OM::write(kurt, *apb));
+
+    delete apb;
+
+    HW::item<interface::admin_state_t> hw_as_down(interface::admin_state_t::DOWN,
+                                                  rc_t::OK);
+    STRICT_ORDER_OFF();
+    ADD_EXPECT(arp_proxy_binding_cmds::unbind_cmd(hw_binding, hw_ifh.data()));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf3_name));
+    ADD_EXPECT(arp_proxy_config_cmds::unconfig_cmd(hw_ap_cfg, low, high));
+
+    TRY_CHECK(OM::remove(kurt));
+}
+
+BOOST_AUTO_TEST_CASE(test_ip_punt_redirect) {
+    VppInit vi;
+    const std::string eliot = "EliotReed";
+    rc_t rc = rc_t::OK;
+
+    /*
+     * Interface 1 is the tx interface
+     */
+    std::string itf1_name = "tx-itf";
+    interface itf1(itf1_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+    HW::item<handle_t> hw_ifh(2, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_up(interface::admin_state_t::UP, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf1_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+    TRY_CHECK_RC(OM::write(eliot, itf1));
+
+    boost::asio::ip::address addr = boost::asio::ip::address::from_string("192.168.0.20");
+
+    /*
+     * Interface 2 is the rx interface
+     */
+    std::string itf2_name = "rx-itf";
+    interface itf2(itf2_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+
+    HW::item<handle_t> hw_ifh2(4, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh2, itf2_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh2));
+    TRY_CHECK_RC(OM::write(eliot, itf2));
+
+    ip_punt_redirect *ip_punt = new ip_punt_redirect(itf2, itf1, addr);
+    HW::item<bool> hw_ip_cfg(true, rc_t::OK);
+    HW::item<bool> hw_ip_uncfg(false, rc_t::OK);
+    ADD_EXPECT(ip_punt_redirect_cmds::config_cmd(hw_ip_cfg, hw_ifh2.data(), hw_ifh.data(), addr));
+    TRY_CHECK_RC(OM::write(eliot, *ip_punt));
+
+    delete ip_punt;
+
+    HW::item<interface::admin_state_t> hw_as_down(interface::admin_state_t::DOWN, rc_t::OK);
+    STRICT_ORDER_OFF();
+    ADD_EXPECT(ip_punt_redirect_cmds::unconfig_cmd(hw_ip_uncfg, hw_ifh2.data(), hw_ifh.data(), addr));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf1_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh2));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh2, itf2_name));
+
+    TRY_CHECK(OM::remove(eliot));
+}
+
+BOOST_AUTO_TEST_CASE(test_ip_unnumbered) {
+    VppInit vi;
+    const std::string eric = "EricAmbler";
+    rc_t rc = rc_t::OK;
+
+    /*
+     * Interface 1 has the L3 address
+     */
+    std::string itf1_name = "host1";
+    interface itf1(itf1_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+    HW::item<handle_t> hw_ifh(2, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_up(interface::admin_state_t::UP, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf1_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+    TRY_CHECK_RC(OM::write(eric, itf1));
+
+    route::prefix_t pfx_10("10.10.10.10", 24);
+    l3_binding *l3 = new l3_binding(itf1, pfx_10);
+    HW::item<bool> hw_l3_bind(true, rc_t::OK);
+    HW::item<bool> hw_l3_unbind(false, rc_t::OK);
+    ADD_EXPECT(l3_binding_cmds::bind_cmd(hw_l3_bind, hw_ifh.data(), pfx_10));
+    TRY_CHECK_RC(OM::write(eric, *l3));
+
+    /*
+     * Interface 2 is unnumbered
+     */
+    std::string itf2_name = "host2";
+    interface itf2(itf2_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+
+    HW::item<handle_t> hw_ifh2(4, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh2, itf2_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh2));
+    TRY_CHECK_RC(OM::write(eric, itf2));
+
+    ip_unnumbered *ipun = new ip_unnumbered(itf2, itf1);
+    HW::item<bool> hw_ip_cfg(true, rc_t::OK);
+    HW::item<bool> hw_ip_uncfg(false, rc_t::OK);
+    ADD_EXPECT(ip_unnumbered_cmds::config_cmd(hw_ip_cfg, hw_ifh2.data(), hw_ifh.data()));
+    TRY_CHECK_RC(OM::write(eric, *ipun));
+
+    delete l3;
+    delete ipun;
+
+    HW::item<interface::admin_state_t> hw_as_down(interface::admin_state_t::DOWN, rc_t::OK);
+    STRICT_ORDER_OFF();
+    ADD_EXPECT(ip_unnumbered_cmds::unconfig_cmd(hw_ip_uncfg, hw_ifh2.data(), hw_ifh.data()));
+    ADD_EXPECT(l3_binding_cmds::unbind_cmd(hw_l3_unbind, hw_ifh.data(), pfx_10));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh2));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh2, itf2_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf1_name));
+
+    TRY_CHECK(OM::remove(eric));
+}
+
+BOOST_AUTO_TEST_CASE(test_ip6nd) {
+    VppInit vi;
+    const std::string paulo = "PauloCoelho";
+    rc_t rc = rc_t::OK;
+
+    /*
+     * ra config
+     */
+    std::string itf_name = "host_ip6nd";
+    interface itf(itf_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+    HW::item<handle_t> hw_ifh(3, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_up(interface::admin_state_t::UP, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+    TRY_CHECK_RC(OM::write(paulo, itf));
+
+    route::prefix_t pfx_10("fd8f:69d8:c12c:ca62::3", 128);
+    l3_binding *l3 = new l3_binding(itf, pfx_10);
+    HW::item<bool> hw_l3_bind(true, rc_t::OK);
+    HW::item<bool> hw_l3_unbind(false, rc_t::OK);
+    ADD_EXPECT(l3_binding_cmds::bind_cmd(hw_l3_bind, hw_ifh.data(), pfx_10));
+    TRY_CHECK_RC(OM::write(paulo, *l3));
+
+    ra_config ra(0, 1, 0, 4);
+    ip6nd_ra_config *ip6ra = new ip6nd_ra_config(itf, ra);
+    HW::item<bool> hw_ip6nd_ra_config_config(true, rc_t::OK);
+    HW::item<bool> hw_ip6nd_ra_config_unconfig(false, rc_t::OK);
+    ADD_EXPECT(ip6nd_ra_config::config_cmd(hw_ip6nd_ra_config_config, hw_ifh.data(), ra));
+    TRY_CHECK_RC(OM::write(paulo, *ip6ra));
+
+    /*
+     * ra prefix
+     */
+    ra_prefix ra_pfx(pfx_10, 0, 0, 2592000, 604800);
+    ip6nd_ra_prefix *ip6pfx = new ip6nd_ra_prefix(itf, ra_pfx);
+    HW::item<bool> hw_ip6nd_ra_prefix_config(true, rc_t::OK);
+    HW::item<bool> hw_ip6nd_ra_prefix_unconfig(false, rc_t::OK);
+    ADD_EXPECT(ip6nd_ra_prefix::config_cmd(hw_ip6nd_ra_prefix_config, hw_ifh.data(), ra_pfx));
+    TRY_CHECK_RC(OM::write(paulo, *ip6pfx));
+
+    delete ip6pfx;
+
+    ADD_EXPECT(ip6nd_ra_prefix::unconfig_cmd(hw_ip6nd_ra_prefix_unconfig, hw_ifh.data(), ra_pfx));
+
+    delete ip6ra;
+    delete l3;
+
+    HW::item<interface::admin_state_t> hw_as_down(interface::admin_state_t::DOWN, rc_t::OK);
+
+    STRICT_ORDER_OFF();
+    ADD_EXPECT(ip6nd_ra_config::unconfig_cmd(hw_ip6nd_ra_config_unconfig, hw_ifh.data(), ra));
+    ADD_EXPECT(l3_binding_cmds::unbind_cmd(hw_l3_unbind, hw_ifh.data(), pfx_10));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf_name));
+
+    TRY_CHECK(OM::remove(paulo));
+}
+
+BOOST_AUTO_TEST_CASE(test_interface_span) {
+    VppInit vi;
+    const std::string elif = "ElifShafak";
+    rc_t rc = rc_t::OK;
+
+    /*
+     * Interface 1 to be mirrored
+     */
+    std::string itf1_name = "port-from";
+    interface itf1(itf1_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+    HW::item<handle_t> hw_ifh(2, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_up(interface::admin_state_t::UP, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf1_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+    TRY_CHECK_RC(OM::write(elif, itf1));
+
+    /*
+     * Interface 2 where traffic is mirrored
+     */
+    std::string itf2_name = "port-to";
+    interface itf2(itf2_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+
+    HW::item<handle_t> hw_ifh2(4, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_up2(interface::admin_state_t::UP, rc_t::OK);
+
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh2, itf2_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up2, hw_ifh2));
+    TRY_CHECK_RC(OM::write(elif, itf2));
+
+    interface_span *itf_span = new interface_span(itf1, itf2, interface_span::state_t::TX_RX_ENABLED);
+    HW::item<bool> hw_is_cfg(true, rc_t::OK);
+    HW::item<bool> hw_is_uncfg(true, rc_t::OK);
+    ADD_EXPECT(interface_span_cmds::config_cmd(hw_is_cfg, hw_ifh.data(), hw_ifh2.data(), interface_span::state_t::TX_RX_ENABLED));
+    TRY_CHECK_RC(OM::write(elif, *itf_span));
+
+    HW::item<interface::admin_state_t> hw_as_down(interface::admin_state_t::DOWN, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_down2(interface::admin_state_t::DOWN, rc_t::OK);
+
+    delete itf_span;
+    STRICT_ORDER_OFF();
+    ADD_EXPECT(interface_span_cmds::unconfig_cmd(hw_is_uncfg, hw_ifh.data(), hw_ifh2.data()));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf1_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down2, hw_ifh2));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh2, itf2_name));
+
+    TRY_CHECK(OM::remove(elif));
+}
+
+BOOST_AUTO_TEST_CASE(test_routing) {
+    VppInit vi;
+    const std::string ian = "IanFleming";
+    rc_t rc = rc_t::OK;
+
+    /*
+     * non-default route domain
+     */
+    route_domain rd4(1);
+    HW::item<bool> hw_rd4_create(true, rc_t::OK);
+    HW::item<bool> hw_rd4_delete(false, rc_t::OK);
+    HW::item<bool> hw_rd6_create(true, rc_t::OK);
+    HW::item<bool> hw_rd6_delete(false, rc_t::OK);
+    HW::item<route::table_id_t> hw_rd4_bind(1, rc_t::OK);
+    HW::item<route::table_id_t> hw_rd4_unbind(route::DEFAULT_TABLE, rc_t::OK);
+    HW::item<route::table_id_t> hw_rd6_bind(1, rc_t::OK);
+    HW::item<route::table_id_t> hw_rd7_unbind(route::DEFAULT_TABLE, rc_t::OK);
+    ADD_EXPECT(route_domain_cmds::create_cmd(hw_rd4_create, l3_proto_t::IPV4, 1));
+    ADD_EXPECT(route_domain_cmds::create_cmd(hw_rd6_create, l3_proto_t::IPV6, 1));
+    TRY_CHECK_RC(OM::write(ian, rd4));
+
+    /*
+     * a couple of interfaces
+     */
+    std::string itf1_name = "af1";
+    interface itf1(itf1_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+    HW::item<handle_t> hw_ifh(2, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_up(interface::admin_state_t::UP, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_down(interface::admin_state_t::DOWN, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf1_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+    TRY_CHECK_RC(OM::write(ian, itf1));
+
+    std::string itf2_name = "af2";
+    interface *itf2 = new interface(itf2_name,
+                                    interface::type_t::AFPACKET,
+                                    interface::admin_state_t::UP,
+                                    rd4);
+
+    HW::item<handle_t> hw_ifh2(4, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_up2(interface::admin_state_t::UP, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_down2(interface::admin_state_t::DOWN, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh2, itf2_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up2, hw_ifh2));
+    ADD_EXPECT(interface_cmds::set_table_cmd(hw_rd4_bind, l3_proto_t::IPV4, hw_ifh2));
+    ADD_EXPECT(interface_cmds::set_table_cmd(hw_rd6_bind, l3_proto_t::IPV6, hw_ifh2));
+    TRY_CHECK_RC(OM::write(ian, *itf2));
+
+    /*
+     * prefix on each interface
+     */
+    route::prefix_t pfx_10("10.10.10.10", 24);
+    l3_binding *l3_10 = new l3_binding(itf1, pfx_10);
+    HW::item<bool> hw_l3_10_bind(true, rc_t::OK);
+    HW::item<bool> hw_l3_10_unbind(false, rc_t::OK);
+    ADD_EXPECT(l3_binding_cmds::bind_cmd(hw_l3_10_bind, hw_ifh.data(), pfx_10));
+    TRY_CHECK_RC(OM::write(ian, *l3_10));
+    route::prefix_t pfx_11("11.11.11.11", 24);
+    l3_binding *l3_11 = new l3_binding(*itf2, pfx_11);
+    HW::item<bool> hw_l3_11_bind(true, rc_t::OK);
+    HW::item<bool> hw_l3_11_unbind(false, rc_t::OK);
+    ADD_EXPECT(l3_binding_cmds::bind_cmd(hw_l3_11_bind, hw_ifh2.data(), pfx_11));
+    TRY_CHECK_RC(OM::write(ian, *l3_11));
+
+    /*
+     * A route via interface 1 in the default table
+     */
+    route::prefix_t pfx_5("5.5.5.5", 32);
+    boost::asio::ip::address nh_9 = boost::asio::ip::address::from_string("10.10.10.9");
+    route::path *path_9 = new route::path(nh_9, itf1);
+    boost::asio::ip::address nh_10 = boost::asio::ip::address::from_string("10.10.10.11");
+    route::path *path_10 = new route::path(nh_10, itf1);
+    route::ip_route *route_5 = new route::ip_route(pfx_5);
+    route_5->add(*path_10);
+    route_5->add(*path_9);
+    route::path_list_t pl_9_10 = {*path_9, *path_10};
+    HW::item<handle_t> hw_route_5(0, rc_t::OK);
+    ADD_EXPECT(route::ip_route_cmds::update_cmd(hw_route_5, 0, pfx_5, pl_9_10));
+    TRY_CHECK_RC(OM::write(ian, *route_5));
+
+    route_5->remove(*path_9);
+    route::path_list_t pl_10 = {*path_10};
+    ADD_EXPECT(route::ip_route_cmds::update_cmd(hw_route_5, 0, pfx_5, pl_10));
+    TRY_CHECK_RC(OM::write(ian, *route_5));
+
+    delete path_9;
+
+    /*
+     * A route via interface 2 in the non-default table
+     */
+    boost::asio::ip::address nh_11 = boost::asio::ip::address::from_string("11.11.11.10");
+    route::path *path_11 = new route::path(nh_11, *itf2);
+    boost::asio::ip::address nh_12 = boost::asio::ip::address::from_string("11.11.11.12");
+    route::path *path_12 = new route::path(nh_12, *itf2);
+    route::ip_route *route_5_2 = new route::ip_route(rd4, pfx_5);
+    route::path_list_t pl_11 = {*path_11};
+    route_5_2->add(*path_11);
+    HW::item<handle_t> hw_route_5_2(1, rc_t::OK);
+    ADD_EXPECT(route::ip_route_cmds::update_cmd(hw_route_5_2, 1, pfx_5, pl_11));
+    TRY_CHECK_RC(OM::write(ian, *route_5_2));
+
+    route::path_list_t pl_11_12 = {*path_11, *path_12};
+    route_5_2->add(*path_12);
+    ADD_EXPECT(route::ip_route_cmds::update_cmd(hw_route_5_2, 1, pfx_5, pl_11_12));
+    TRY_CHECK_RC(OM::write(ian, *route_5_2));
+
+    /*
+     * An ARP entry for the neighbour on itf1
+     */
+    HW::item<handle_t> hw_neighbour(0, rc_t::OK);
+    mac_address_t mac_n({0,1,2,4,5,6});
+    neighbour *ne = new neighbour(itf1, nh_10, mac_n);
+    ADD_EXPECT(neighbour_cmds::create_cmd(hw_neighbour, hw_ifh.data(),
+                                          mac_n, nh_10,
+                                          neighbour::flags_t::STATIC));
+    TRY_CHECK_RC(OM::write(ian, *ne));
+
+    /*
+     * A DVR route
+     */
+    route::prefix_t pfx_6("6.6.6.6", 32);
+    route::path *path_13 = new route::path(*itf2, nh_proto_t::ETHERNET);
+    route::ip_route *route_dvr = new route::ip_route(pfx_6);
+    route_dvr->add(*path_13);
+    route::path_list_t pl_13 = {*path_13};
+    HW::item<handle_t> hw_route_dvr(2, rc_t::OK);
+    ADD_EXPECT(route::ip_route_cmds::update_cmd(hw_route_dvr, 0, pfx_6, pl_13));
+    TRY_CHECK_RC(OM::write(ian, *route_dvr));
+
+    /*
+     * a multicast route
+     */
+    route::mprefix_t mpfx_4(boost::asio::ip::address::from_string("232.1.1.1"), 32);
+    route::ip_mroute *mroute_4 = new route::ip_mroute(mpfx_4);
+
+    route::path *mp1 = new route::path(itf1, nh_proto_t::IPV4);
+    route::path *mp2 = new route::path(*itf2, nh_proto_t::IPV4);
+    mroute_4->add(*mp1, route::itf_flags_t::FORWARD);
+    mroute_4->add(*mp1, route::itf_flags_t::ACCEPT);
+    mroute_4->add(*mp2, route::itf_flags_t::FORWARD);
+    HW::item<bool> hw_mroute_4(true, rc_t::OK);
+    ADD_EXPECT(route::ip_mroute_cmds::update_cmd(hw_mroute_4, 0, mpfx_4,
+                                                 *mp1, route::itf_flags_t::FORWARD));
+    ADD_EXPECT(route::ip_mroute_cmds::update_cmd(hw_mroute_4, 0, mpfx_4,
+                                                 *mp2, route::itf_flags_t::FORWARD));
+    ADD_EXPECT(route::ip_mroute_cmds::update_cmd(hw_mroute_4, 0, mpfx_4,
+                                                 *mp1, route::itf_flags_t::ACCEPT));
+    TRY_CHECK_RC(OM::write(ian, *mroute_4));
+
+    STRICT_ORDER_OFF();
+    // delete the stack objects that hold references to others
+    // so the OM::remove is the call that removes the last reference
+    delete l3_11;
+    delete l3_10;
+    delete itf2;
+    delete route_5;
+    delete route_5_2;
+    delete route_dvr;
+    delete ne;
+    delete mroute_4;
+
+    ADD_EXPECT(route::ip_mroute_cmds::delete_cmd(hw_mroute_4, 0, mpfx_4,
+                                                 *mp1, route::itf_flags_t::FORWARD));
+    ADD_EXPECT(route::ip_mroute_cmds::delete_cmd(hw_mroute_4, 0, mpfx_4,
+                                                 *mp2, route::itf_flags_t::FORWARD));
+    ADD_EXPECT(route::ip_mroute_cmds::delete_cmd(hw_mroute_4, 0, mpfx_4,
+                                                 *mp1, route::itf_flags_t::ACCEPT));
+
+    delete mp1;
+    delete mp2;
+
+    ADD_EXPECT(neighbour_cmds::delete_cmd(hw_neighbour, hw_ifh.data(),
+                                          mac_n, nh_10,
+                                          neighbour::flags_t::STATIC));
+    ADD_EXPECT(route::ip_route_cmds::delete_cmd(hw_route_dvr, 0, pfx_6));
+    ADD_EXPECT(route::ip_route_cmds::delete_cmd(hw_route_5_2, 1, pfx_5));
+    ADD_EXPECT(route::ip_route_cmds::delete_cmd(hw_route_5, 0, pfx_5));
+
+    delete path_10;
+    delete path_11;
+    delete path_12;
+    delete path_13;
+    pl_9_10.clear();
+    pl_10.clear();
+    pl_13.clear();
+    pl_11_12.clear();
+    pl_11.clear();
+
+    ADD_EXPECT(l3_binding_cmds::unbind_cmd(hw_l3_10_unbind, hw_ifh.data(), pfx_10));
+    ADD_EXPECT(l3_binding_cmds::unbind_cmd(hw_l3_11_unbind, hw_ifh2.data(), pfx_11));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf1_name));
+    ADD_EXPECT(interface_cmds::set_table_cmd(hw_rd4_unbind, l3_proto_t::IPV4, hw_ifh2));
+    ADD_EXPECT(interface_cmds::set_table_cmd(hw_rd4_unbind, l3_proto_t::IPV6, hw_ifh2));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down2, hw_ifh2));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh2, itf2_name));
+    ADD_EXPECT(route_domain_cmds::delete_cmd(hw_rd4_delete, l3_proto_t::IPV4, 1));
+    ADD_EXPECT(route_domain_cmds::delete_cmd(hw_rd6_delete, l3_proto_t::IPV6, 1));
+
+    TRY_CHECK(OM::remove(ian));
+}
+
+BOOST_AUTO_TEST_CASE(test_nat) {
+    VppInit vi;
+    const std::string gs = "GeorgeSimenon";
+    rc_t rc = rc_t::OK;
+
+    /*
+     * Inside Interface
+     */
+    std::string itf_in_name = "inside";
+    interface itf_in(itf_in_name,
+                     interface::type_t::AFPACKET,
+                     interface::admin_state_t::UP);
+    HW::item<handle_t> hw_ifh(2, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_up(interface::admin_state_t::UP, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_down(interface::admin_state_t::DOWN, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf_in_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+    TRY_CHECK_RC(OM::write(gs, itf_in));
+
+    /*
+     * outside
+     */
+    std::string itf_out_name = "port-to";
+    interface itf_out(itf_out_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+
+    HW::item<handle_t> hw_ifh2(4, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_up2(interface::admin_state_t::UP, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_down2(interface::admin_state_t::DOWN, rc_t::OK);
+
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh2, itf_out_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up2, hw_ifh2));
+    TRY_CHECK_RC(OM::write(gs, itf_out));
+
+    /*
+     * A NAT static mapping
+     */
+    boost::asio::ip::address in_addr = boost::asio::ip::address::from_string("10.0.0.1");
+    boost::asio::ip::address_v4 out_addr = boost::asio::ip::address_v4::from_string("1.1.1.1");
+
+    nat_static ns(in_addr, out_addr);
+    HW::item<bool> hw_ns(true, rc_t::OK);
+
+    ADD_EXPECT(nat_static_cmds::create_44_cmd(hw_ns, 0, in_addr.to_v4(), out_addr));
+    TRY_CHECK_RC(OM::write(gs, ns));
+
+    /*
+     * bind nat inside and out
+     */
+    nat_binding *nb_in = new nat_binding(itf_in,
+                                         direction_t::INPUT,
+                                         l3_proto_t::IPV4,
+                                         nat_binding::zone_t::INSIDE);
+    HW::item<bool> hw_nb_in(true, rc_t::OK);
+
+    ADD_EXPECT(nat_binding_cmds::bind_44_input_cmd(hw_nb_in,
+                                                   hw_ifh.data().value(),
+                                                   nat_binding::zone_t::INSIDE));
+    TRY_CHECK_RC(OM::write(gs, *nb_in));
+
+    nat_binding *nb_out = new nat_binding(itf_out,
+                                          direction_t::INPUT,
+                                          l3_proto_t::IPV4,
+                                          nat_binding::zone_t::OUTSIDE);
+    HW::item<bool> hw_nb_out(true, rc_t::OK);
+
+    ADD_EXPECT(nat_binding_cmds::bind_44_input_cmd(hw_nb_out,
+                                                   hw_ifh2.data().value(),
+                                                   nat_binding::zone_t::OUTSIDE));
+    TRY_CHECK_RC(OM::write(gs, *nb_out));
+
+
+    STRICT_ORDER_OFF();
+    delete nb_in;
+    delete nb_out;
+    ADD_EXPECT(nat_binding_cmds::unbind_44_input_cmd(hw_nb_in,
+                                                     hw_ifh.data().value(),
+                                                     nat_binding::zone_t::INSIDE));
+    ADD_EXPECT(nat_binding_cmds::unbind_44_input_cmd(hw_nb_out,
+                                                     hw_ifh2.data().value(),
+                                                     nat_binding::zone_t::OUTSIDE));
+    ADD_EXPECT(nat_static_cmds::delete_44_cmd(hw_ns, 0, in_addr.to_v4(), out_addr));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf_in_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down2, hw_ifh2));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh2, itf_out_name));
+
+    TRY_CHECK(OM::remove(gs));
+}
+
+BOOST_AUTO_TEST_CASE(test_interface_events) {
+    VppInit vi;
+    MockListener ml;
+
+    HW::item<bool> hw_want(true, rc_t::OK);
+
+    ADD_EXPECT(interface_cmds::events_cmd(ml));
+    cmd* itf = new interface_cmds::events_cmd(ml);
+
+    HW::enqueue(itf);
+    HW::write();
+}
+
+BOOST_AUTO_TEST_CASE(test_interface_route_domain_change) {
+    VppInit vi;
+    const std::string rene = "ReneGoscinny";
+    rc_t rc = rc_t::OK;
+
+    /*
+     * Create an interface with two IP addresses
+     */
+    std::string itf1_name = "host1";
+    interface itf1(itf1_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+    HW::item<handle_t> hw_ifh1(2, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_up(interface::admin_state_t::UP, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_down(interface::admin_state_t::DOWN, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh1, itf1_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh1));
+    TRY_CHECK_RC(OM::write(rene, itf1));
+
+    route::prefix_t pfx_10("10.10.10.10", 24);
+    l3_binding *l3_1 = new l3_binding(itf1, pfx_10);
+    HW::item<bool> hw_l3_bind1(true, rc_t::OK);
+    HW::item<bool> hw_l3_unbind1(false, rc_t::OK);
+    ADD_EXPECT(l3_binding_cmds::bind_cmd(hw_l3_bind1, hw_ifh1.data(), pfx_10));
+    TRY_CHECK_RC(OM::write(rene, *l3_1));
+
+    route::prefix_t pfx_11("10.10.11.11", 24);
+    l3_binding *l3_2 = new l3_binding(itf1, pfx_11);
+    HW::item<bool> hw_l3_bind2(true, rc_t::OK);
+    HW::item<bool> hw_l3_unbind2(false, rc_t::OK);
+    ADD_EXPECT(l3_binding_cmds::bind_cmd(hw_l3_bind2, hw_ifh1.data(), pfx_11));
+    TRY_CHECK_RC(OM::write(rene, *l3_2));
+
+    route_domain rd(1);
+    HW::item<bool> hw_rd_create(true, rc_t::OK);
+    HW::item<bool> hw_rd_delete(false, rc_t::OK);
+    HW::item<route::table_id_t> hw_rd_bind(1, rc_t::OK);
+    HW::item<route::table_id_t> hw_rd_unbind(route::DEFAULT_TABLE, rc_t::OK);
+    ADD_EXPECT(route_domain_cmds::create_cmd(hw_rd_create, l3_proto_t::IPV4, 1));
+    ADD_EXPECT(route_domain_cmds::create_cmd(hw_rd_create, l3_proto_t::IPV6, 1));
+    TRY_CHECK_RC(OM::write(rene, rd));
+
+    /*
+     * update the interface to change to a new route-domain
+     * expect that the l3-bindings are removed and readded.
+     */
+    interface *itf2 = new interface(itf1_name,
+                                    interface::type_t::AFPACKET,
+                                    interface::admin_state_t::UP,
+                                    rd);
+    ADD_EXPECT(l3_binding_cmds::unbind_cmd(hw_l3_unbind1, hw_ifh1.data(), pfx_10));
+    ADD_EXPECT(l3_binding_cmds::unbind_cmd(hw_l3_unbind2, hw_ifh1.data(), pfx_11));
+    ADD_EXPECT(interface_cmds::set_table_cmd(hw_rd_bind, l3_proto_t::IPV4, hw_ifh1));
+    ADD_EXPECT(interface_cmds::set_table_cmd(hw_rd_bind, l3_proto_t::IPV6, hw_ifh1));
+    ADD_EXPECT(l3_binding_cmds::bind_cmd(hw_l3_bind1, hw_ifh1.data(), pfx_10));
+    ADD_EXPECT(l3_binding_cmds::bind_cmd(hw_l3_bind2, hw_ifh1.data(), pfx_11));
+    TRY_CHECK_RC(OM::write(rene, *itf2));
+
+    /*
+     * mve the interface back to the default route-domain
+     */
+    interface itf3(itf1_name,
+                   interface::type_t::AFPACKET,
+                   interface::admin_state_t::UP);
+    ADD_EXPECT(l3_binding_cmds::unbind_cmd(hw_l3_unbind1, hw_ifh1.data(), pfx_10));
+    ADD_EXPECT(l3_binding_cmds::unbind_cmd(hw_l3_unbind2, hw_ifh1.data(), pfx_11));
+    ADD_EXPECT(interface_cmds::set_table_cmd(hw_rd_unbind, l3_proto_t::IPV4, hw_ifh1));
+    ADD_EXPECT(interface_cmds::set_table_cmd(hw_rd_unbind, l3_proto_t::IPV6, hw_ifh1));
+    ADD_EXPECT(l3_binding_cmds::bind_cmd(hw_l3_bind1, hw_ifh1.data(), pfx_10));
+    ADD_EXPECT(l3_binding_cmds::bind_cmd(hw_l3_bind2, hw_ifh1.data(), pfx_11));
+    TRY_CHECK_RC(OM::write(rene, itf3));
+
+    delete l3_1;
+    delete l3_2;
+    delete itf2;
+
+    STRICT_ORDER_OFF();
+    ADD_EXPECT(l3_binding_cmds::unbind_cmd(hw_l3_unbind1, hw_ifh1.data(), pfx_10));
+    ADD_EXPECT(l3_binding_cmds::unbind_cmd(hw_l3_unbind2, hw_ifh1.data(), pfx_11));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh1));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh1, itf1_name));
+    ADD_EXPECT(route_domain_cmds::delete_cmd(hw_rd_delete, l3_proto_t::IPV4, 1));
+    ADD_EXPECT(route_domain_cmds::delete_cmd(hw_rd_delete, l3_proto_t::IPV6, 1));
+
+    TRY_CHECK(OM::remove(rene));
+}
+
+BOOST_AUTO_TEST_CASE(test_prefixes) {
+    route::prefix_t p6_s_16(boost::asio::ip::address::from_string("2001::"), 16);
+
+    BOOST_CHECK(p6_s_16.mask() == boost::asio::ip::address::from_string("ffff::"));
+
+    route::prefix_t p6_s_17(boost::asio::ip::address::from_string("2001:ff00::"), 17);
+
+    BOOST_CHECK(p6_s_17.mask() == boost::asio::ip::address::from_string("ffff:8000::"));
+    BOOST_CHECK(p6_s_17.low().address() == boost::asio::ip::address::from_string("2001:8000::"));
+
+    route::prefix_t p6_s_15(boost::asio::ip::address::from_string("2001:ff00::"), 15);
+    BOOST_CHECK(p6_s_15.mask() == boost::asio::ip::address::from_string("fffe::"));
+    BOOST_CHECK(p6_s_15.low().address() == boost::asio::ip::address::from_string("2000::"));
+
+    route::prefix_t p4_s_16(boost::asio::ip::address::from_string("192.168.0.0"), 16);
+
+    BOOST_CHECK(p4_s_16.mask() == boost::asio::ip::address::from_string("255.255.0.0"));
+
+    route::prefix_t p4_s_17(boost::asio::ip::address::from_string("192.168.127.0"), 17);
+
+    BOOST_CHECK(p4_s_17.mask() == boost::asio::ip::address::from_string("255.255.128.0"));
+    BOOST_CHECK(p4_s_17.low().address() == boost::asio::ip::address::from_string("192.168.0.0"));
+    BOOST_CHECK(p4_s_17.high().address() == boost::asio::ip::address::from_string("192.168.127.255"));
+
+    route::prefix_t p4_s_15(boost::asio::ip::address::from_string("192.168.255.255"), 15);
+
+    BOOST_CHECK(p4_s_15.mask() == boost::asio::ip::address::from_string("255.254.0.0"));
+    BOOST_CHECK(p4_s_15.low().address() == boost::asio::ip::address::from_string("192.168.0.0"));
+    BOOST_CHECK(p4_s_15.high().address() == boost::asio::ip::address::from_string("192.169.255.255"));
+
+    route::prefix_t p4_s_32(boost::asio::ip::address::from_string("192.168.1.1"), 32);
+
+    BOOST_CHECK(p4_s_32.mask() == boost::asio::ip::address::from_string("255.255.255.255"));
+    BOOST_CHECK(p4_s_32.low().address() == boost::asio::ip::address::from_string("192.168.1.1"));
+    BOOST_CHECK(p4_s_32.high().address() == boost::asio::ip::address::from_string("192.168.1.1"));
+
+}
+
+BOOST_AUTO_TEST_CASE(test_pipes) {
+    VppInit vi;
+    const std::string gk = "GKChesterton";
+
+    const std::string pipe_name_1 = "pipe1";
+    VOM::pipe pipe1(1, interface::admin_state_t::UP);
+    HW::item<handle_t> hw_hdl(4, rc_t::OK);
+    HW::item<pipe::handle_pair_t> hw_hdl_pair(std::make_pair(5,6), rc_t::OK);
+
+    HW::item<interface::admin_state_t> hw_as_up(interface::admin_state_t::UP,
+                                                rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_down(interface::admin_state_t::DOWN,
+                                                  rc_t::OK);
+    ADD_EXPECT(pipe_cmds::create_cmd(hw_hdl, pipe_name_1, 1, hw_hdl_pair));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_hdl));
+    TRY_CHECK_RC(OM::write(gk, pipe1));
+
+    pipe1.set_ends(hw_hdl_pair.data());
+
+    // put each end of the pipe in a BD
+    bridge_domain bd1(33, bridge_domain::learning_mode_t::OFF,
+                      bridge_domain::arp_term_mode_t::OFF,
+                      bridge_domain::arp_ufwd_mode_t::ON,
+                      bridge_domain::flood_mode_t::OFF,
+                      bridge_domain::uu_flood_mode_t::ON,
+                      bridge_domain::mac_age_mode_t::ON);
+
+    HW::item<uint32_t> hw_bd(33, rc_t::OK);
+    ADD_EXPECT(bridge_domain_cmds::create_cmd(hw_bd,
+                                              bridge_domain::learning_mode_t::OFF,
+                                              bridge_domain::arp_term_mode_t::OFF,
+                                              bridge_domain::arp_ufwd_mode_t::ON,
+                                              bridge_domain::flood_mode_t::OFF,
+                                              bridge_domain::uu_flood_mode_t::ON,
+                                              bridge_domain::mac_age_mode_t::ON));
+
+    TRY_CHECK_RC(OM::write(gk, bd1));
+
+    l2_binding *l2_1 = new l2_binding(*pipe1.east(), bd1);
+    HW::item<bool> hw_l2_1_bind(true, rc_t::OK);
+
+    ADD_EXPECT(l2_binding_cmds::bind_cmd(hw_l2_1_bind,
+                                         pipe1.east()->handle(),
+                                         hw_bd.data(),
+                                         l2_binding::l2_port_type_t::L2_PORT_TYPE_NORMAL));
+    TRY_CHECK_RC(OM::write(gk, *l2_1));
+
+    l2_binding *l2_2 = new l2_binding(*pipe1.west(), bd1);
+    HW::item<bool> hw_l2_2_bind(true, rc_t::OK);
+
+    ADD_EXPECT(l2_binding_cmds::bind_cmd(hw_l2_2_bind,
+                                         pipe1.west()->handle(),
+                                         hw_bd.data(),
+                                         l2_binding::l2_port_type_t::L2_PORT_TYPE_NORMAL));
+    TRY_CHECK_RC(OM::write(gk, *l2_2));
+
+    STRICT_ORDER_OFF();
+
+    delete l2_1;
+    delete l2_2;
+    ADD_EXPECT(l2_binding_cmds::unbind_cmd(hw_l2_1_bind,
+                                           pipe1.east()->handle(),
+                                           hw_bd.data(),
+                                           l2_binding::l2_port_type_t::L2_PORT_TYPE_NORMAL));
+    ADD_EXPECT(l2_binding_cmds::unbind_cmd(hw_l2_1_bind,
+                                           pipe1.west()->handle(),
+                                           hw_bd.data(),
+                                           l2_binding::l2_port_type_t::L2_PORT_TYPE_NORMAL));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_hdl));
+    ADD_EXPECT(pipe_cmds::delete_cmd(hw_hdl, hw_hdl_pair));
+    ADD_EXPECT(bridge_domain_cmds::delete_cmd(hw_bd));
+    TRY_CHECK(OM::remove(gk));
+}
+
+BOOST_AUTO_TEST_CASE(test_qos) {
+    VppInit vi;
+    const std::string albert = "AlbertCamus";
+    rc_t rc = rc_t::OK;
+
+    /*
+     * Create an interface on which to enable QoS
+     */
+    std::string itf_name = "host1";
+    interface itf(itf_name,
+                  interface::type_t::AFPACKET,
+                  interface::admin_state_t::UP);
+    HW::item<handle_t> hw_ifh(2, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_up(interface::admin_state_t::UP, rc_t::OK);
+    HW::item<interface::admin_state_t> hw_as_down(interface::admin_state_t::DOWN, rc_t::OK);
+    ADD_EXPECT(interface_cmds::af_packet_create_cmd(hw_ifh, itf_name));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_up, hw_ifh));
+    TRY_CHECK_RC(OM::write(albert, itf));
+
+    QoS::map::outputs_t out;
+    out[0][5] = 5;
+    out[3][6] = 6;
+
+    QoS::map qem(1, out);
+
+    HW::item<bool> hw_qem(true, rc_t::OK);
+    ADD_EXPECT(QoS::map_cmds::create_cmd(hw_qem, 1, out));
+    TRY_CHECK_RC(OM::write(albert, qem));
+
+    QoS::record *qr = new QoS::record(itf, QoS::source_t::IP);
+    HW::item<bool> hw_qr(true, rc_t::OK);
+    ADD_EXPECT(QoS::record_cmds::create_cmd(hw_qr, hw_ifh.data(), QoS::source_t::IP));
+    TRY_CHECK_RC(OM::write(albert, *qr));
+
+    QoS::store *qs = new QoS::store(itf, QoS::source_t::IP, 55);
+    HW::item<bool> hw_qs(true, rc_t::OK);
+    ADD_EXPECT(QoS::store_cmds::create_cmd(hw_qs, hw_ifh.data(), QoS::source_t::IP, 55));
+    TRY_CHECK_RC(OM::write(albert, *qs));
+
+    QoS::mark *qm = new QoS::mark(itf, qem, QoS::source_t::IP);
+    HW::item<bool> hw_qm(true, rc_t::OK);
+    ADD_EXPECT(QoS::mark_cmds::create_cmd(hw_qm, hw_ifh.data(), 1, QoS::source_t::IP));
+    TRY_CHECK_RC(OM::write(albert, *qm));
+
+    STRICT_ORDER_OFF();
+    delete qr;
+    delete qm;
+    delete qs;
+    ADD_EXPECT(QoS::mark_cmds::delete_cmd(hw_qm, hw_ifh.data(), QoS::source_t::IP));
+    ADD_EXPECT(QoS::map_cmds::delete_cmd(hw_qem, 1));
+    ADD_EXPECT(QoS::record_cmds::delete_cmd(hw_qr, hw_ifh.data(), QoS::source_t::IP));
+    ADD_EXPECT(QoS::store_cmds::delete_cmd(hw_qs, hw_ifh.data(), QoS::source_t::IP));
+    ADD_EXPECT(interface_cmds::state_change_cmd(hw_as_down, hw_ifh));
+    ADD_EXPECT(interface_cmds::af_packet_delete_cmd(hw_ifh, itf_name));
+    TRY_CHECK(OM::remove(albert));
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/extras/deprecated/vom/vom.mk b/extras/deprecated/vom/vom.mk
new file mode 100644
index 00000000000..f284473beb5
--- /dev/null
+++ b/extras/deprecated/vom/vom.mk
@@ -0,0 +1,45 @@
+# Copyright (c) 2017-2018 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+vom_configure_depend = vpp-install
+vom_source = extras
+vom_configure_subdir = vom
+
+ifneq ($(shell which cmake3),)
+CMAKE?=cmake3
+else
+CMAKE?=cmake
+endif
+
+vom_cmake_args ?=
+vom_cmake_args += -DCMAKE_INSTALL_PREFIX:PATH=$(PACKAGE_INSTALL_DIR)
+vom_cmake_args += -DCMAKE_CXX_FLAGS="$($(TAG)_TAG_CPPFLAGS)"
+vom_cmake_args += -DCMAKE_SHARED_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)"
+vom_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(PACKAGE_INSTALL_DIR)/../vpp"
+
+# Use devtoolset on centos 7
+ifneq ($(wildcard /opt/rh/devtoolset-9/enable),)
+vom_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-9/root/bin"
+endif
+
+vom_configure = \
+  cd $(PACKAGE_BUILD_DIR) && \
+  $(CMAKE) -G Ninja $(vom_cmake_args) $(call find_source_fn,$(PACKAGE_SOURCE))$(PACKAGE_SUBDIR)
+
+vom_build = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- $(MAKE_PARALLEL_FLAGS)
+
+vom_install = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- install
+
+vom-package-deb: vom-install
+	@$(CMAKE) --build $(PACKAGE_BUILD_DIR)/vom -- package
+	@find $(PACKAGE_BUILD_DIR)/vom -name '*.deb' -exec mv {} $(CURDIR) \;
diff --git a/extras/vom/vom/.clang-format b/extras/deprecated/vom/vom/.clang-format
index b83102010d0..b83102010d0 100644
--- a/extras/vom/vom/.clang-format
+++ b/extras/deprecated/vom/vom/.clang-format
diff --git a/extras/vom/vom/CMakeLists.txt b/extras/deprecated/vom/vom/CMakeLists.txt
index 92a4348dba4..92a4348dba4 100644
--- a/extras/vom/vom/CMakeLists.txt
+++ b/extras/deprecated/vom/vom/CMakeLists.txt
diff --git a/extras/vom/vom/acl_binding.cpp b/extras/deprecated/vom/vom/acl_binding.cpp
index d57ed7741e5..5cdbf89abd6 100644
--- a/extras/vom/vom/acl_binding.cpp
+++ b/extras/deprecated/vom/vom/acl_binding.cpp
@@ -208,7 +208,7 @@ operator<<(std::ostream& os,
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_binding.hpp b/extras/deprecated/vom/vom/acl_binding.hpp
index 2c9923b8266..e2130fb3389 100644
--- a/extras/vom/vom/acl_binding.hpp
+++ b/extras/deprecated/vom/vom/acl_binding.hpp
@@ -235,7 +235,7 @@ std::ostream& operator<<(std::ostream& os,
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_binding_cmds.cpp b/extras/deprecated/vom/vom/acl_binding_cmds.cpp
index 062c1b90c9f..57a6e420ca8 100644
--- a/extras/vom/vom/acl_binding_cmds.cpp
+++ b/extras/deprecated/vom/vom/acl_binding_cmds.cpp
@@ -181,7 +181,7 @@ l2_dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_binding_cmds.hpp b/extras/deprecated/vom/vom/acl_binding_cmds.hpp
index 8515b4148ac..0e301df6100 100644
--- a/extras/vom/vom/acl_binding_cmds.hpp
+++ b/extras/deprecated/vom/vom/acl_binding_cmds.hpp
@@ -185,7 +185,7 @@ typedef dump_cmd<vapi::Macip_acl_interface_list_dump> l2_dump_cmd;
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_ethertype.cpp b/extras/deprecated/vom/vom/acl_ethertype.cpp
index 81ed7a28a7a..a72471ac8dc 100644
--- a/extras/vom/vom/acl_ethertype.cpp
+++ b/extras/deprecated/vom/vom/acl_ethertype.cpp
@@ -245,7 +245,7 @@ acl_ethertype::event_handler::show(std::ostream& os)
 };
 };
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_ethertype.hpp b/extras/deprecated/vom/vom/acl_ethertype.hpp
index 98d3ce20707..740a2061e77 100644
--- a/extras/vom/vom/acl_ethertype.hpp
+++ b/extras/deprecated/vom/vom/acl_ethertype.hpp
@@ -237,7 +237,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_ethertype_cmds.cpp b/extras/deprecated/vom/vom/acl_ethertype_cmds.cpp
index 0fa1d6db73e..7bad2b7ebdb 100644
--- a/extras/vom/vom/acl_ethertype_cmds.cpp
+++ b/extras/deprecated/vom/vom/acl_ethertype_cmds.cpp
@@ -159,7 +159,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_ethertype_cmds.hpp b/extras/deprecated/vom/vom/acl_ethertype_cmds.hpp
index a294a758056..3ac9d87bc51 100644
--- a/extras/vom/vom/acl_ethertype_cmds.hpp
+++ b/extras/deprecated/vom/vom/acl_ethertype_cmds.hpp
@@ -134,7 +134,7 @@ private:
 };
 };
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_l2_list.cpp b/extras/deprecated/vom/vom/acl_l2_list.cpp
index 8684c2c4d3a..fb18ace4b4b 100644
--- a/extras/vom/vom/acl_l2_list.cpp
+++ b/extras/deprecated/vom/vom/acl_l2_list.cpp
@@ -273,7 +273,7 @@ l2_list::replay(void)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_l2_list.hpp b/extras/deprecated/vom/vom/acl_l2_list.hpp
index 82cfd072fe7..dd7e00a6d4d 100644
--- a/extras/vom/vom/acl_l2_list.hpp
+++ b/extras/deprecated/vom/vom/acl_l2_list.hpp
@@ -214,7 +214,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_l2_rule.cpp b/extras/deprecated/vom/vom/acl_l2_rule.cpp
index 2b12e68c184..fdbe62f6f0e 100644
--- a/extras/vom/vom/acl_l2_rule.cpp
+++ b/extras/deprecated/vom/vom/acl_l2_rule.cpp
@@ -91,7 +91,7 @@ l2_rule::mac_mask() const
 }
 }
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_l2_rule.hpp b/extras/deprecated/vom/vom/acl_l2_rule.hpp
index 8c094aef5f4..806d8b08867 100644
--- a/extras/vom/vom/acl_l2_rule.hpp
+++ b/extras/deprecated/vom/vom/acl_l2_rule.hpp
@@ -105,7 +105,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_l3_list.cpp b/extras/deprecated/vom/vom/acl_l3_list.cpp
index cfa9cfee948..1afe8cb8863 100644
--- a/extras/vom/vom/acl_l3_list.cpp
+++ b/extras/deprecated/vom/vom/acl_l3_list.cpp
@@ -284,7 +284,7 @@ l3_list::replay(void)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_l3_list.hpp b/extras/deprecated/vom/vom/acl_l3_list.hpp
index 092bbe37dc0..ecbb19ae6a4 100644
--- a/extras/vom/vom/acl_l3_list.hpp
+++ b/extras/deprecated/vom/vom/acl_l3_list.hpp
@@ -214,7 +214,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_l3_rule.cpp b/extras/deprecated/vom/vom/acl_l3_rule.cpp
index 417dc5f2eb7..07e1b3b4940 100644
--- a/extras/vom/vom/acl_l3_rule.cpp
+++ b/extras/deprecated/vom/vom/acl_l3_rule.cpp
@@ -205,7 +205,7 @@ l3_rule::tcp_flags_value() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_l3_rule.hpp b/extras/deprecated/vom/vom/acl_l3_rule.hpp
index c1f1ceea5a1..dad38f1918c 100644
--- a/extras/vom/vom/acl_l3_rule.hpp
+++ b/extras/deprecated/vom/vom/acl_l3_rule.hpp
@@ -186,7 +186,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_list_cmds.cpp b/extras/deprecated/vom/vom/acl_list_cmds.cpp
index a589e1f2542..44686a7cf35 100644
--- a/extras/vom/vom/acl_list_cmds.cpp
+++ b/extras/deprecated/vom/vom/acl_list_cmds.cpp
@@ -189,7 +189,7 @@ l2_dump_cmd::issue(connection& con)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_list_cmds.hpp b/extras/deprecated/vom/vom/acl_list_cmds.hpp
index 252dec7175d..2fc20287e91 100644
--- a/extras/vom/vom/acl_list_cmds.hpp
+++ b/extras/deprecated/vom/vom/acl_list_cmds.hpp
@@ -213,7 +213,7 @@ typedef dump_cmd<vapi::Macip_acl_dump> l2_dump_cmd;
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_types.cpp b/extras/deprecated/vom/vom/acl_types.cpp
index b2c0c7f0b9d..840bf736bd5 100644
--- a/extras/vom/vom/acl_types.cpp
+++ b/extras/deprecated/vom/vom/acl_types.cpp
@@ -51,7 +51,7 @@ action_t::from_bool(bool b, uint8_t c)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_types.hpp b/extras/deprecated/vom/vom/acl_types.hpp
index cf5bee3e478..a473818ad55 100644
--- a/extras/vom/vom/acl_types.hpp
+++ b/extras/deprecated/vom/vom/acl_types.hpp
@@ -58,7 +58,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/api_types.cpp b/extras/deprecated/vom/vom/api_types.cpp
index 5eea7654eee..cd66699bb3e 100644
--- a/extras/vom/vom/api_types.cpp
+++ b/extras/deprecated/vom/vom/api_types.cpp
@@ -270,7 +270,7 @@ from_api(vapi_enum_fib_path_nh_proto p)
 }; // VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/api_types.hpp b/extras/deprecated/vom/vom/api_types.hpp
index 8d898f4c880..dd6f2085810 100644
--- a/extras/vom/vom/api_types.hpp
+++ b/extras/deprecated/vom/vom/api_types.hpp
@@ -67,7 +67,7 @@ const nh_proto_t& from_api(vapi_enum_fib_path_nh_proto);
 }; // VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/arp_proxy_binding.cpp b/extras/deprecated/vom/vom/arp_proxy_binding.cpp
index bbae9f683eb..8c8ee099b21 100644
--- a/extras/vom/vom/arp_proxy_binding.cpp
+++ b/extras/deprecated/vom/vom/arp_proxy_binding.cpp
@@ -152,7 +152,7 @@ arp_proxy_binding::event_handler::show(std::ostream& os)
 }
 }
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/arp_proxy_binding.hpp b/extras/deprecated/vom/vom/arp_proxy_binding.hpp
index 284cf7371fa..b11c5ba4414 100644
--- a/extras/vom/vom/arp_proxy_binding.hpp
+++ b/extras/deprecated/vom/vom/arp_proxy_binding.hpp
@@ -149,7 +149,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/arp_proxy_binding_cmds.cpp b/extras/deprecated/vom/vom/arp_proxy_binding_cmds.cpp
index acad2d5f6ac..eb832fa455e 100644
--- a/extras/vom/vom/arp_proxy_binding_cmds.cpp
+++ b/extras/deprecated/vom/vom/arp_proxy_binding_cmds.cpp
@@ -119,7 +119,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/arp_proxy_binding_cmds.hpp b/extras/deprecated/vom/vom/arp_proxy_binding_cmds.hpp
index 976466b4236..a3139373e61 100644
--- a/extras/vom/vom/arp_proxy_binding_cmds.hpp
+++ b/extras/deprecated/vom/vom/arp_proxy_binding_cmds.hpp
@@ -125,7 +125,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/arp_proxy_config.cpp b/extras/deprecated/vom/vom/arp_proxy_config.cpp
index e21fd4a97b2..3d502a2b437 100644
--- a/extras/vom/vom/arp_proxy_config.cpp
+++ b/extras/deprecated/vom/vom/arp_proxy_config.cpp
@@ -155,7 +155,7 @@ operator<<(std::ostream& os, const arp_proxy_config::key_t& key)
 }
 }
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/arp_proxy_config.hpp b/extras/deprecated/vom/vom/arp_proxy_config.hpp
index 3a50633de4d..129f7bd7e9e 100644
--- a/extras/vom/vom/arp_proxy_config.hpp
+++ b/extras/deprecated/vom/vom/arp_proxy_config.hpp
@@ -155,7 +155,7 @@ std::ostream& operator<<(std::ostream& os, const arp_proxy_config::key_t& key);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/arp_proxy_config_cmds.cpp b/extras/deprecated/vom/vom/arp_proxy_config_cmds.cpp
index a203830a62c..c9eb606e623 100644
--- a/extras/vom/vom/arp_proxy_config_cmds.cpp
+++ b/extras/deprecated/vom/vom/arp_proxy_config_cmds.cpp
@@ -134,7 +134,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/arp_proxy_config_cmds.hpp b/extras/deprecated/vom/vom/arp_proxy_config_cmds.hpp
index ae95251f13e..194acd6eff6 100644
--- a/extras/vom/vom/arp_proxy_config_cmds.hpp
+++ b/extras/deprecated/vom/vom/arp_proxy_config_cmds.hpp
@@ -130,7 +130,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_group_binding.cpp b/extras/deprecated/vom/vom/bond_group_binding.cpp
index e5d4f3891b5..f36641b7911 100644
--- a/extras/vom/vom/bond_group_binding.cpp
+++ b/extras/deprecated/vom/vom/bond_group_binding.cpp
@@ -171,7 +171,7 @@ bond_group_binding::event_handler::show(std::ostream& os)
 }
 }
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_group_binding.hpp b/extras/deprecated/vom/vom/bond_group_binding.hpp
index bfac4881a44..04befb52939 100644
--- a/extras/vom/vom/bond_group_binding.hpp
+++ b/extras/deprecated/vom/vom/bond_group_binding.hpp
@@ -176,7 +176,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_group_binding_cmds.cpp b/extras/deprecated/vom/vom/bond_group_binding_cmds.cpp
index b257f776373..ffda355358d 100644
--- a/extras/vom/vom/bond_group_binding_cmds.cpp
+++ b/extras/deprecated/vom/vom/bond_group_binding_cmds.cpp
@@ -137,7 +137,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_group_binding_cmds.hpp b/extras/deprecated/vom/vom/bond_group_binding_cmds.hpp
index 3d9bfeedc61..3f511304516 100644
--- a/extras/vom/vom/bond_group_binding_cmds.hpp
+++ b/extras/deprecated/vom/vom/bond_group_binding_cmds.hpp
@@ -128,7 +128,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_interface.cpp b/extras/deprecated/vom/vom/bond_interface.cpp
index 32a00ad7f43..33a001b0209 100644
--- a/extras/vom/vom/bond_interface.cpp
+++ b/extras/deprecated/vom/vom/bond_interface.cpp
@@ -189,7 +189,7 @@ bond_interface::lb_t::lb_t(int v, const std::string& s)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_interface.hpp b/extras/deprecated/vom/vom/bond_interface.hpp
index 74bc08bbbba..e52b519d6ba 100644
--- a/extras/vom/vom/bond_interface.hpp
+++ b/extras/deprecated/vom/vom/bond_interface.hpp
@@ -187,7 +187,7 @@ private:
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_interface_cmds.cpp b/extras/deprecated/vom/vom/bond_interface_cmds.cpp
index b5b459a0d42..3e49d2f85e2 100644
--- a/extras/vom/vom/bond_interface_cmds.cpp
+++ b/extras/deprecated/vom/vom/bond_interface_cmds.cpp
@@ -131,7 +131,7 @@ dump_cmd::to_string() const
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_interface_cmds.hpp b/extras/deprecated/vom/vom/bond_interface_cmds.hpp
index 06a8ac15009..5b1e0fcc98d 100644
--- a/extras/vom/vom/bond_interface_cmds.hpp
+++ b/extras/deprecated/vom/vom/bond_interface_cmds.hpp
@@ -102,7 +102,7 @@ public:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_member.cpp b/extras/deprecated/vom/vom/bond_member.cpp
index f1a27b3d1c6..d8edb1b6a20 100644
--- a/extras/vom/vom/bond_member.cpp
+++ b/extras/deprecated/vom/vom/bond_member.cpp
@@ -122,7 +122,7 @@ bond_member::rate_t::rate_t(int v, const std::string& s)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_member.hpp b/extras/deprecated/vom/vom/bond_member.hpp
index 066933b74d7..0d65d77028c 100644
--- a/extras/vom/vom/bond_member.hpp
+++ b/extras/deprecated/vom/vom/bond_member.hpp
@@ -137,7 +137,7 @@ private:
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain.cpp b/extras/deprecated/vom/vom/bridge_domain.cpp
index e86fc26b268..b9105e015f4 100644
--- a/extras/vom/vom/bridge_domain.cpp
+++ b/extras/deprecated/vom/vom/bridge_domain.cpp
@@ -300,7 +300,7 @@ bridge_domain::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain.hpp b/extras/deprecated/vom/vom/bridge_domain.hpp
index 8ece1cc89d1..633ed15b0d4 100644
--- a/extras/vom/vom/bridge_domain.hpp
+++ b/extras/deprecated/vom/vom/bridge_domain.hpp
@@ -296,7 +296,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_arp_entry.cpp b/extras/deprecated/vom/vom/bridge_domain_arp_entry.cpp
index f468e0f977f..699d35bfc3c 100644
--- a/extras/vom/vom/bridge_domain_arp_entry.cpp
+++ b/extras/deprecated/vom/vom/bridge_domain_arp_entry.cpp
@@ -212,7 +212,7 @@ operator<<(std::ostream& os, const bridge_domain_arp_entry::key_t& key)
 }
 }
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_arp_entry.hpp b/extras/deprecated/vom/vom/bridge_domain_arp_entry.hpp
index b4af6a0f62e..ac1bcdb5668 100644
--- a/extras/vom/vom/bridge_domain_arp_entry.hpp
+++ b/extras/deprecated/vom/vom/bridge_domain_arp_entry.hpp
@@ -185,7 +185,7 @@ std::ostream& operator<<(std::ostream& os,
 }; // namespace
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_arp_entry_cmds.cpp b/extras/deprecated/vom/vom/bridge_domain_arp_entry_cmds.cpp
index e1a80908271..fdfc45b7d9a 100644
--- a/extras/vom/vom/bridge_domain_arp_entry_cmds.cpp
+++ b/extras/deprecated/vom/vom/bridge_domain_arp_entry_cmds.cpp
@@ -153,7 +153,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_arp_entry_cmds.hpp b/extras/deprecated/vom/vom/bridge_domain_arp_entry_cmds.hpp
index 490fc4ba738..2c7b5e27043 100644
--- a/extras/vom/vom/bridge_domain_arp_entry_cmds.hpp
+++ b/extras/deprecated/vom/vom/bridge_domain_arp_entry_cmds.hpp
@@ -136,7 +136,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_cmds.cpp b/extras/deprecated/vom/vom/bridge_domain_cmds.cpp
index 1aeafcee44f..00c554205bd 100644
--- a/extras/vom/vom/bridge_domain_cmds.cpp
+++ b/extras/deprecated/vom/vom/bridge_domain_cmds.cpp
@@ -143,7 +143,7 @@ dump_cmd::to_string() const
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_cmds.hpp b/extras/deprecated/vom/vom/bridge_domain_cmds.hpp
index 395b3560d7a..2cb3bc8fe7f 100644
--- a/extras/vom/vom/bridge_domain_cmds.hpp
+++ b/extras/deprecated/vom/vom/bridge_domain_cmds.hpp
@@ -146,7 +146,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_entry.cpp b/extras/deprecated/vom/vom/bridge_domain_entry.cpp
index 241de953771..6c837f5dc9f 100644
--- a/extras/vom/vom/bridge_domain_entry.cpp
+++ b/extras/deprecated/vom/vom/bridge_domain_entry.cpp
@@ -216,7 +216,7 @@ operator<<(std::ostream& os, const bridge_domain_entry::key_t& key)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_entry.hpp b/extras/deprecated/vom/vom/bridge_domain_entry.hpp
index 2aef697ebca..68a3459c824 100644
--- a/extras/vom/vom/bridge_domain_entry.hpp
+++ b/extras/deprecated/vom/vom/bridge_domain_entry.hpp
@@ -182,7 +182,7 @@ std::ostream& operator<<(std::ostream& os,
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_entry_cmds.cpp b/extras/deprecated/vom/vom/bridge_domain_entry_cmds.cpp
index ffdd02de0d2..885a5578f12 100644
--- a/extras/vom/vom/bridge_domain_entry_cmds.cpp
+++ b/extras/deprecated/vom/vom/bridge_domain_entry_cmds.cpp
@@ -147,7 +147,7 @@ dump_cmd::to_string() const
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_entry_cmds.hpp b/extras/deprecated/vom/vom/bridge_domain_entry_cmds.hpp
index dfee04f2a0d..88bb4e1ec49 100644
--- a/extras/vom/vom/bridge_domain_entry_cmds.hpp
+++ b/extras/deprecated/vom/vom/bridge_domain_entry_cmds.hpp
@@ -133,7 +133,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/client_db.cpp b/extras/deprecated/vom/vom/client_db.cpp
index 41463d1dd74..b7dcd0114a4 100644
--- a/extras/vom/vom/client_db.cpp
+++ b/extras/deprecated/vom/vom/client_db.cpp
@@ -51,7 +51,7 @@ client_db::dump(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/client_db.hpp b/extras/deprecated/vom/vom/client_db.hpp
index 34204c1d839..553b9420195 100644
--- a/extras/vom/vom/client_db.hpp
+++ b/extras/deprecated/vom/vom/client_db.hpp
@@ -79,7 +79,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/cmd.cpp b/extras/deprecated/vom/vom/cmd.cpp
index 5623507a63f..846854b5807 100644
--- a/extras/vom/vom/cmd.cpp
+++ b/extras/deprecated/vom/vom/cmd.cpp
@@ -29,7 +29,7 @@ operator<<(std::ostream& os, const cmd& cmd)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/cmd.hpp b/extras/deprecated/vom/vom/cmd.hpp
index 9c87d31218a..b95de41095e 100644
--- a/extras/vom/vom/cmd.hpp
+++ b/extras/deprecated/vom/vom/cmd.hpp
@@ -70,7 +70,7 @@ std::ostream& operator<<(std::ostream& os, const cmd& cmd);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/connection.cpp b/extras/deprecated/vom/vom/connection.cpp
index c03ef99c172..3de44eaa0ce 100644
--- a/extras/vom/vom/connection.cpp
+++ b/extras/deprecated/vom/vom/connection.cpp
@@ -53,7 +53,7 @@ connection::ctx()
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/connection.hpp b/extras/deprecated/vom/vom/connection.hpp
index 06fe840232d..26b7d184596 100644
--- a/extras/vom/vom/connection.hpp
+++ b/extras/deprecated/vom/vom/connection.hpp
@@ -72,7 +72,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/dhcp_client.cpp b/extras/deprecated/vom/vom/dhcp_client.cpp
index 23911b3df0e..1c1dd819fc0 100644
--- a/extras/vom/vom/dhcp_client.cpp
+++ b/extras/deprecated/vom/vom/dhcp_client.cpp
@@ -347,7 +347,7 @@ dhcp_client::dhcp_client_listener::handle_dhcp_event(std::shared_ptr<lease_t> e)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/dhcp_client.hpp b/extras/deprecated/vom/vom/dhcp_client.hpp
index 8e8669a96ef..8eccb9ac23f 100644
--- a/extras/vom/vom/dhcp_client.hpp
+++ b/extras/deprecated/vom/vom/dhcp_client.hpp
@@ -307,7 +307,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/dhcp_client_cmds.cpp b/extras/deprecated/vom/vom/dhcp_client_cmds.cpp
index 3f899a63c01..f26ad6ecf1e 100644
--- a/extras/vom/vom/dhcp_client_cmds.cpp
+++ b/extras/deprecated/vom/vom/dhcp_client_cmds.cpp
@@ -234,7 +234,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/dhcp_client_cmds.hpp b/extras/deprecated/vom/vom/dhcp_client_cmds.hpp
index 10d4026f4f3..5ee05fc0e24 100644
--- a/extras/vom/vom/dhcp_client_cmds.hpp
+++ b/extras/deprecated/vom/vom/dhcp_client_cmds.hpp
@@ -203,7 +203,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/dump_cmd.hpp b/extras/deprecated/vom/vom/dump_cmd.hpp
index 4dad02b911e..be85a46a7c7 100644
--- a/extras/vom/vom/dump_cmd.hpp
+++ b/extras/deprecated/vom/vom/dump_cmd.hpp
@@ -145,7 +145,7 @@ protected:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/enum_base.hpp b/extras/deprecated/vom/vom/enum_base.hpp
index 015410a57c5..2ac8edebfce 100644
--- a/extras/vom/vom/enum_base.hpp
+++ b/extras/deprecated/vom/vom/enum_base.hpp
@@ -116,7 +116,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/event_cmd.hpp b/extras/deprecated/vom/vom/event_cmd.hpp
index 1120f75b399..c7a561355c7 100644
--- a/extras/vom/vom/event_cmd.hpp
+++ b/extras/deprecated/vom/vom/event_cmd.hpp
@@ -107,7 +107,7 @@ protected:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_bridge_domain.cpp b/extras/deprecated/vom/vom/gbp_bridge_domain.cpp
index 3e015c379c2..cc4e256c7aa 100644
--- a/extras/vom/vom/gbp_bridge_domain.cpp
+++ b/extras/deprecated/vom/vom/gbp_bridge_domain.cpp
@@ -347,7 +347,7 @@ gbp_bridge_domain::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_bridge_domain.hpp b/extras/deprecated/vom/vom/gbp_bridge_domain.hpp
index d397fe5231f..c6e5b1285b2 100644
--- a/extras/vom/vom/gbp_bridge_domain.hpp
+++ b/extras/deprecated/vom/vom/gbp_bridge_domain.hpp
@@ -211,7 +211,7 @@ private:
 }; // namespace
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_bridge_domain_cmds.cpp b/extras/deprecated/vom/vom/gbp_bridge_domain_cmds.cpp
index 05064df6269..b6124760a1d 100644
--- a/extras/vom/vom/gbp_bridge_domain_cmds.cpp
+++ b/extras/deprecated/vom/vom/gbp_bridge_domain_cmds.cpp
@@ -151,7 +151,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_bridge_domain_cmds.hpp b/extras/deprecated/vom/vom/gbp_bridge_domain_cmds.hpp
index 6dbe6dcdfed..76fc86d0b91 100644
--- a/extras/vom/vom/gbp_bridge_domain_cmds.hpp
+++ b/extras/deprecated/vom/vom/gbp_bridge_domain_cmds.hpp
@@ -127,7 +127,7 @@ private:
 }; // VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_contract.cpp b/extras/deprecated/vom/vom/gbp_contract.cpp
index 8fcef02da24..f1b35ddf8c4 100644
--- a/extras/vom/vom/gbp_contract.cpp
+++ b/extras/deprecated/vom/vom/gbp_contract.cpp
@@ -246,7 +246,7 @@ operator<<(std::ostream& os, const gbp_contract::key_t& key)
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_contract.hpp b/extras/deprecated/vom/vom/gbp_contract.hpp
index caf5a3c5a0e..d935030034e 100644
--- a/extras/vom/vom/gbp_contract.hpp
+++ b/extras/deprecated/vom/vom/gbp_contract.hpp
@@ -207,7 +207,7 @@ std::ostream& operator<<(std::ostream& os, const gbp_contract::key_t& key);
 }; // namespace
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_contract_cmds.cpp b/extras/deprecated/vom/vom/gbp_contract_cmds.cpp
index 1bb06bdaa69..63d9334faf0 100644
--- a/extras/vom/vom/gbp_contract_cmds.cpp
+++ b/extras/deprecated/vom/vom/gbp_contract_cmds.cpp
@@ -192,7 +192,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_contract_cmds.hpp b/extras/deprecated/vom/vom/gbp_contract_cmds.hpp
index d9fe1d74e37..2146d5d732c 100644
--- a/extras/vom/vom/gbp_contract_cmds.hpp
+++ b/extras/deprecated/vom/vom/gbp_contract_cmds.hpp
@@ -137,7 +137,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_endpoint.cpp b/extras/deprecated/vom/vom/gbp_endpoint.cpp
index ef406b16565..fa8907dcc04 100644
--- a/extras/vom/vom/gbp_endpoint.cpp
+++ b/extras/deprecated/vom/vom/gbp_endpoint.cpp
@@ -216,7 +216,7 @@ operator<<(std::ostream& os, const gbp_endpoint::key_t& key)
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_endpoint.hpp b/extras/deprecated/vom/vom/gbp_endpoint.hpp
index 8008e3b1c67..3d92506d4ce 100644
--- a/extras/vom/vom/gbp_endpoint.hpp
+++ b/extras/deprecated/vom/vom/gbp_endpoint.hpp
@@ -208,7 +208,7 @@ std::ostream& operator<<(std::ostream& os, const gbp_endpoint::key_t& key);
 }; // namespace
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_endpoint_cmds.cpp b/extras/deprecated/vom/vom/gbp_endpoint_cmds.cpp
index f0c55ebc4da..de7c77b41f6 100644
--- a/extras/vom/vom/gbp_endpoint_cmds.cpp
+++ b/extras/deprecated/vom/vom/gbp_endpoint_cmds.cpp
@@ -184,7 +184,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_endpoint_cmds.hpp b/extras/deprecated/vom/vom/gbp_endpoint_cmds.hpp
index 4b9036aca00..b0a62acace7 100644
--- a/extras/vom/vom/gbp_endpoint_cmds.hpp
+++ b/extras/deprecated/vom/vom/gbp_endpoint_cmds.hpp
@@ -131,7 +131,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_endpoint_group.cpp b/extras/deprecated/vom/vom/gbp_endpoint_group.cpp
index abec585c744..03f17a7f4fe 100644
--- a/extras/vom/vom/gbp_endpoint_group.cpp
+++ b/extras/deprecated/vom/vom/gbp_endpoint_group.cpp
@@ -283,7 +283,7 @@ gbp_endpoint_group::event_handler::show(std::ostream& os)
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_endpoint_group.hpp b/extras/deprecated/vom/vom/gbp_endpoint_group.hpp
index e15a1885317..ecc4c4f4baf 100644
--- a/extras/vom/vom/gbp_endpoint_group.hpp
+++ b/extras/deprecated/vom/vom/gbp_endpoint_group.hpp
@@ -235,7 +235,7 @@ private:
 }; // namespace
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_endpoint_group_cmds.cpp b/extras/deprecated/vom/vom/gbp_endpoint_group_cmds.cpp
index c5618602550..15a8858d5d6 100644
--- a/extras/vom/vom/gbp_endpoint_group_cmds.cpp
+++ b/extras/deprecated/vom/vom/gbp_endpoint_group_cmds.cpp
@@ -139,7 +139,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_endpoint_group_cmds.hpp b/extras/deprecated/vom/vom/gbp_endpoint_group_cmds.hpp
index fa892726bf3..5e7e0633dfc 100644
--- a/extras/vom/vom/gbp_endpoint_group_cmds.hpp
+++ b/extras/deprecated/vom/vom/gbp_endpoint_group_cmds.hpp
@@ -131,7 +131,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_ext_itf.cpp b/extras/deprecated/vom/vom/gbp_ext_itf.cpp
index 91697352cd5..55a0fbd3d69 100644
--- a/extras/vom/vom/gbp_ext_itf.cpp
+++ b/extras/deprecated/vom/vom/gbp_ext_itf.cpp
@@ -189,7 +189,7 @@ gbp_ext_itf::event_handler::show(std::ostream& os)
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_ext_itf.hpp b/extras/deprecated/vom/vom/gbp_ext_itf.hpp
index 20d9b6eff9b..5de85373a4d 100644
--- a/extras/vom/vom/gbp_ext_itf.hpp
+++ b/extras/deprecated/vom/vom/gbp_ext_itf.hpp
@@ -176,7 +176,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_ext_itf_cmds.cpp b/extras/deprecated/vom/vom/gbp_ext_itf_cmds.cpp
index b2090ea0fa5..cf22aac102e 100644
--- a/extras/vom/vom/gbp_ext_itf_cmds.cpp
+++ b/extras/deprecated/vom/vom/gbp_ext_itf_cmds.cpp
@@ -127,7 +127,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_ext_itf_cmds.hpp b/extras/deprecated/vom/vom/gbp_ext_itf_cmds.hpp
index 51052b9a360..3d14f05580a 100644
--- a/extras/vom/vom/gbp_ext_itf_cmds.hpp
+++ b/extras/deprecated/vom/vom/gbp_ext_itf_cmds.hpp
@@ -124,7 +124,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_recirc.cpp b/extras/deprecated/vom/vom/gbp_recirc.cpp
index 19cb2da60e2..5b0d368d80d 100644
--- a/extras/vom/vom/gbp_recirc.cpp
+++ b/extras/deprecated/vom/vom/gbp_recirc.cpp
@@ -192,7 +192,7 @@ gbp_recirc::event_handler::show(std::ostream& os)
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_recirc.hpp b/extras/deprecated/vom/vom/gbp_recirc.hpp
index fee4f6c2502..7cc3b938705 100644
--- a/extras/vom/vom/gbp_recirc.hpp
+++ b/extras/deprecated/vom/vom/gbp_recirc.hpp
@@ -199,7 +199,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_recirc_cmds.cpp b/extras/deprecated/vom/vom/gbp_recirc_cmds.cpp
index 90b931c0ced..a1832977adf 100644
--- a/extras/vom/vom/gbp_recirc_cmds.cpp
+++ b/extras/deprecated/vom/vom/gbp_recirc_cmds.cpp
@@ -130,7 +130,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_recirc_cmds.hpp b/extras/deprecated/vom/vom/gbp_recirc_cmds.hpp
index 9d95bf16195..4e74bd49b7d 100644
--- a/extras/vom/vom/gbp_recirc_cmds.hpp
+++ b/extras/deprecated/vom/vom/gbp_recirc_cmds.hpp
@@ -125,7 +125,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_route_domain.cpp b/extras/deprecated/vom/vom/gbp_route_domain.cpp
index 54b51cf88a3..0bb516d02e9 100644
--- a/extras/vom/vom/gbp_route_domain.cpp
+++ b/extras/deprecated/vom/vom/gbp_route_domain.cpp
@@ -271,7 +271,7 @@ gbp_route_domain::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_route_domain.hpp b/extras/deprecated/vom/vom/gbp_route_domain.hpp
index dd096738297..310e9e328c8 100644
--- a/extras/vom/vom/gbp_route_domain.hpp
+++ b/extras/deprecated/vom/vom/gbp_route_domain.hpp
@@ -187,7 +187,7 @@ private:
 }; // namespace
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_route_domain_cmds.cpp b/extras/deprecated/vom/vom/gbp_route_domain_cmds.cpp
index 90e81f338e3..9b6457e1333 100644
--- a/extras/vom/vom/gbp_route_domain_cmds.cpp
+++ b/extras/deprecated/vom/vom/gbp_route_domain_cmds.cpp
@@ -132,7 +132,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_route_domain_cmds.hpp b/extras/deprecated/vom/vom/gbp_route_domain_cmds.hpp
index 6ef9fcd3ce9..577f334154a 100644
--- a/extras/vom/vom/gbp_route_domain_cmds.hpp
+++ b/extras/deprecated/vom/vom/gbp_route_domain_cmds.hpp
@@ -123,7 +123,7 @@ private:
 }; // VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_rule.cpp b/extras/deprecated/vom/vom/gbp_rule.cpp
index 48c59b14c2b..5d13850d2d9 100644
--- a/extras/vom/vom/gbp_rule.cpp
+++ b/extras/deprecated/vom/vom/gbp_rule.cpp
@@ -220,7 +220,7 @@ gbp_rule::nhs() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_rule.hpp b/extras/deprecated/vom/vom/gbp_rule.hpp
index 04301da79e9..1871e7e14a6 100644
--- a/extras/vom/vom/gbp_rule.hpp
+++ b/extras/deprecated/vom/vom/gbp_rule.hpp
@@ -272,7 +272,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_subnet.cpp b/extras/deprecated/vom/vom/gbp_subnet.cpp
index bc897f125db..13d1b41adc1 100644
--- a/extras/vom/vom/gbp_subnet.cpp
+++ b/extras/deprecated/vom/vom/gbp_subnet.cpp
@@ -291,7 +291,7 @@ operator<<(std::ostream& os, const gbp_subnet::key_t& key)
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_subnet.hpp b/extras/deprecated/vom/vom/gbp_subnet.hpp
index 3ae8439e83c..09132763f0e 100644
--- a/extras/vom/vom/gbp_subnet.hpp
+++ b/extras/deprecated/vom/vom/gbp_subnet.hpp
@@ -242,7 +242,7 @@ std::ostream& operator<<(std::ostream& os, const gbp_subnet::key_t& key);
 }; // namespace
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_subnet_cmds.cpp b/extras/deprecated/vom/vom/gbp_subnet_cmds.cpp
index 94152ffe369..765f9403629 100644
--- a/extras/vom/vom/gbp_subnet_cmds.cpp
+++ b/extras/deprecated/vom/vom/gbp_subnet_cmds.cpp
@@ -158,7 +158,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_subnet_cmds.hpp b/extras/deprecated/vom/vom/gbp_subnet_cmds.hpp
index b78699e5bf5..3801a5b4783 100644
--- a/extras/vom/vom/gbp_subnet_cmds.hpp
+++ b/extras/deprecated/vom/vom/gbp_subnet_cmds.hpp
@@ -132,7 +132,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_types.hpp b/extras/deprecated/vom/vom/gbp_types.hpp
index 5b46e08f513..bbcc9195da8 100644
--- a/extras/vom/vom/gbp_types.hpp
+++ b/extras/deprecated/vom/vom/gbp_types.hpp
@@ -30,7 +30,7 @@ typedef uint16_t scope_t;
 }; // namespace
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_vxlan.cpp b/extras/deprecated/vom/vom/gbp_vxlan.cpp
index 76826c2a3d6..32d1db9da64 100644
--- a/extras/vom/vom/gbp_vxlan.cpp
+++ b/extras/deprecated/vom/vom/gbp_vxlan.cpp
@@ -233,7 +233,7 @@ gbp_vxlan::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_vxlan.hpp b/extras/deprecated/vom/vom/gbp_vxlan.hpp
index 8aa4b6b6b6e..a3e223b0b3f 100644
--- a/extras/vom/vom/gbp_vxlan.hpp
+++ b/extras/deprecated/vom/vom/gbp_vxlan.hpp
@@ -181,7 +181,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_vxlan_cmds.cpp b/extras/deprecated/vom/vom/gbp_vxlan_cmds.cpp
index 86b61c14f06..e35e4e976bd 100644
--- a/extras/vom/vom/gbp_vxlan_cmds.cpp
+++ b/extras/deprecated/vom/vom/gbp_vxlan_cmds.cpp
@@ -131,7 +131,7 @@ dump_cmd::to_string() const
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_vxlan_cmds.hpp b/extras/deprecated/vom/vom/gbp_vxlan_cmds.hpp
index 642235731bb..396ef7443e7 100644
--- a/extras/vom/vom/gbp_vxlan_cmds.hpp
+++ b/extras/deprecated/vom/vom/gbp_vxlan_cmds.hpp
@@ -127,7 +127,7 @@ private:
 }; // VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/hw.cpp b/extras/deprecated/vom/vom/hw.cpp
index 54f0aa2c02f..932a014b9f7 100644
--- a/extras/vom/vom/hw.cpp
+++ b/extras/deprecated/vom/vom/hw.cpp
@@ -298,7 +298,7 @@ HW::item<unsigned int>::to_string() const
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/hw.hpp b/extras/deprecated/vom/vom/hw.hpp
index d10a93aa59b..e828139c83c 100644
--- a/extras/vom/vom/hw.hpp
+++ b/extras/deprecated/vom/vom/hw.hpp
@@ -386,7 +386,7 @@ std::string HW::item<unsigned int>::to_string() const;
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/hw_cmds.cpp b/extras/deprecated/vom/vom/hw_cmds.cpp
index 429c123e9e9..5f36b865bb6 100644
--- a/extras/vom/vom/hw_cmds.cpp
+++ b/extras/deprecated/vom/vom/hw_cmds.cpp
@@ -46,7 +46,7 @@ poll::to_string() const
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/hw_cmds.hpp b/extras/deprecated/vom/vom/hw_cmds.hpp
index c10f71e524c..031556a8337 100644
--- a/extras/vom/vom/hw_cmds.hpp
+++ b/extras/deprecated/vom/vom/hw_cmds.hpp
@@ -54,7 +54,7 @@ public:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/igmp_binding.cpp b/extras/deprecated/vom/vom/igmp_binding.cpp
index 73e0bd8f02a..5e4b0343d36 100644
--- a/extras/vom/vom/igmp_binding.cpp
+++ b/extras/deprecated/vom/vom/igmp_binding.cpp
@@ -154,7 +154,7 @@ igmp_binding::event_handler::show(std::ostream& os)
 }
 }
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/igmp_binding.hpp b/extras/deprecated/vom/vom/igmp_binding.hpp
index 56af8d1117e..484bea6e9eb 100644
--- a/extras/vom/vom/igmp_binding.hpp
+++ b/extras/deprecated/vom/vom/igmp_binding.hpp
@@ -173,7 +173,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/igmp_binding_cmds.cpp b/extras/deprecated/vom/vom/igmp_binding_cmds.cpp
index 133509e4e75..e18cb5b0834 100644
--- a/extras/vom/vom/igmp_binding_cmds.cpp
+++ b/extras/deprecated/vom/vom/igmp_binding_cmds.cpp
@@ -97,7 +97,7 @@ unbind_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/igmp_binding_cmds.hpp b/extras/deprecated/vom/vom/igmp_binding_cmds.hpp
index 25a1a67215a..29766151bb7 100644
--- a/extras/vom/vom/igmp_binding_cmds.hpp
+++ b/extras/deprecated/vom/vom/igmp_binding_cmds.hpp
@@ -91,7 +91,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/igmp_listen.cpp b/extras/deprecated/vom/vom/igmp_listen.cpp
index 8d321add65d..9536bfb8859 100644
--- a/extras/vom/vom/igmp_listen.cpp
+++ b/extras/deprecated/vom/vom/igmp_listen.cpp
@@ -180,7 +180,7 @@ igmp_listen::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/igmp_listen.hpp b/extras/deprecated/vom/vom/igmp_listen.hpp
index 4f07e759b09..44701d4bf44 100644
--- a/extras/vom/vom/igmp_listen.hpp
+++ b/extras/deprecated/vom/vom/igmp_listen.hpp
@@ -191,7 +191,7 @@ std::ostream& operator<<(std::ostream& os, const igmp_listen::key_t& key);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/igmp_listen_cmds.cpp b/extras/deprecated/vom/vom/igmp_listen_cmds.cpp
index 69e243d9b4a..99a994d8cc8 100644
--- a/extras/vom/vom/igmp_listen_cmds.cpp
+++ b/extras/deprecated/vom/vom/igmp_listen_cmds.cpp
@@ -169,7 +169,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/igmp_listen_cmds.hpp b/extras/deprecated/vom/vom/igmp_listen_cmds.hpp
index 5bfea47914b..1a1ca0facdc 100644
--- a/extras/vom/vom/igmp_listen_cmds.hpp
+++ b/extras/deprecated/vom/vom/igmp_listen_cmds.hpp
@@ -152,7 +152,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/inspect.cpp b/extras/deprecated/vom/vom/inspect.cpp
index 605a921b5ac..436c1f571fa 100644
--- a/extras/vom/vom/inspect.cpp
+++ b/extras/deprecated/vom/vom/inspect.cpp
@@ -99,7 +99,7 @@ inspect::register_handler(const std::vector<std::string>& cmds,
 }
 }
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/inspect.hpp b/extras/deprecated/vom/vom/inspect.hpp
index d5bca3040d2..a3f3d4935c0 100644
--- a/extras/vom/vom/inspect.hpp
+++ b/extras/deprecated/vom/vom/inspect.hpp
@@ -86,7 +86,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface.cpp b/extras/deprecated/vom/vom/interface.cpp
index 70035648d06..fcb88b3554c 100644
--- a/extras/vom/vom/interface.cpp
+++ b/extras/deprecated/vom/vom/interface.cpp
@@ -768,7 +768,7 @@ interface::event_handler::show(std::ostream& os)
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface.hpp b/extras/deprecated/vom/vom/interface.hpp
index a1098c11329..53225f9b192 100644
--- a/extras/vom/vom/interface.hpp
+++ b/extras/deprecated/vom/vom/interface.hpp
@@ -749,7 +749,7 @@ private:
 std::ostream& operator<<(std::ostream& os, const interface::stats_t& stats);
 };
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_cmds.cpp b/extras/deprecated/vom/vom/interface_cmds.cpp
index 691040dd5f1..d043a38b068 100644
--- a/extras/vom/vom/interface_cmds.cpp
+++ b/extras/deprecated/vom/vom/interface_cmds.cpp
@@ -660,7 +660,7 @@ set_tag::operator==(const set_tag& o) const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_cmds.hpp b/extras/deprecated/vom/vom/interface_cmds.hpp
index 2ee892fc0f8..7c527ff85a0 100644
--- a/extras/vom/vom/interface_cmds.hpp
+++ b/extras/deprecated/vom/vom/interface_cmds.hpp
@@ -530,7 +530,7 @@ public:
 };
 };
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_factory.cpp b/extras/deprecated/vom/vom/interface_factory.cpp
index f0b25ffd837..746fbe38809 100644
--- a/extras/vom/vom/interface_factory.cpp
+++ b/extras/deprecated/vom/vom/interface_factory.cpp
@@ -245,7 +245,7 @@ interface_factory::new_pipe_interface(const vapi_payload_pipe_details& payload)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_factory.hpp b/extras/deprecated/vom/vom/interface_factory.hpp
index fef2b638c18..7b9703aab56 100644
--- a/extras/vom/vom/interface_factory.hpp
+++ b/extras/deprecated/vom/vom/interface_factory.hpp
@@ -63,7 +63,7 @@ public:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_ip6_nd.hpp b/extras/deprecated/vom/vom/interface_ip6_nd.hpp
index fa5a479248c..b8933ee1574 100644
--- a/extras/vom/vom/interface_ip6_nd.hpp
+++ b/extras/deprecated/vom/vom/interface_ip6_nd.hpp
@@ -372,7 +372,7 @@ typename interface_ip6_nd<CLASS, CMD>::event_handler
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_ip6_nd_cmds.cpp b/extras/deprecated/vom/vom/interface_ip6_nd_cmds.cpp
index 15ff1caa4b4..c8a8d75dbec 100644
--- a/extras/vom/vom/interface_ip6_nd_cmds.cpp
+++ b/extras/deprecated/vom/vom/interface_ip6_nd_cmds.cpp
@@ -90,7 +90,7 @@ ip6nd_ra_prefix::unconfig_cmd::issue(connection& con)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_span.cpp b/extras/deprecated/vom/vom/interface_span.cpp
index 283ea1ece54..4dee9f2fd82 100644
--- a/extras/vom/vom/interface_span.cpp
+++ b/extras/deprecated/vom/vom/interface_span.cpp
@@ -211,7 +211,7 @@ interface_span::state_t::from_int(uint8_t i)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_span.hpp b/extras/deprecated/vom/vom/interface_span.hpp
index baa2054a530..7eabb1c4ab3 100644
--- a/extras/vom/vom/interface_span.hpp
+++ b/extras/deprecated/vom/vom/interface_span.hpp
@@ -212,7 +212,7 @@ std::ostream& operator<<(std::ostream& os, const interface_span::key_t& key);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_span_cmds.cpp b/extras/deprecated/vom/vom/interface_span_cmds.cpp
index 00dbdd0b895..7ee68d3a2e7 100644
--- a/extras/vom/vom/interface_span_cmds.cpp
+++ b/extras/deprecated/vom/vom/interface_span_cmds.cpp
@@ -141,7 +141,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_span_cmds.hpp b/extras/deprecated/vom/vom/interface_span_cmds.hpp
index e83ed728fb1..c1573e9af1c 100644
--- a/extras/vom/vom/interface_span_cmds.hpp
+++ b/extras/deprecated/vom/vom/interface_span_cmds.hpp
@@ -144,7 +144,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_types.cpp b/extras/deprecated/vom/vom/interface_types.cpp
index 239c3e6abf6..e63204bd0aa 100644
--- a/extras/vom/vom/interface_types.cpp
+++ b/extras/deprecated/vom/vom/interface_types.cpp
@@ -111,7 +111,7 @@ interface::oper_state_t::from_int(uint8_t v)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ip_punt_redirect.cpp b/extras/deprecated/vom/vom/ip_punt_redirect.cpp
index 853546fe397..667a2a0b60e 100644
--- a/extras/vom/vom/ip_punt_redirect.cpp
+++ b/extras/deprecated/vom/vom/ip_punt_redirect.cpp
@@ -189,7 +189,7 @@ ip_punt_redirect::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ip_punt_redirect.hpp b/extras/deprecated/vom/vom/ip_punt_redirect.hpp
index ed9cf34992c..59e54566ef7 100644
--- a/extras/vom/vom/ip_punt_redirect.hpp
+++ b/extras/deprecated/vom/vom/ip_punt_redirect.hpp
@@ -186,7 +186,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ip_punt_redirect_cmds.cpp b/extras/deprecated/vom/vom/ip_punt_redirect_cmds.cpp
index 419e3f17fba..95ce7b48035 100644
--- a/extras/vom/vom/ip_punt_redirect_cmds.cpp
+++ b/extras/deprecated/vom/vom/ip_punt_redirect_cmds.cpp
@@ -142,7 +142,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ip_punt_redirect_cmds.hpp b/extras/deprecated/vom/vom/ip_punt_redirect_cmds.hpp
index 22e2a62a23c..236e6e310af 100644
--- a/extras/vom/vom/ip_punt_redirect_cmds.hpp
+++ b/extras/deprecated/vom/vom/ip_punt_redirect_cmds.hpp
@@ -149,7 +149,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ip_unnumbered.cpp b/extras/deprecated/vom/vom/ip_unnumbered.cpp
index 74a6edeceeb..59834ecfc64 100644
--- a/extras/vom/vom/ip_unnumbered.cpp
+++ b/extras/deprecated/vom/vom/ip_unnumbered.cpp
@@ -154,7 +154,7 @@ ip_unnumbered::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ip_unnumbered.hpp b/extras/deprecated/vom/vom/ip_unnumbered.hpp
index b736919744c..f6fef88adbb 100644
--- a/extras/vom/vom/ip_unnumbered.hpp
+++ b/extras/deprecated/vom/vom/ip_unnumbered.hpp
@@ -165,7 +165,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ip_unnumbered_cmds.cpp b/extras/deprecated/vom/vom/ip_unnumbered_cmds.cpp
index 227a1509e7e..fd5020537c0 100644
--- a/extras/vom/vom/ip_unnumbered_cmds.cpp
+++ b/extras/deprecated/vom/vom/ip_unnumbered_cmds.cpp
@@ -134,7 +134,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ip_unnumbered_cmds.hpp b/extras/deprecated/vom/vom/ip_unnumbered_cmds.hpp
index 436b0c72130..7320122d643 100644
--- a/extras/vom/vom/ip_unnumbered_cmds.hpp
+++ b/extras/deprecated/vom/vom/ip_unnumbered_cmds.hpp
@@ -137,7 +137,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_binding.cpp b/extras/deprecated/vom/vom/l2_binding.cpp
index 37039a0b930..e6de3035658 100644
--- a/extras/vom/vom/l2_binding.cpp
+++ b/extras/deprecated/vom/vom/l2_binding.cpp
@@ -232,7 +232,7 @@ l2_binding::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_binding.hpp b/extras/deprecated/vom/vom/l2_binding.hpp
index de3608a2626..a8dfbe76f7d 100644
--- a/extras/vom/vom/l2_binding.hpp
+++ b/extras/deprecated/vom/vom/l2_binding.hpp
@@ -214,7 +214,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_binding_cmds.cpp b/extras/deprecated/vom/vom/l2_binding_cmds.cpp
index 70413adb411..6e7adac44d2 100644
--- a/extras/vom/vom/l2_binding_cmds.cpp
+++ b/extras/deprecated/vom/vom/l2_binding_cmds.cpp
@@ -125,7 +125,7 @@ unbind_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_binding_cmds.hpp b/extras/deprecated/vom/vom/l2_binding_cmds.hpp
index 45f90b0787f..625f6483c0e 100644
--- a/extras/vom/vom/l2_binding_cmds.hpp
+++ b/extras/deprecated/vom/vom/l2_binding_cmds.hpp
@@ -121,7 +121,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_emulation.cpp b/extras/deprecated/vom/vom/l2_emulation.cpp
index 7bc7ed657d4..b665528b8ae 100644
--- a/extras/vom/vom/l2_emulation.cpp
+++ b/extras/deprecated/vom/vom/l2_emulation.cpp
@@ -160,7 +160,7 @@ l2_emulation::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_emulation.hpp b/extras/deprecated/vom/vom/l2_emulation.hpp
index faf4df8b0a7..3a929a99daf 100644
--- a/extras/vom/vom/l2_emulation.hpp
+++ b/extras/deprecated/vom/vom/l2_emulation.hpp
@@ -170,7 +170,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_emulation_cmds.cpp b/extras/deprecated/vom/vom/l2_emulation_cmds.cpp
index fac764a1c66..4083b3962ae 100644
--- a/extras/vom/vom/l2_emulation_cmds.cpp
+++ b/extras/deprecated/vom/vom/l2_emulation_cmds.cpp
@@ -97,7 +97,7 @@ disable_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_emulation_cmds.hpp b/extras/deprecated/vom/vom/l2_emulation_cmds.hpp
index aab4af51faa..b4f10f80f28 100644
--- a/extras/vom/vom/l2_emulation_cmds.hpp
+++ b/extras/deprecated/vom/vom/l2_emulation_cmds.hpp
@@ -92,7 +92,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_vtr.cpp b/extras/deprecated/vom/vom/l2_vtr.cpp
index 61505f68210..40c6ce4d894 100644
--- a/extras/vom/vom/l2_vtr.cpp
+++ b/extras/deprecated/vom/vom/l2_vtr.cpp
@@ -40,7 +40,7 @@ option_t::option_t(int v, const std::string s)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_vtr.hpp b/extras/deprecated/vom/vom/l2_vtr.hpp
index 688e87a8108..7f9840b970e 100644
--- a/extras/vom/vom/l2_vtr.hpp
+++ b/extras/deprecated/vom/vom/l2_vtr.hpp
@@ -43,7 +43,7 @@ private:
 }; // namesapce VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_vtr_cmds.cpp b/extras/deprecated/vom/vom/l2_vtr_cmds.cpp
index 1c76cf0e490..24b49ddbed0 100644
--- a/extras/vom/vom/l2_vtr_cmds.cpp
+++ b/extras/deprecated/vom/vom/l2_vtr_cmds.cpp
@@ -65,7 +65,7 @@ set_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_vtr_cmds.hpp b/extras/deprecated/vom/vom/l2_vtr_cmds.hpp
index 14477fd43f4..b30fdc88b7d 100644
--- a/extras/vom/vom/l2_vtr_cmds.hpp
+++ b/extras/deprecated/vom/vom/l2_vtr_cmds.hpp
@@ -66,7 +66,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_xconnect.cpp b/extras/deprecated/vom/vom/l2_xconnect.cpp
index f54da6c8abf..91065ab3c08 100644
--- a/extras/vom/vom/l2_xconnect.cpp
+++ b/extras/deprecated/vom/vom/l2_xconnect.cpp
@@ -229,7 +229,7 @@ l2_xconnect::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_xconnect.hpp b/extras/deprecated/vom/vom/l2_xconnect.hpp
index 89acc1c32e6..6fddf1507e1 100644
--- a/extras/vom/vom/l2_xconnect.hpp
+++ b/extras/deprecated/vom/vom/l2_xconnect.hpp
@@ -200,7 +200,7 @@ std::ostream& operator<<(std::ostream& os, const l2_xconnect::key_t& key);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_xconnect_cmds.cpp b/extras/deprecated/vom/vom/l2_xconnect_cmds.cpp
index 37eca9ecfc8..426a3dd2554 100644
--- a/extras/vom/vom/l2_xconnect_cmds.cpp
+++ b/extras/deprecated/vom/vom/l2_xconnect_cmds.cpp
@@ -136,7 +136,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_xconnect_cmds.hpp b/extras/deprecated/vom/vom/l2_xconnect_cmds.hpp
index db0e721453f..9d2dddd8fdd 100644
--- a/extras/vom/vom/l2_xconnect_cmds.hpp
+++ b/extras/deprecated/vom/vom/l2_xconnect_cmds.hpp
@@ -137,7 +137,7 @@ public:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l3_binding.cpp b/extras/deprecated/vom/vom/l3_binding.cpp
index 6b8d36209a7..f34859fbaf9 100644
--- a/extras/vom/vom/l3_binding.cpp
+++ b/extras/deprecated/vom/vom/l3_binding.cpp
@@ -192,7 +192,7 @@ l3_binding::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l3_binding.hpp b/extras/deprecated/vom/vom/l3_binding.hpp
index a2a46263dbd..6babe90c6a9 100644
--- a/extras/vom/vom/l3_binding.hpp
+++ b/extras/deprecated/vom/vom/l3_binding.hpp
@@ -199,7 +199,7 @@ std::ostream& operator<<(std::ostream& os, const l3_binding::key_t& key);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l3_binding_cmds.cpp b/extras/deprecated/vom/vom/l3_binding_cmds.cpp
index 15122bc9dd6..d3510c85400 100644
--- a/extras/vom/vom/l3_binding_cmds.cpp
+++ b/extras/deprecated/vom/vom/l3_binding_cmds.cpp
@@ -152,7 +152,7 @@ dump_v4_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l3_binding_cmds.hpp b/extras/deprecated/vom/vom/l3_binding_cmds.hpp
index b7a30f8865c..42d5c0bf8c8 100644
--- a/extras/vom/vom/l3_binding_cmds.hpp
+++ b/extras/deprecated/vom/vom/l3_binding_cmds.hpp
@@ -148,7 +148,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/lldp_binding.cpp b/extras/deprecated/vom/vom/lldp_binding.cpp
index 69b30c2ce94..e2067a045ad 100644
--- a/extras/vom/vom/lldp_binding.cpp
+++ b/extras/deprecated/vom/vom/lldp_binding.cpp
@@ -155,7 +155,7 @@ lldp_binding::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/lldp_binding.hpp b/extras/deprecated/vom/vom/lldp_binding.hpp
index 0c5610013ac..d93425f88ba 100644
--- a/extras/vom/vom/lldp_binding.hpp
+++ b/extras/deprecated/vom/vom/lldp_binding.hpp
@@ -172,7 +172,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/lldp_binding_cmds.cpp b/extras/deprecated/vom/vom/lldp_binding_cmds.cpp
index 02ed8cd450a..05b6a663825 100644
--- a/extras/vom/vom/lldp_binding_cmds.cpp
+++ b/extras/deprecated/vom/vom/lldp_binding_cmds.cpp
@@ -102,7 +102,7 @@ unbind_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/lldp_binding_cmds.hpp b/extras/deprecated/vom/vom/lldp_binding_cmds.hpp
index 77ba8ee90e7..d880b2cf8a6 100644
--- a/extras/vom/vom/lldp_binding_cmds.hpp
+++ b/extras/deprecated/vom/vom/lldp_binding_cmds.hpp
@@ -100,7 +100,7 @@ private:
 }; // naemspace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/lldp_global.cpp b/extras/deprecated/vom/vom/lldp_global.cpp
index 6bae7993651..11ab54b1605 100644
--- a/extras/vom/vom/lldp_global.cpp
+++ b/extras/deprecated/vom/vom/lldp_global.cpp
@@ -154,7 +154,7 @@ lldp_global::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/lldp_global.hpp b/extras/deprecated/vom/vom/lldp_global.hpp
index f545a2828cc..b0e86bfdf1d 100644
--- a/extras/vom/vom/lldp_global.hpp
+++ b/extras/deprecated/vom/vom/lldp_global.hpp
@@ -173,7 +173,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/lldp_global_cmds.cpp b/extras/deprecated/vom/vom/lldp_global_cmds.cpp
index 32931a621f0..5aeb941e9b2 100644
--- a/extras/vom/vom/lldp_global_cmds.cpp
+++ b/extras/deprecated/vom/vom/lldp_global_cmds.cpp
@@ -66,7 +66,7 @@ config_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/lldp_global_cmds.hpp b/extras/deprecated/vom/vom/lldp_global_cmds.hpp
index 732c700062f..4ce989689f6 100644
--- a/extras/vom/vom/lldp_global_cmds.hpp
+++ b/extras/deprecated/vom/vom/lldp_global_cmds.hpp
@@ -70,7 +70,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/logger.cpp b/extras/deprecated/vom/vom/logger.cpp
index 80f2d92c603..69de2f8f58e 100644
--- a/extras/vom/vom/logger.cpp
+++ b/extras/deprecated/vom/vom/logger.cpp
@@ -162,7 +162,7 @@ cout_handler::handle_message(const std::string& file,
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/logger.hpp b/extras/deprecated/vom/vom/logger.hpp
index 6d2e3dd82f6..9791d15624d 100644
--- a/extras/vom/vom/logger.hpp
+++ b/extras/deprecated/vom/vom/logger.hpp
@@ -184,7 +184,7 @@ log_t& logger();
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/mroute_cmds.cpp b/extras/deprecated/vom/vom/mroute_cmds.cpp
index 2f4dd6e1a86..e18e97d9d63 100644
--- a/extras/vom/vom/mroute_cmds.cpp
+++ b/extras/deprecated/vom/vom/mroute_cmds.cpp
@@ -166,7 +166,7 @@ dump_cmd::to_string() const
 } // namespace mroute
 } // namespace vom
   /*
-   * fd.io coding-style-patch-verification: ON
+   * fd.io coding-style-patch-verification: OFF
    *
    * Local Variables:
    * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/mroute_cmds.hpp b/extras/deprecated/vom/vom/mroute_cmds.hpp
index 3392d4a3b2b..c9b8ad6afb9 100644
--- a/extras/vom/vom/mroute_cmds.hpp
+++ b/extras/deprecated/vom/vom/mroute_cmds.hpp
@@ -139,7 +139,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/nat_binding.cpp b/extras/deprecated/vom/vom/nat_binding.cpp
index a3fdee77be4..dda7e7802e7 100644
--- a/extras/vom/vom/nat_binding.cpp
+++ b/extras/deprecated/vom/vom/nat_binding.cpp
@@ -288,7 +288,7 @@ nat_binding::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/nat_binding.hpp b/extras/deprecated/vom/vom/nat_binding.hpp
index a99d23af601..49557e5cda0 100644
--- a/extras/vom/vom/nat_binding.hpp
+++ b/extras/deprecated/vom/vom/nat_binding.hpp
@@ -222,7 +222,7 @@ std::ostream& operator<<(std::ostream& os, const nat_binding::key_t& key);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/nat_binding_cmds.cpp b/extras/deprecated/vom/vom/nat_binding_cmds.cpp
index 4e69a67f2af..2d2973ffa36 100644
--- a/extras/vom/vom/nat_binding_cmds.cpp
+++ b/extras/deprecated/vom/vom/nat_binding_cmds.cpp
@@ -367,7 +367,7 @@ dump_input_66_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/nat_binding_cmds.hpp b/extras/deprecated/vom/vom/nat_binding_cmds.hpp
index 40507e0374b..d64f474b228 100644
--- a/extras/vom/vom/nat_binding_cmds.hpp
+++ b/extras/deprecated/vom/vom/nat_binding_cmds.hpp
@@ -370,7 +370,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/nat_static.cpp b/extras/deprecated/vom/vom/nat_static.cpp
index bf8573d333e..10660dc45e2 100644
--- a/extras/vom/vom/nat_static.cpp
+++ b/extras/deprecated/vom/vom/nat_static.cpp
@@ -228,7 +228,7 @@ nat_static::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/nat_static.hpp b/extras/deprecated/vom/vom/nat_static.hpp
index 2dcadb3c904..b313667a82e 100644
--- a/extras/vom/vom/nat_static.hpp
+++ b/extras/deprecated/vom/vom/nat_static.hpp
@@ -185,7 +185,7 @@ std::ostream& operator<<(std::ostream& os, const nat_static::key_t& key);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/nat_static_cmds.cpp b/extras/deprecated/vom/vom/nat_static_cmds.cpp
index 7e2b05f7f1e..296b226a650 100644
--- a/extras/vom/vom/nat_static_cmds.cpp
+++ b/extras/deprecated/vom/vom/nat_static_cmds.cpp
@@ -263,7 +263,7 @@ dump_66_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/nat_static_cmds.hpp b/extras/deprecated/vom/vom/nat_static_cmds.hpp
index 2213ef5ae47..281c05fa0d0 100644
--- a/extras/vom/vom/nat_static_cmds.hpp
+++ b/extras/deprecated/vom/vom/nat_static_cmds.hpp
@@ -239,7 +239,7 @@ private:
 }; // namespace vom
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/neighbour.cpp b/extras/deprecated/vom/vom/neighbour.cpp
index a97892d7cdb..01653f6ced1 100644
--- a/extras/vom/vom/neighbour.cpp
+++ b/extras/deprecated/vom/vom/neighbour.cpp
@@ -224,7 +224,7 @@ neighbour::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/neighbour.hpp b/extras/deprecated/vom/vom/neighbour.hpp
index 5b1f9c12847..396b05e076b 100644
--- a/extras/vom/vom/neighbour.hpp
+++ b/extras/deprecated/vom/vom/neighbour.hpp
@@ -213,7 +213,7 @@ std::ostream& operator<<(std::ostream& os, const neighbour::key_t& key);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/neighbour_cmds.cpp b/extras/deprecated/vom/vom/neighbour_cmds.cpp
index d507bb74ea8..4bf4f320cae 100644
--- a/extras/vom/vom/neighbour_cmds.cpp
+++ b/extras/deprecated/vom/vom/neighbour_cmds.cpp
@@ -164,7 +164,7 @@ dump_cmd::to_string() const
 } // namespace vom
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/neighbour_cmds.hpp b/extras/deprecated/vom/vom/neighbour_cmds.hpp
index 024a021ce8d..024a021ce8d 100644
--- a/extras/vom/vom/neighbour_cmds.hpp
+++ b/extras/deprecated/vom/vom/neighbour_cmds.hpp
diff --git a/extras/vom/vom/object_base.cpp b/extras/deprecated/vom/vom/object_base.cpp
index 6ab4ee5cadc..ea39270b0f6 100644
--- a/extras/vom/vom/object_base.cpp
+++ b/extras/deprecated/vom/vom/object_base.cpp
@@ -62,7 +62,7 @@ operator<<(std::ostream& os, const object_base& o)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/object_base.hpp b/extras/deprecated/vom/vom/object_base.hpp
index 2edafc58466..fb49d738eaf 100644
--- a/extras/vom/vom/object_base.hpp
+++ b/extras/deprecated/vom/vom/object_base.hpp
@@ -136,7 +136,7 @@ std::ostream& operator<<(std::ostream& os, const object_base& o);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/om.cpp b/extras/deprecated/vom/vom/om.cpp
index edfc046e740..b522168fcd6 100644
--- a/extras/vom/vom/om.cpp
+++ b/extras/deprecated/vom/vom/om.cpp
@@ -148,7 +148,7 @@ OM::mark_n_sweep::~mark_n_sweep()
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/om.hpp b/extras/deprecated/vom/vom/om.hpp
index e68d5ea0017..0990393df8c 100644
--- a/extras/vom/vom/om.hpp
+++ b/extras/deprecated/vom/vom/om.hpp
@@ -346,7 +346,7 @@ private:
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/pipe.cpp b/extras/deprecated/vom/vom/pipe.cpp
index 9e10aeb4ea6..5f6a66d6a3e 100644
--- a/extras/vom/vom/pipe.cpp
+++ b/extras/deprecated/vom/vom/pipe.cpp
@@ -203,7 +203,7 @@ pipe::event_handler::show(std::ostream& os)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/pipe.hpp b/extras/deprecated/vom/vom/pipe.hpp
index 7da3a1f162a..4468208a1c5 100644
--- a/extras/vom/vom/pipe.hpp
+++ b/extras/deprecated/vom/vom/pipe.hpp
@@ -161,7 +161,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/pipe_cmds.cpp b/extras/deprecated/vom/vom/pipe_cmds.cpp
index b01ec2f92fc..c866b048ddf 100644
--- a/extras/vom/vom/pipe_cmds.cpp
+++ b/extras/deprecated/vom/vom/pipe_cmds.cpp
@@ -144,7 +144,7 @@ dump_cmd::to_string() const
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/pipe_cmds.hpp b/extras/deprecated/vom/vom/pipe_cmds.hpp
index 8c26fd60fd3..b3921393e6a 100644
--- a/extras/vom/vom/pipe_cmds.hpp
+++ b/extras/deprecated/vom/vom/pipe_cmds.hpp
@@ -121,7 +121,7 @@ public:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/prefix.cpp b/extras/deprecated/vom/vom/prefix.cpp
index 45cb6df54c9..b9910d3f2fc 100644
--- a/extras/vom/vom/prefix.cpp
+++ b/extras/deprecated/vom/vom/prefix.cpp
@@ -584,7 +584,7 @@ route::mprefix_t::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/prefix.hpp b/extras/deprecated/vom/vom/prefix.hpp
index fada1d3e274..a6496326fc4 100644
--- a/extras/vom/vom/prefix.hpp
+++ b/extras/deprecated/vom/vom/prefix.hpp
@@ -404,7 +404,7 @@ boost::asio::ip::address from_bytes(uint8_t is_ip6, const uint8_t* array);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_map.cpp b/extras/deprecated/vom/vom/qos_map.cpp
index 9e382ec2f55..1f0dcc5a057 100644
--- a/extras/vom/vom/qos_map.cpp
+++ b/extras/deprecated/vom/vom/qos_map.cpp
@@ -182,7 +182,7 @@ map::event_handler::show(std::ostream& os)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_map.hpp b/extras/deprecated/vom/vom/qos_map.hpp
index 8d235c4994b..04a14451cd8 100644
--- a/extras/vom/vom/qos_map.hpp
+++ b/extras/deprecated/vom/vom/qos_map.hpp
@@ -172,7 +172,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_map_cmds.cpp b/extras/deprecated/vom/vom/qos_map_cmds.cpp
index d9054a89fb2..8e1f7f8c015 100644
--- a/extras/vom/vom/qos_map_cmds.cpp
+++ b/extras/deprecated/vom/vom/qos_map_cmds.cpp
@@ -134,7 +134,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_map_cmds.hpp b/extras/deprecated/vom/vom/qos_map_cmds.hpp
index 8321894d532..937bf7da209 100644
--- a/extras/vom/vom/qos_map_cmds.hpp
+++ b/extras/deprecated/vom/vom/qos_map_cmds.hpp
@@ -123,7 +123,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_mark.cpp b/extras/deprecated/vom/vom/qos_mark.cpp
index feb889380ff..33ebe40831e 100644
--- a/extras/vom/vom/qos_mark.cpp
+++ b/extras/deprecated/vom/vom/qos_mark.cpp
@@ -179,7 +179,7 @@ mark::event_handler::show(std::ostream& os)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_mark.hpp b/extras/deprecated/vom/vom/qos_mark.hpp
index 63fec8456fe..2ba5a0d9df6 100644
--- a/extras/vom/vom/qos_mark.hpp
+++ b/extras/deprecated/vom/vom/qos_mark.hpp
@@ -169,7 +169,7 @@ std::ostream& operator<<(std::ostream& os, const QoS::mark::key_t& key);
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_mark_cmds.cpp b/extras/deprecated/vom/vom/qos_mark_cmds.cpp
index 50220b33325..1dd4cc177c5 100644
--- a/extras/vom/vom/qos_mark_cmds.cpp
+++ b/extras/deprecated/vom/vom/qos_mark_cmds.cpp
@@ -135,7 +135,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_mark_cmds.hpp b/extras/deprecated/vom/vom/qos_mark_cmds.hpp
index 976fddc4ea7..8e2882d9ab4 100644
--- a/extras/vom/vom/qos_mark_cmds.hpp
+++ b/extras/deprecated/vom/vom/qos_mark_cmds.hpp
@@ -128,7 +128,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_record.cpp b/extras/deprecated/vom/vom/qos_record.cpp
index d56295ca1c4..3c8ea750145 100644
--- a/extras/vom/vom/qos_record.cpp
+++ b/extras/deprecated/vom/vom/qos_record.cpp
@@ -182,7 +182,7 @@ operator<<(std::ostream& os, const QoS::record::key_t& key)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_record.hpp b/extras/deprecated/vom/vom/qos_record.hpp
index d74413f9293..396b4313643 100644
--- a/extras/vom/vom/qos_record.hpp
+++ b/extras/deprecated/vom/vom/qos_record.hpp
@@ -163,7 +163,7 @@ std::ostream& operator<<(std::ostream& os, const QoS::record::key_t& key);
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_record_cmds.cpp b/extras/deprecated/vom/vom/qos_record_cmds.cpp
index a425187d63c..ec5580ee238 100644
--- a/extras/vom/vom/qos_record_cmds.cpp
+++ b/extras/deprecated/vom/vom/qos_record_cmds.cpp
@@ -131,7 +131,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_record_cmds.hpp b/extras/deprecated/vom/vom/qos_record_cmds.hpp
index bf98e5da824..1cffc11eead 100644
--- a/extras/vom/vom/qos_record_cmds.hpp
+++ b/extras/deprecated/vom/vom/qos_record_cmds.hpp
@@ -126,7 +126,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_store.cpp b/extras/deprecated/vom/vom/qos_store.cpp
index 08c2586557d..a55c14b5ecd 100644
--- a/extras/vom/vom/qos_store.cpp
+++ b/extras/deprecated/vom/vom/qos_store.cpp
@@ -178,7 +178,7 @@ store::event_handler::show(std::ostream& os)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_store.hpp b/extras/deprecated/vom/vom/qos_store.hpp
index b68831497ab..b2f6c67ce1c 100644
--- a/extras/vom/vom/qos_store.hpp
+++ b/extras/deprecated/vom/vom/qos_store.hpp
@@ -168,7 +168,7 @@ std::ostream& operator<<(std::ostream& os, const QoS::store::key_t& key);
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_store_cmds.cpp b/extras/deprecated/vom/vom/qos_store_cmds.cpp
index 2718c7a66e4..1d7d18981f1 100644
--- a/extras/vom/vom/qos_store_cmds.cpp
+++ b/extras/deprecated/vom/vom/qos_store_cmds.cpp
@@ -135,7 +135,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_store_cmds.hpp b/extras/deprecated/vom/vom/qos_store_cmds.hpp
index 35671088a72..29d95de9fb8 100644
--- a/extras/vom/vom/qos_store_cmds.hpp
+++ b/extras/deprecated/vom/vom/qos_store_cmds.hpp
@@ -130,7 +130,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_types.cpp b/extras/deprecated/vom/vom/qos_types.cpp
index 7d5d77482b0..6b43c2237e1 100644
--- a/extras/vom/vom/qos_types.cpp
+++ b/extras/deprecated/vom/vom/qos_types.cpp
@@ -31,7 +31,7 @@ source_t::source_t(int v, const std::string& s)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_types.hpp b/extras/deprecated/vom/vom/qos_types.hpp
index e3c6a169c60..4cdbc416a9f 100644
--- a/extras/vom/vom/qos_types.hpp
+++ b/extras/deprecated/vom/vom/qos_types.hpp
@@ -50,7 +50,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_types_api.cpp b/extras/deprecated/vom/vom/qos_types_api.cpp
index 27cbad7b9b0..6c16b4b1997 100644
--- a/extras/vom/vom/qos_types_api.cpp
+++ b/extras/deprecated/vom/vom/qos_types_api.cpp
@@ -48,7 +48,7 @@ to_api(const source_t& s)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_types_api.hpp b/extras/deprecated/vom/vom/qos_types_api.hpp
index 53cff0d2c69..e8ec9a2bfd3 100644
--- a/extras/vom/vom/qos_types_api.hpp
+++ b/extras/deprecated/vom/vom/qos_types_api.hpp
@@ -27,7 +27,7 @@ vapi_enum_qos_source to_api(const source_t& s);
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ra_config.cpp b/extras/deprecated/vom/vom/ra_config.cpp
index 67faae699c8..5b11449b192 100644
--- a/extras/vom/vom/ra_config.cpp
+++ b/extras/deprecated/vom/vom/ra_config.cpp
@@ -81,7 +81,7 @@ ra_config::to_string() const
 }
 }
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ra_config.hpp b/extras/deprecated/vom/vom/ra_config.hpp
index 81533162a39..f5b782a72d2 100644
--- a/extras/vom/vom/ra_config.hpp
+++ b/extras/deprecated/vom/vom/ra_config.hpp
@@ -135,7 +135,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ra_prefix.cpp b/extras/deprecated/vom/vom/ra_prefix.cpp
index fe3ad327f6d..2106879c0ba 100644
--- a/extras/vom/vom/ra_prefix.cpp
+++ b/extras/deprecated/vom/vom/ra_prefix.cpp
@@ -79,7 +79,7 @@ ra_prefix::prefix() const
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ra_prefix.hpp b/extras/deprecated/vom/vom/ra_prefix.hpp
index 8e0cf51c055..0be40c403b3 100644
--- a/extras/vom/vom/ra_prefix.hpp
+++ b/extras/deprecated/vom/vom/ra_prefix.hpp
@@ -124,7 +124,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route.cpp b/extras/deprecated/vom/vom/route.cpp
index b5b93455230..7f4497dfb2c 100644
--- a/extras/vom/vom/route.cpp
+++ b/extras/deprecated/vom/vom/route.cpp
@@ -695,7 +695,7 @@ operator<<(std::ostream& os, const mpath_list_t& key)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route.hpp b/extras/deprecated/vom/vom/route.hpp
index 8b68015f7ba..185bd0a04eb 100644
--- a/extras/vom/vom/route.hpp
+++ b/extras/deprecated/vom/vom/route.hpp
@@ -585,7 +585,7 @@ std::ostream& operator<<(std::ostream& os, const ip_mroute::key_t& key);
 }; // namesapce VPP
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route_api_types.cpp b/extras/deprecated/vom/vom/route_api_types.cpp
index b6ab6381b12..1c9519c4053 100644
--- a/extras/vom/vom/route_api_types.cpp
+++ b/extras/deprecated/vom/vom/route_api_types.cpp
@@ -182,7 +182,7 @@ from_api(vapi_enum_ip_dscp d)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route_api_types.hpp b/extras/deprecated/vom/vom/route_api_types.hpp
index e741a9d5acc..4576488fd43 100644
--- a/extras/vom/vom/route_api_types.hpp
+++ b/extras/deprecated/vom/vom/route_api_types.hpp
@@ -32,7 +32,7 @@ const ip_dscp_t& from_api(vapi_enum_ip_dscp d);
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route_cmds.cpp b/extras/deprecated/vom/vom/route_cmds.cpp
index 78676c225be..4055b8574df 100644
--- a/extras/vom/vom/route_cmds.cpp
+++ b/extras/deprecated/vom/vom/route_cmds.cpp
@@ -163,7 +163,7 @@ dump_cmd::to_string() const
 } // namespace vom
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route_cmds.hpp b/extras/deprecated/vom/vom/route_cmds.hpp
index 3c43208f120..abdba5fa476 100644
--- a/extras/vom/vom/route_cmds.hpp
+++ b/extras/deprecated/vom/vom/route_cmds.hpp
@@ -132,7 +132,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route_domain.cpp b/extras/deprecated/vom/vom/route_domain.cpp
index 16bf5f36c90..5df69f3e62e 100644
--- a/extras/vom/vom/route_domain.cpp
+++ b/extras/deprecated/vom/vom/route_domain.cpp
@@ -220,7 +220,7 @@ route_domain::event_handler::show(std::ostream& os)
 }; // namespace VOPM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route_domain.hpp b/extras/deprecated/vom/vom/route_domain.hpp
index 78db63bbe59..e3e389637d2 100644
--- a/extras/vom/vom/route_domain.hpp
+++ b/extras/deprecated/vom/vom/route_domain.hpp
@@ -190,7 +190,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route_domain_cmds.cpp b/extras/deprecated/vom/vom/route_domain_cmds.cpp
index 8f135e50ef5..217a2ebfbad 100644
--- a/extras/vom/vom/route_domain_cmds.cpp
+++ b/extras/deprecated/vom/vom/route_domain_cmds.cpp
@@ -132,7 +132,7 @@ dump_cmd::to_string() const
 } // namespace route_domain_cmds
 } // namespace VOM
   /*
-   * fd.io coding-style-patch-verification: ON
+   * fd.io coding-style-patch-verification: OFF
    *
    * Local Variables:
    * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route_domain_cmds.hpp b/extras/deprecated/vom/vom/route_domain_cmds.hpp
index 42546da91b4..d500de88063 100644
--- a/extras/vom/vom/route_domain_cmds.hpp
+++ b/extras/deprecated/vom/vom/route_domain_cmds.hpp
@@ -138,7 +138,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/rpc_cmd.hpp b/extras/deprecated/vom/vom/rpc_cmd.hpp
index ccb41abbd2d..cba540d9318 100644
--- a/extras/vom/vom/rpc_cmd.hpp
+++ b/extras/deprecated/vom/vom/rpc_cmd.hpp
@@ -141,7 +141,7 @@ protected:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/singular_db.hpp b/extras/deprecated/vom/vom/singular_db.hpp
index afca9a3509e..15ec9c5af59 100644
--- a/extras/vom/vom/singular_db.hpp
+++ b/extras/deprecated/vom/vom/singular_db.hpp
@@ -138,7 +138,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/singular_db_funcs.hpp b/extras/deprecated/vom/vom/singular_db_funcs.hpp
index dddc6e4c229..8d32fb58945 100644
--- a/extras/vom/vom/singular_db_funcs.hpp
+++ b/extras/deprecated/vom/vom/singular_db_funcs.hpp
@@ -42,7 +42,7 @@ db_dump(const DB& db, std::ostream& os)
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/srpc_cmd.hpp b/extras/deprecated/vom/vom/srpc_cmd.hpp
index da6064dafba..258abbf6e15 100644
--- a/extras/vom/vom/srpc_cmd.hpp
+++ b/extras/deprecated/vom/vom/srpc_cmd.hpp
@@ -64,7 +64,7 @@ public:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/stat_client.cpp b/extras/deprecated/vom/vom/stat_client.cpp
index 00751dd8d49..ca7bc6e2381 100644
--- a/extras/vom/vom/stat_client.cpp
+++ b/extras/deprecated/vom/vom/stat_client.cpp
@@ -239,7 +239,7 @@ stat_client::index_to_name(uint32_t index)
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/stat_client.hpp b/extras/deprecated/vom/vom/stat_client.hpp
index f1745c87b20..355b90caf7b 100644
--- a/extras/vom/vom/stat_client.hpp
+++ b/extras/deprecated/vom/vom/stat_client.hpp
@@ -199,7 +199,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/stat_reader.cpp b/extras/deprecated/vom/vom/stat_reader.cpp
index 50a25d2e0ba..34ac6053688 100644
--- a/extras/vom/vom/stat_reader.cpp
+++ b/extras/deprecated/vom/vom/stat_reader.cpp
@@ -131,7 +131,7 @@ stat_reader::read()
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/stat_reader.hpp b/extras/deprecated/vom/vom/stat_reader.hpp
index f90b2561602..3deeb439c7b 100644
--- a/extras/vom/vom/stat_reader.hpp
+++ b/extras/deprecated/vom/vom/stat_reader.hpp
@@ -94,7 +94,7 @@ private:
 };
 };
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/sub_interface.cpp b/extras/deprecated/vom/vom/sub_interface.cpp
index 42f75791968..3d6912cdcb0 100644
--- a/extras/vom/vom/sub_interface.cpp
+++ b/extras/deprecated/vom/vom/sub_interface.cpp
@@ -106,7 +106,7 @@ sub_interface::find(const key_t& k)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/sub_interface.hpp b/extras/deprecated/vom/vom/sub_interface.hpp
index 506133c900d..2a24b531ed6 100644
--- a/extras/vom/vom/sub_interface.hpp
+++ b/extras/deprecated/vom/vom/sub_interface.hpp
@@ -100,7 +100,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/sub_interface_cmds.cpp b/extras/deprecated/vom/vom/sub_interface_cmds.cpp
index 853a9b63698..d317303d938 100644
--- a/extras/vom/vom/sub_interface_cmds.cpp
+++ b/extras/deprecated/vom/vom/sub_interface_cmds.cpp
@@ -107,7 +107,7 @@ delete_cmd::to_string() const
 } // namespace sub_interface_cmds
 } // namespace VOM
   /*
-   * fd.io coding-style-patch-verification: ON
+   * fd.io coding-style-patch-verification: OFF
    *
    * Local Variables:
    * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/sub_interface_cmds.hpp b/extras/deprecated/vom/vom/sub_interface_cmds.hpp
index a21323200bb..40a2baac879 100644
--- a/extras/vom/vom/sub_interface_cmds.hpp
+++ b/extras/deprecated/vom/vom/sub_interface_cmds.hpp
@@ -98,7 +98,7 @@ public:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/tap_interface.cpp b/extras/deprecated/vom/vom/tap_interface.cpp
index 6555aeae5ee..a1f3f2bfc16 100644
--- a/extras/vom/vom/tap_interface.cpp
+++ b/extras/deprecated/vom/vom/tap_interface.cpp
@@ -118,7 +118,7 @@ tap_interface::event_handler::show(std::ostream& os)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/tap_interface.hpp b/extras/deprecated/vom/vom/tap_interface.hpp
index a29ad358b52..b167810bc42 100644
--- a/extras/vom/vom/tap_interface.hpp
+++ b/extras/deprecated/vom/vom/tap_interface.hpp
@@ -108,7 +108,7 @@ private:
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/tap_interface_cmds.cpp b/extras/deprecated/vom/vom/tap_interface_cmds.cpp
index 16bb065e016..b809c1384f9 100644
--- a/extras/vom/vom/tap_interface_cmds.cpp
+++ b/extras/deprecated/vom/vom/tap_interface_cmds.cpp
@@ -150,7 +150,7 @@ tapv2_dump_cmd::to_string() const
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/tap_interface_cmds.hpp b/extras/deprecated/vom/vom/tap_interface_cmds.hpp
index 386dafaa648..386dafaa648 100644
--- a/extras/vom/vom/tap_interface_cmds.hpp
+++ b/extras/deprecated/vom/vom/tap_interface_cmds.hpp
diff --git a/extras/vom/vom/test_stats.cpp b/extras/deprecated/vom/vom/test_stats.cpp
index 6235dd44e3f..6235dd44e3f 100644
--- a/extras/vom/vom/test_stats.cpp
+++ b/extras/deprecated/vom/vom/test_stats.cpp
diff --git a/extras/vom/vom/types.cpp b/extras/deprecated/vom/vom/types.cpp
index 0236df28417..fe86fc6ee2e 100644
--- a/extras/vom/vom/types.cpp
+++ b/extras/deprecated/vom/vom/types.cpp
@@ -334,7 +334,7 @@ operator<<(std::ostream& os, const counter_t& c)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/types.hpp b/extras/deprecated/vom/vom/types.hpp
index 383735b2756..d04528b0555 100644
--- a/extras/vom/vom/types.hpp
+++ b/extras/deprecated/vom/vom/types.hpp
@@ -416,7 +416,7 @@ std::ostream& operator<<(std::ostream& os, const counter_t& c);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/vxlan_gbp_tunnel_cmds.cpp b/extras/deprecated/vom/vom/vxlan_gbp_tunnel_cmds.cpp
index db4e7fc796c..ba9cdb039ac 100644
--- a/extras/vom/vom/vxlan_gbp_tunnel_cmds.cpp
+++ b/extras/deprecated/vom/vom/vxlan_gbp_tunnel_cmds.cpp
@@ -158,7 +158,7 @@ dump_cmd::to_string() const
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/vxlan_gbp_tunnel_cmds.hpp b/extras/deprecated/vom/vom/vxlan_gbp_tunnel_cmds.hpp
index 87bca98d302..cac2564b59c 100644
--- a/extras/vom/vom/vxlan_gbp_tunnel_cmds.hpp
+++ b/extras/deprecated/vom/vom/vxlan_gbp_tunnel_cmds.hpp
@@ -128,7 +128,7 @@ public:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/vxlan_tunnel.cpp b/extras/deprecated/vom/vom/vxlan_tunnel.cpp
index e37d160e92b..5da0c99987f 100644
--- a/extras/vom/vom/vxlan_tunnel.cpp
+++ b/extras/deprecated/vom/vom/vxlan_tunnel.cpp
@@ -351,7 +351,7 @@ vxlan_tunnel::event_handler::show(std::ostream& os)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/vxlan_tunnel.hpp b/extras/deprecated/vom/vom/vxlan_tunnel.hpp
index 4c46e75a700..aa5d210c13b 100644
--- a/extras/vom/vom/vxlan_tunnel.hpp
+++ b/extras/deprecated/vom/vom/vxlan_tunnel.hpp
@@ -259,7 +259,7 @@ std::ostream& operator<<(std::ostream& os, const vxlan_tunnel::endpoint_t& ep);
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/vxlan_tunnel_cmds.cpp b/extras/deprecated/vom/vom/vxlan_tunnel_cmds.cpp
index da71a99967e..4fd0315f814 100644
--- a/extras/vom/vom/vxlan_tunnel_cmds.cpp
+++ b/extras/deprecated/vom/vom/vxlan_tunnel_cmds.cpp
@@ -154,7 +154,7 @@ dump_cmd::to_string() const
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/vxlan_tunnel_cmds.hpp b/extras/deprecated/vom/vom/vxlan_tunnel_cmds.hpp
index 423fcdac950..9c321d101fc 100644
--- a/extras/vom/vom/vxlan_tunnel_cmds.hpp
+++ b/extras/deprecated/vom/vom/vxlan_tunnel_cmds.hpp
@@ -127,7 +127,7 @@ public:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index 1bb78af8cf7..f04eecc5c24 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -264,7 +264,7 @@ install -m 0644 $MODULES \
 #
 # devel
 #
-for dir in %{_mu_build_dir}/%{_vpp_install_dir}/{vom,vpp}/include/
+for dir in %{_mu_build_dir}/%{_vpp_install_dir}/vpp/include/
 do
 	for subdir in $(cd ${dir} && find . -type d -print)
 	do