HONEYCOMB-22: Remove karaf based distribution and wiring

Change-Id: I48aafb726de53b6ad3fb9b97c202f712dfa4a540
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>

26 files changed, 4 insertions, 1209 deletions

diff --git a/v3po/v3po2vpp/src/main/config/default-config.xml b/v3po/v3po2vpp/src/main/config/default-config.xml
deleted file mode 100644
index e17d7295c..000000000
--- a/v3po/v3po2vpp/src/main/config/default-config.xml
+++ /dev/null
@@ -1,346 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2016 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.
-  -->
-
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-
-<snapshot>
-    <required-capabilities>
-        <capability>urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg?module=vpp-jvpp-cfg&amp;revision=2016-04-06</capability>
-        <capability>urn:honeycomb:params:xml:ns:yang:v3po2vpp?module=v3po2vpp&amp;revision=2016-04-06</capability>
-        <capability>urn:honeycomb:params:xml:ns:yang:data:api?module=data-api&amp;revision=2016-04-11</capability>
-        <capability>urn:honeycomb:params:xml:ns:yang:vpp:util?module=vpp-util&amp;revision=2016-04-06</capability>
-        <capability>
-            urn:opendaylight:params:xml:ns:yang:controller:threadpool:impl:scheduled?module=threadpool-impl-scheduled&amp;revision=2013-12-01
-        </capability>
-        <capability>urn:honeycomb:params:xml:ns:yang:notification:impl?module=notification-impl&amp;revision=2016-06-01</capability>
-    </required-capabilities>
-    <configuration>
-
-        <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-            <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context-impl</type>
-                    <name>interface-context</name>
-                    <artificial-name-prefix>interface-</artificial-name-prefix>
-                </module>
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context-impl</type>
-                    <name>bridge-domain-context</name>
-                    <artificial-name-prefix>bridge-domain-</artificial-name-prefix>
-                </module>
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context-impl</type>
-                    <name>classify-table-context</name>
-                    <artificial-name-prefix>classify-table-</artificial-name-prefix>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:vpp-state-honeycomb-reader</type>
-                    <name>vpp-state-honeycomb-reader</name>
-                    <vpp-jvpp>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg">prefix:vpp-jvpp</type>
-                        <name>vpp-jvpp</name>
-                    </vpp-jvpp>
-                    <interface-context-vpp-state>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>interface-context</name>
-                    </interface-context-vpp-state>
-                    <bridge-domain-context-vpp-state>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>bridge-domain-context</name>
-                    </bridge-domain-context-vpp-state>
-                    <!-- Reuse netconf's scheduled executor for keepalives -->
-                    <keepalive-executor>
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:threadpool">
-                            prefix:threadpool
-                        </type>
-                        <name>global-netconf-ssh-scheduled-executor</name>
-                    </keepalive-executor>
-                </module>
-
-                <!-- Interface notification producer-->
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:vpp-interface-notification-producer</type>
-                    <name>vpp-interface-notification-producer</name>
-                    <vpp-jvpp>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg">prefix:vpp-jvpp</type>
-                        <name>vpp-jvpp</name>
-                    </vpp-jvpp>
-                    <interface-context>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>interface-context</name>
-                    </interface-context>
-                    <realtime-mapping-context>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-mapping-context</type>
-                        <name>realtime-mapping-context</name>
-                    </realtime-mapping-context>
-                </module>
-                <!-- Register to HC notification collector-->
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:notification:impl">prefix:honeycomb-notification-manager</type>
-                    <name>honeycomb-notification-manager</name>
-                    <notification-producers>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:notification:api">prefix:honeycomb-notification-producer</type>
-                        <name>vpp-interface-notification-producer</name>
-                    </notification-producers>
-                </module>
-                <!-- /Interface notification producer -->
-
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:interfaces-state-honeycomb-reader</type>
-                    <name>interfaces-state-honeycomb-reader</name>
-                    <vpp-jvpp>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg">prefix:vpp-jvpp</type>
-                        <name>vpp-jvpp</name>
-                    </vpp-jvpp>
-                    <interface-context-ifc-state>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>interface-context</name>
-                    </interface-context-ifc-state>
-                    <bridge-domain-context-ifc-state>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>bridge-domain-context</name>
-                    </bridge-domain-context-ifc-state>
-                    <classify-table-context>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>classify-table-context</name>
-                    </classify-table-context>
-                </module>
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:vpp-classifier-state-honeycomb-reader</type>
-                    <name>vpp-classifier-state-honeycomb-reader</name>
-                    <vpp-jvpp>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg">prefix:vpp-jvpp</type>
-                        <name>vpp-jvpp</name>
-                    </vpp-jvpp>
-                    <classify-table-context>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>classify-table-context</name>
-                    </classify-table-context>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:vpp-honeycomb-writer</type>
-                    <name>vpp-honeycomb-writer</name>
-                    <vpp-jvpp-writer>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg">prefix:vpp-jvpp</type>
-                        <name>vpp-jvpp</name>
-                    </vpp-jvpp-writer>
-                    <interface-context-vpp>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>interface-context</name>
-                    </interface-context-vpp>
-                    <bridge-domain-context-vpp>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>bridge-domain-context</name>
-                    </bridge-domain-context-vpp>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:interfaces-honeycomb-writer</type>
-                    <name>interfaces-honeycomb-writer</name>
-                    <vpp-jvpp-ifc>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg">prefix:vpp-jvpp</type>
-                        <name>vpp-jvpp</name>
-                    </vpp-jvpp-ifc>
-                    <interface-context>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>interface-context</name>
-                    </interface-context>
-                    <bridge-domain-context>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>bridge-domain-context</name>
-                    </bridge-domain-context>
-                    <classify-table-context>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>classify-table-context</name>
-                    </classify-table-context>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:vpp-classifier-honeycomb-writer</type>
-                    <name>vpp-classifier-honeycomb-writer</name>
-                    <vpp-jvpp>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg">prefix:vpp-jvpp</type>
-                        <name>vpp-jvpp</name>
-                    </vpp-jvpp>
-                    <classify-table-context>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>classify-table-context</name>
-                    </classify-table-context>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:utils">prefix:delegating-reader-registry</type>
-                    <name>read-registry</name>
-                    <reader-factory>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-reader-factory</type>
-                        <name>vpp-state-honeycomb-reader</name>
-                    </reader-factory>
-                    <reader-factory>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-reader-factory</type>
-                        <name>interfaces-state-honeycomb-reader</name>
-                    </reader-factory>
-                    <reader-factory>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-reader-factory</type>
-                        <name>vpp-classifier-state-honeycomb-reader</name>
-                    </reader-factory>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:utils">prefix:delegating-writer-registry</type>
-                    <name>write-registry</name>
-                    <writer-factory>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-writer-factory</type>
-                        <name>vpp-honeycomb-writer</name>
-                    </writer-factory>
-                    <writer-factory>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-writer-factory</type>
-                        <name>interfaces-honeycomb-writer</name>
-                    </writer-factory>
-                    <writer-factory>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-writer-factory</type>
-                        <name>vpp-classifier-honeycomb-writer</name>
-                    </writer-factory>
-                </module>
-
-                <!-- Config initializer for VPP subtree-->
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:vpp-cfg-initializer</type>
-                    <name>vpp-cfg-initializer</name>
-                    <binding-data-broker>
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">prefix:binding-async-data-broker</type>
-                        <name>cfg-init-binding-data-broker</name>
-                    </binding-data-broker>
-                </module>
-                <!-- Config initializer for Interfaces subtree-->
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:interfaces-cfg-initializer</type>
-                    <name>interfaces-cfg-initializer</name>
-                    <binding-data-broker>
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">prefix:binding-async-data-broker</type>
-                        <name>cfg-init-binding-data-broker</name>
-                    </binding-data-broker>
-                </module>
-                <!-- Config initializer for vpp-classifier subtree-->
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:vpp-classifier-cfg-initializer</type>
-                    <name>vpp-classifier-cfg-initializer</name>
-                    <binding-data-broker>
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">prefix:binding-async-data-broker</type>
-                        <name>cfg-init-binding-data-broker</name>
-                    </binding-data-broker>
-                </module>
-                <!-- Add vpp initializer to initializer registry -->
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:cfg-initializer-registry</type>
-                    <name>initializer-registry</name>
-                    <initializers>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:cfg-initializer</type>
-                        <name>vpp-cfg-initializer</name>
-                    </initializers>
-                    <initializers>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:cfg-initializer</type>
-                        <name>interfaces-cfg-initializer</name>
-                    </initializers>
-                    <initializers>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:cfg-initializer</type>
-                        <name>vpp-classifier-cfg-initializer</name>
-                    </initializers>
-                </module>
-            </modules>
-
-            <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <service>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-reader-factory</type>
-                    <instance>
-                        <name>vpp-state-honeycomb-reader</name>
-                        <provider>/modules/module[type='vpp-state-honeycomb-reader'][name='vpp-state-honeycomb-reader']
-                        </provider>
-                    </instance>
-                    <instance>
-                        <name>interfaces-state-honeycomb-reader</name>
-                        <provider>/modules/module[type='interfaces-state-honeycomb-reader'][name='interfaces-state-honeycomb-reader']</provider>
-                    </instance>
-                    <instance>
-                        <name>vpp-classifier-state-honeycomb-reader</name>
-                        <provider>/modules/module[type='vpp-classifier-state-honeycomb-reader'][name='vpp-classifier-state-honeycomb-reader']</provider>
-                    </instance>
-                </service>
-                <service>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:notification:api">prefix:honeycomb-notification-producer</type>
-                    <instance>
-                        <name>vpp-interface-notification-producer</name>
-                        <provider>/modules/module[type='vpp-interface-notification-producer'][name='vpp-interface-notification-producer']</provider>
-                    </instance>
-                </service>
-                <service>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                    <instance>
-                        <name>interface-context</name>
-                        <provider>/modules/module[type='naming-context-impl'][name='interface-context']</provider>
-                    </instance>
-                    <instance>
-                        <name>bridge-domain-context</name>
-                        <provider>/modules/module[type='naming-context-impl'][name='bridge-domain-context']</provider>
-                    </instance>
-                    <instance>
-                        <name>classify-table-context</name>
-                        <provider>/modules/module[type='naming-context-impl'][name='classify-table-context']</provider>
-                    </instance>
-                </service>
-                <service>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-writer-factory</type>
-                    <instance>
-                        <name>vpp-honeycomb-writer</name>
-                        <provider>/modules/module[type='vpp-honeycomb-writer'][name='vpp-honeycomb-writer']
-                        </provider>
-                    </instance>
-                    <instance>
-                        <name>interfaces-honeycomb-writer</name>
-                        <provider>/modules/module[type='interfaces-honeycomb-writer'][name='interfaces-honeycomb-writer']
-                        </provider>
-                    </instance>
-                    <instance>
-                        <name>vpp-classifier-honeycomb-writer</name>
-                        <provider>/modules/module[type='vpp-classifier-honeycomb-writer'][name='vpp-classifier-honeycomb-writer']
-                        </provider>
-                    </instance>
-                </service>
-
-                <service>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:cfg-initializer</type>
-                    <instance>
-                        <name>vpp-cfg-initializer</name>
-                        <provider>/modules/module[type='vpp-cfg-initializer'][name='vpp-cfg-initializer']
-                        </provider>
-                    </instance>
-                    <instance>
-                        <name>interfaces-cfg-initializer</name>
-                        <provider>/modules/module[type='interfaces-cfg-initializer'][name='interfaces-cfg-initializer']
-                        </provider>
-                    </instance>
-                    <instance>
-                        <name>vpp-classifier-cfg-initializer</name>
-                        <provider>/modules/module[type='vpp-classifier-cfg-initializer'][name='vpp-classifier-cfg-initializer']
-                        </provider>
-                    </instance>
-                </service>
-            </services>
-        </data>
-    </configuration>
-</snapshot>
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/Readme.adoc b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/Readme.adoc
index 57800d22c..57800d22c 100644
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/Readme.adoc
+++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/Readme.adoc
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/VppClassifierHoneycombWriterFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/VppClassifierHoneycombWriterFactory.java
index 7c63076d5..98cb32ee8 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/VppClassifierHoneycombWriterFactory.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/VppClassifierHoneycombWriterFactory.java
@@ -36,9 +36,10 @@ import org.openvpp.jvpp.future.FutureJVpp;
 public final class VppClassifierHoneycombWriterFactory implements WriterFactory, AutoCloseable {
 
     public static final InstanceIdentifier<ClassifyTable> CLASSIFY_TABLE_ID =
-        InstanceIdentifier.create(VppClassifier.class).child(ClassifyTable.class);
+            InstanceIdentifier.create(VppClassifier.class).child(ClassifyTable.class);
+
     public static final InstanceIdentifier<ClassifySession> CLASSIFY_SESSION_ID =
-        CLASSIFY_TABLE_ID.child(ClassifySession.class);
+            CLASSIFY_TABLE_ID.child(ClassifySession.class);
 
     private final FutureJVpp jvpp;
     private final NamingContext classifyTableContext;
@@ -59,8 +60,7 @@ public final class VppClassifierHoneycombWriterFactory implements WriterFactory,
                 CLASSIFY_SESSION_ID);
         //  ClassifyTableSession
         registry.addBefore(
-                new GenericListWriter<>(
-                        CLASSIFY_SESSION_ID, new ClassifySessionWriter(jvpp, classifyTableContext)),
+                new GenericListWriter<>(CLASSIFY_SESSION_ID, new ClassifySessionWriter(jvpp, classifyTableContext)),
                 ACL_ID);
     }
 }
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/cfgattrs/V3poConfiguration.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/cfgattrs/V3poConfiguration.java
index afe486c46..9cf5b4d5d 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/cfgattrs/V3poConfiguration.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/cfgattrs/V3poConfiguration.java
@@ -17,12 +17,8 @@
 package io.fd.honeycomb.translate.v3po.cfgattrs;
 
 import net.jmob.guice.conf.core.BindConfig;
-import net.jmob.guice.conf.core.InjectConfig;
 import net.jmob.guice.conf.core.Syntax;
 
 @BindConfig(value = "v3po", syntax = Syntax.JSON)
 public class V3poConfiguration {
-
-    @InjectConfig("some")
-    String some;
 }
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesConfigurationInitializerModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesConfigurationInitializerModule.java
deleted file mode 100644
index 606e27832..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesConfigurationInitializerModule.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.initializers.InterfacesInitializer;
-
-public class InterfacesConfigurationInitializerModule extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractInterfacesConfigurationInitializerModule {
-    public InterfacesConfigurationInitializerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public InterfacesConfigurationInitializerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.InterfacesConfigurationInitializerModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new InterfacesInitializer(getBindingDataBrokerDependency());
-    }
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesConfigurationInitializerModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesConfigurationInitializerModuleFactory.java
deleted file mode 100644
index 726ab0689..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesConfigurationInitializerModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: interfaces-cfg-initializer
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Thu May 19 14:51:38 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class InterfacesConfigurationInitializerModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractInterfacesConfigurationInitializerModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesHoneycombWriterModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesHoneycombWriterModule.java
deleted file mode 100644
index e63392018..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesHoneycombWriterModule.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.InterfacesWriterFactory;
-
-public class InterfacesHoneycombWriterModule extends
-    org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractInterfacesHoneycombWriterModule {
-
-    // TODO split configuration and translation code into 2 or more bundles
-
-    public InterfacesHoneycombWriterModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                           org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public InterfacesHoneycombWriterModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                           org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-                                           org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.InterfacesHoneycombWriterModule oldModule,
-                                           java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new InterfacesWriterFactory(getVppJvppIfcDependency(),
-            getBridgeDomainContextDependency(),
-            getInterfaceContextDependency(),
-            getClassifyTableContextDependency());
-    }
-
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesHoneycombWriterModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesHoneycombWriterModuleFactory.java
deleted file mode 100644
index 9332d3017..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesHoneycombWriterModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: interfaces-honeycomb-writer
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Fri Apr 08 13:28:05 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class InterfacesHoneycombWriterModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractInterfacesHoneycombWriterModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java
deleted file mode 100644
index 300f44159..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.InterfacesStateReaderFactory;
-
-public class InterfacesStateHoneycombReaderModule extends
-        org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractInterfacesStateHoneycombReaderModule {
-
-    public InterfacesStateHoneycombReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                                org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public InterfacesStateHoneycombReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                                org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-                                                org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.InterfacesStateHoneycombReaderModule oldModule,
-                                                java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new InterfacesStateReaderFactory(getVppJvppDependency(),
-                getInterfaceContextIfcStateDependency(),
-                getBridgeDomainContextIfcStateDependency(),
-                getClassifyTableContextDependency());
-    }
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModuleFactory.java
deleted file mode 100644
index f1c89f6ef..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: interfaces-state-honeycomb-reader
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Fri Apr 08 10:39:04 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class InterfacesStateHoneycombReaderModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractInterfacesStateHoneycombReaderModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierConfigurationInitializerModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierConfigurationInitializerModule.java
deleted file mode 100644
index f83e54644..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierConfigurationInitializerModule.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.initializers.VppClasifierInitializer;
-
-public class VppClassifierConfigurationInitializerModule extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppClassifierConfigurationInitializerModule {
-    public VppClassifierConfigurationInitializerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public VppClassifierConfigurationInitializerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.VppClassifierConfigurationInitializerModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new VppClasifierInitializer(getBindingDataBrokerDependency());
-    }
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierConfigurationInitializerModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierConfigurationInitializerModuleFactory.java
deleted file mode 100644
index 4e0e7c79e..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierConfigurationInitializerModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: vpp-classifier-cfg-initializer
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Thu Jul 14 16:02:24 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class VppClassifierConfigurationInitializerModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppClassifierConfigurationInitializerModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModule.java
deleted file mode 100644
index 172646c06..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModule.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.VppClassifierHoneycombWriterFactory;
-
-public class VppClassifierHoneycombWriterModule extends
-    org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppClassifierHoneycombWriterModule {
-
-
-    public VppClassifierHoneycombWriterModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                              org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public VppClassifierHoneycombWriterModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                              org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-                                              org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.VppClassifierHoneycombWriterModule oldModule,
-                                              java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new VppClassifierHoneycombWriterFactory(
-            getVppJvppDependency(),
-            getClassifyTableContextDependency());
-    }
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModuleFactory.java
deleted file mode 100644
index c4ff69061..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: vpp-classifier-honeycomb-writer
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Fri Jun 03 14:05:48 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class VppClassifierHoneycombWriterModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppClassifierHoneycombWriterModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierStateHoneycombReaderModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierStateHoneycombReaderModule.java
deleted file mode 100644
index 4169b784a..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierStateHoneycombReaderModule.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.VppClassifierReaderFactory;
-
-public class VppClassifierStateHoneycombReaderModule extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppClassifierStateHoneycombReaderModule {
-    public VppClassifierStateHoneycombReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public VppClassifierStateHoneycombReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.VppClassifierStateHoneycombReaderModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new VppClassifierReaderFactory(getVppJvppDependency(), getClassifyTableContextDependency());
-    }
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierStateHoneycombReaderModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierStateHoneycombReaderModuleFactory.java
deleted file mode 100644
index 2c1696214..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierStateHoneycombReaderModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: vpp-classifier-state-honeycomb-reader
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Tue Jul 19 13:04:20 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class VppClassifierStateHoneycombReaderModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppClassifierStateHoneycombReaderModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppConfigurationInitializerModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppConfigurationInitializerModule.java
deleted file mode 100644
index 266fc408c..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppConfigurationInitializerModule.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.initializers.VppInitializer;
-
-public class VppConfigurationInitializerModule extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppConfigurationInitializerModule {
-    public VppConfigurationInitializerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public VppConfigurationInitializerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.VppConfigurationInitializerModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new VppInitializer(getBindingDataBrokerDependency());
-    }
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppConfigurationInitializerModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppConfigurationInitializerModuleFactory.java
deleted file mode 100644
index 9ef01e843..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppConfigurationInitializerModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: vpp-cfg-initializer
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Thu May 19 14:51:38 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class VppConfigurationInitializerModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppConfigurationInitializerModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModule.java
deleted file mode 100644
index 63a8a1b67..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModule.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.VppHoneycombWriterFactory;
-
-public class VppHoneycombWriterModule extends
-    org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppHoneycombWriterModule {
-    public VppHoneycombWriterModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                    org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public VppHoneycombWriterModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                    org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-                                    org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.VppHoneycombWriterModule oldModule,
-                                    java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new VppHoneycombWriterFactory(
-                getVppJvppWriterDependency(),
-                getBridgeDomainContextVppDependency(),
-                getInterfaceContextVppDependency());
-    }
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModuleFactory.java
deleted file mode 100644
index c350286b8..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: vpp-honeycomb-writer
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Apr 06 11:40:09 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class VppHoneycombWriterModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppHoneycombWriterModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppInterfaceNotificationProducerModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppInterfaceNotificationProducerModule.java
deleted file mode 100644
index bb31760ad..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppInterfaceNotificationProducerModule.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.notification.InterfaceChangeNotificationProducer;
-
-public class VppInterfaceNotificationProducerModule extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppInterfaceNotificationProducerModule {
-
-    public VppInterfaceNotificationProducerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public VppInterfaceNotificationProducerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.VppInterfaceNotificationProducerModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new InterfaceChangeNotificationProducer(
-            getVppJvppDependency(),
-            getInterfaceContextDependency(),
-            getRealtimeMappingContextDependency());
-    }
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppInterfaceNotificationProducerModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppInterfaceNotificationProducerModuleFactory.java
deleted file mode 100644
index c80a0d364..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppInterfaceNotificationProducerModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: vpp-interface-notification-producer
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Jun 01 17:12:36 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class VppInterfaceNotificationProducerModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppInterfaceNotificationProducerModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppStateHoneycombReaderModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppStateHoneycombReaderModule.java
deleted file mode 100644
index df216c05a..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppStateHoneycombReaderModule.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.VppStateHoneycombReaderFactory;
-import java.lang.management.ManagementFactory;
-import javax.management.Attribute;
-import javax.management.InstanceNotFoundException;
-import javax.management.ObjectName;
-import org.opendaylight.controller.config.api.ConflictingVersionException;
-import org.opendaylight.controller.config.api.ValidationException;
-import org.opendaylight.controller.config.util.ConfigRegistryJMXClient;
-import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
-import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.jvpp.cfg.rev160406.VppJvppImplModule;
-import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.jvpp.cfg.rev160406.VppJvppImplModuleFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class VppStateHoneycombReaderModule extends
-    org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppStateHoneycombReaderModule {
-
-    private static final Logger LOG = LoggerFactory.getLogger(VppStateHoneycombReaderModule.class);
-
-    public VppStateHoneycombReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                         org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public VppStateHoneycombReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                         org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-                                         org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.VppStateHoneycombReaderModule oldModule,
-                                         java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new VppStateHoneycombReaderFactory(getVppJvppDependency(),
-                getInterfaceContextVppStateDependency(),
-                getBridgeDomainContextVppStateDependency(),
-                getKeepaliveExecutorDependency());
-    }
-
-    private static long reinitializationCounter;
-    private static final long reinitializationLimit = 10;
-
-    /**
-     * In case we detect connection issues with VPP, reinitialize JVpp.
-     */
-    private static void reinitializeJVpp(final long currentAttempt) {
-        // FIXME https://jira.fd.io/browse/HONEYCOMB-78 This code correctly re-initializes all the components
-        // starting with jvpp, but jvpp reconnect fails. Test in a JVpp test and then from C
-        LOG.info("Reinitializing JVpp, attempt: {}", currentAttempt);
-
-        final long nextAttempt = currentAttempt + 1;
-        if (nextAttempt - reinitializationCounter > reinitializationLimit) {
-            LOG.error("Too many JVpp reinitialization attempts. Unable to reinitialize JVpp in {} attempts. Giving up",
-                reinitializationLimit);
-            throw new IllegalStateException("Too many JVpp reinitialization attempts. Unable to reinitialize JVpp in "
-                + reinitializationLimit + " attempts. Giving up");
-        }
-
-        final ConfigRegistryJMXClient cfgRegistryClient =
-            ConfigRegistryJMXClient.createWithoutNotifications(ManagementFactory.getPlatformMBeanServer());
-
-        final ObjectName objectName = cfgRegistryClient.beginConfig();
-        final ConfigTransactionJMXClient txClient = cfgRegistryClient.getConfigTransactionClient(objectName);
-
-        final ObjectName jvppOn;
-        try {
-            final String attributeName = VppJvppImplModule.descriptionJmxAttribute.getAttributeName();
-            final String factoryName = VppJvppImplModuleFactory.NAME;
-            jvppOn = txClient.lookupConfigBean(factoryName, "vpp-jvpp");
-
-            // Change configuration attribute of JVpp to trigger full reinitialization here using config subsystem
-            // TODO improve this when switching from karaf in planned minimal distribution
-            txClient.setAttribute(jvppOn, attributeName, new Attribute(attributeName,
-                Long.toString(nextAttempt)));
-
-            txClient.validateConfig();
-            cfgRegistryClient.commitConfig(txClient.getObjectName());
-            LOG.info("JVpp reinitialized successfully");
-        } catch (InstanceNotFoundException | ValidationException e) {
-            LOG.error("Unable to reinitialize JVpp. Honeycomb will not work properly from now on.", e);
-            throw new IllegalStateException("Unable to find jvpp instance in config subsystem. Unable to reinitialize JVpp", e);
-        } catch (ConflictingVersionException e) {
-            LOG.debug("Conflict changes occurred, retrying", e);
-            // Just retry until there's no conflicting change in progress
-            reinitializeJVpp(nextAttempt);
-        }
-
-        reinitializationCounter = nextAttempt;
-    }
-
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppStateHoneycombReaderModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppStateHoneycombReaderModuleFactory.java
deleted file mode 100644
index e9e1c948b..000000000
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppStateHoneycombReaderModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: vpp-state-honeycomb-reader
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Apr 06 11:40:09 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class VppStateHoneycombReaderModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppStateHoneycombReaderModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/resources/honeycomb-minimal-resources/config/v3po.json b/v3po/v3po2vpp/src/main/resources/honeycomb-minimal-resources/config/v3po.json
index 290d631f0..7a73a41bf 100644
--- a/v3po/v3po2vpp/src/main/resources/honeycomb-minimal-resources/config/v3po.json
+++ b/v3po/v3po2vpp/src/main/resources/honeycomb-minimal-resources/config/v3po.json
@@ -1,3 +1,2 @@
 {
-  "some": "value"
 }
\ No newline at end of file
diff --git a/v3po/v3po2vpp/src/main/yang/v3po2vpp.yang b/v3po/v3po2vpp/src/main/yang/v3po2vpp.yang
deleted file mode 100644
index 1e821f5c1..000000000
--- a/v3po/v3po2vpp/src/main/yang/v3po2vpp.yang
+++ /dev/null
@@ -1,367 +0,0 @@
-module v3po2vpp {
-    yang-version 1;
-    namespace "urn:honeycomb:params:xml:ns:yang:v3po2vpp";
-    prefix "v3po2vpp";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import translate-api { prefix tapi; revision-date 2016-04-06; }
-    import vpp-jvpp-cfg { prefix vjvppc; revision-date 2016-04-06; }
-    import cfg-init { prefix init; revision-date "2016-04-07"; }
-    import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;}
-    import vpp-util { prefix vpp-u; revision-date 2016-04-06; }
-    import threadpool {prefix th;}
-    import notification-api { prefix hc-notif-a; revision-date 2016-06-01; }
-
-    description
-        "This module contains reads and writers for v3po yang model";
-
-    revision "2016-04-06" {
-        description
-            "Initial revision.";
-    }
-
-    identity vpp-state-honeycomb-reader {
-        base config:module-type;
-        config:provided-service tapi:honeycomb-reader-factory;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case vpp-state-honeycomb-reader {
-            when "/config:modules/config:module/config:type = 'vpp-state-honeycomb-reader'";
-
-            container vpp-jvpp {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vjvppc:vpp-jvpp;
-                    }
-                }
-            }
-
-            container interface-context-vpp-state {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-            container bridge-domain-context-vpp-state {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-            container keepalive-executor {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity th:scheduled-threadpool;
-                    }
-                }
-
-                description "Used to schedule keepalives";
-            }
-        }
-    }
-
-    identity vpp-interface-notification-producer {
-        base config:module-type;
-        config:provided-service hc-notif-a:honeycomb-notification-producer;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case vpp-interface-notification-producer {
-            when "/config:modules/config:module/config:type = 'vpp-interface-notification-producer'";
-
-            container vpp-jvpp {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vjvppc:vpp-jvpp;
-                    }
-                }
-            }
-
-            container interface-context {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-            container realtime-mapping-context {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity tapi:honeycomb-mapping-context;
-                    }
-                }
-            }
-        }
-    }
-
-    identity interfaces-state-honeycomb-reader {
-        base config:module-type;
-        config:provided-service tapi:honeycomb-reader-factory;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case interfaces-state-honeycomb-reader {
-            when "/config:modules/config:module/config:type = 'interfaces-state-honeycomb-reader'";
-
-            container vpp-jvpp {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vjvppc:vpp-jvpp;
-                    }
-                }
-            }
-
-            container interface-context-ifc-state {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-            container bridge-domain-context-ifc-state {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-            container classify-table-context {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-        }
-    }
-
-    identity vpp-classifier-state-honeycomb-reader {
-        base config:module-type;
-        config:provided-service tapi:honeycomb-reader-factory;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case vpp-classifier-state-honeycomb-reader {
-            when "/config:modules/config:module/config:type = 'vpp-classifier-state-honeycomb-reader'";
-
-            container vpp-jvpp {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vjvppc:vpp-jvpp;
-                    }
-                }
-            }
-
-            container classify-table-context {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-        }
-    }
-
-
-    identity vpp-honeycomb-writer {
-        base config:module-type;
-        config:provided-service tapi:honeycomb-writer-factory;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case vpp-honeycomb-writer {
-            when "/config:modules/config:module/config:type = 'vpp-honeycomb-writer'";
-
-            container vpp-jvpp-writer {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vjvppc:vpp-jvpp;
-                    }
-                }
-            }
-
-            container interface-context-vpp {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-            container bridge-domain-context-vpp {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-        }
-    }
-
-    identity interfaces-honeycomb-writer {
-        base config:module-type;
-        config:provided-service tapi:honeycomb-writer-factory;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case interfaces-honeycomb-writer {
-            when "/config:modules/config:module/config:type = 'interfaces-honeycomb-writer'";
-
-            container vpp-jvpp-ifc {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vjvppc:vpp-jvpp;
-                    }
-                }
-            }
-
-            container interface-context {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-            container bridge-domain-context {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-            container classify-table-context {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-        }
-    }
-
-    identity vpp-classifier-honeycomb-writer {
-        base config:module-type;
-        config:provided-service tapi:honeycomb-writer-factory;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case vpp-classifier-honeycomb-writer {
-            when "/config:modules/config:module/config:type = 'vpp-classifier-honeycomb-writer'";
-
-            container vpp-jvpp {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vjvppc:vpp-jvpp;
-                    }
-                }
-            }
-
-            container classify-table-context {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-        }
-    }
-
-    identity vpp-cfg-initializer {
-        base config:module-type;
-        config:provided-service init:cfg-initializer;
-        config:java-name-prefix VppConfigurationInitializer;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case vpp-cfg-initializer {
-            when "/config:modules/config:module/config:type = 'vpp-cfg-initializer'";
-
-             container binding-data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-async-data-broker;
-                    }
-                }
-             }
-        }
-    }
-
-    identity interfaces-cfg-initializer {
-        base config:module-type;
-        config:provided-service init:cfg-initializer;
-        config:java-name-prefix InterfacesConfigurationInitializer;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case interfaces-cfg-initializer {
-            when "/config:modules/config:module/config:type = 'interfaces-cfg-initializer'";
-
-             container binding-data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-async-data-broker;
-                    }
-                }
-             }
-        }
-    }
-
-    identity vpp-classifier-cfg-initializer {
-        base config:module-type;
-        config:provided-service init:cfg-initializer;
-        config:java-name-prefix VppClassifierConfigurationInitializer;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case vpp-classifier-cfg-initializer {
-            when "/config:modules/config:module/config:type = 'vpp-classifier-cfg-initializer'";
-
-             container binding-data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-async-data-broker;
-                    }
-                }
-             }
-        }
-    }
-
-
-}
\ No newline at end of file