From 0578156b721fa01c8c645b8f9625ecebdb6449e4 Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Wed, 27 Jul 2016 11:05:51 +0200
Subject: HONEYCOMB-130: Separate v3po plugin from HC infra

Creating folders:
- common/
- infra/
- v3po/
- vpp-common/

Change-Id: I2c39e1b17e39e7c0f0628f44aa5fe08563fa06e4
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 .../src/main/config/context-datatree-config.xml    | 171 -------
 v3po/impl/src/main/config/default-config.xml       | 254 -----------
 v3po/impl/src/main/config/initializer-config.xml   | 242 ----------
 v3po/impl/src/main/config/netconf-north-config.xml | 496 ---------------------
 .../impl/src/main/config/restconf-north-config.xml |  37 --
 5 files changed, 1200 deletions(-)
 delete mode 100644 v3po/impl/src/main/config/context-datatree-config.xml
 delete mode 100644 v3po/impl/src/main/config/default-config.xml
 delete mode 100644 v3po/impl/src/main/config/initializer-config.xml
 delete mode 100644 v3po/impl/src/main/config/netconf-north-config.xml
 delete mode 100644 v3po/impl/src/main/config/restconf-north-config.xml

(limited to 'v3po/impl/src/main/config')

diff --git a/v3po/impl/src/main/config/context-datatree-config.xml b/v3po/impl/src/main/config/context-datatree-config.xml
deleted file mode 100644
index 2c17de15e..000000000
--- a/v3po/impl/src/main/config/context-datatree-config.xml
+++ /dev/null
@@ -1,171 +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:opendaylight:params:xml:ns:yang:v3po:impl?module=v3po-impl&amp;revision=2014-12-10</capability>
-      <capability>urn:honeycomb:params:xml:ns:yang:translate:utils?module=translate-utils&amp;revision=2016-04-06</capability>
-      <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:vpp:data:init?module=vpp-cfg-init&amp;revision=2016-04-07</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:data:impl?module=data-impl&amp;revision=2016-04-11</capability>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</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">
-
-        <!-- TODO provide information stored in context data-tree to users as part of operational data -->
-        <!-- In-memory data tree for context(special data required for YANG <-> VPP mapping) data -->
-        <module>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:impl">prefix:inmemory-data-tree</type>
-          <name>inmemory-context-data-tree</name>
-          <schema-service>
-            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-            <name>yang-schema-service</name>
-          </schema-service>
-          <type xmlns="urn:honeycomb:params:xml:ns:yang:data:impl">oper</type>
-        </module>
-
-        <!-- DataTree adapter with persistence for context DT -->
-        <module>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:impl">prefix:persisting-data-tree-adapter</type>
-          <name>inmemory-persisted-context-data-tree</name>
-          <delegate>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:api">prefix:data-tree</type>
-            <name>inmemory-context-data-tree</name>
-          </delegate>
-          <schema-service>
-            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-            <name>yang-schema-service</name>
-          </schema-service>
-          <persist-file-path>etc/opendaylight/honeycomb/context.json</persist-file-path>
-        </module>
-
-        <!-- DOM Data Broker for context data -->
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:honeycomb-context-dom-data-broker</type>
-          <name>honeycomb-context-data-broker</name>
-          <!-- With persistence -->
-          <context-data-tree>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:api">prefix:data-tree</type>
-            <name>inmemory-persisted-context-data-tree</name>
-          </context-data-tree>
-        </module>
-
-        <!-- BA Data Broker for context data -->
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-forwarded-data-broker</type>
-          <name>honeycomb-context-binding-data-broker</name>
-          <binding-forwarded-data-broker xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">
-            <dom-async-broker>
-              <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type>
-              <name>honeycomb-context-data-broker</name>
-            </dom-async-broker>
-            <schema-service>
-              <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-              <name>yang-schema-service</name>
-            </schema-service>
-            <binding-mapping-service>
-              <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding:binding-dom-mapping-service</type>
-              <name>runtime-mapping-singleton</name>
-            </binding-mapping-service>
-          </binding-forwarded-data-broker>
-        </module>
-
-        <!-- Special reader for Context data. Providing context data to outside users over NETCONF/RESTCONF -->
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:context-reader</type>
-          <name>context-reader</name>
-          <context-binding-broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-            <name>honeycomb-context-binding-data-broker</name>
-          </context-binding-broker>
-        </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>context-reader</name>
-          </reader-factory>
-        </module>
-        <!-- END: Special reader for Context -->
-
-        <!-- Mapping context on top of BA context broker. Utilized by eg notification producers -->
-        <module>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:utils">prefix:realtime-mapping-context</type>
-          <name>realtime-mapping-context</name>
-          <context-binding-broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-            <name>honeycomb-context-binding-data-broker</name>
-          </context-binding-broker>
-        </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>context-reader</name>
-            <provider>/modules/module[type='context-reader'][name='context-reader']</provider>
-          </instance>
-        </service>
-        <service>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:api">prefix:data-tree</type>
-          <instance>
-            <name>inmemory-context-data-tree</name>
-            <provider>/modules/module[type='inmemory-data-tree'][name='inmemory-context-data-tree']
-            </provider>
-          </instance>
-          <instance>
-            <name>inmemory-persisted-context-data-tree</name>
-            <provider>/modules/module[type='persisting-data-tree-adapter'][name='inmemory-persisted-context-data-tree']
-            </provider>
-          </instance>
-        </service>
-
-        <service>
-          <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type>
-          <instance>
-            <name>honeycomb-context-data-broker</name>
-            <provider>/modules/module[type='honeycomb-context-dom-data-broker'][name='honeycomb-context-data-broker']</provider>
-          </instance>
-        </service>
-
-        <service>
-          <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-          <instance>
-            <name>honeycomb-context-binding-data-broker</name>
-            <provider>/modules/module[type='binding-forwarded-data-broker'][name='honeycomb-context-binding-data-broker']</provider>
-          </instance>
-        </service>
-
-        <service>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-mapping-context</type>
-          <instance>
-            <name>realtime-mapping-context</name>
-            <provider>/modules/module[type='realtime-mapping-context'][name='realtime-mapping-context']</provider>
-          </instance>
-        </service>
-      </services>
-    </data>
-  </configuration>
-</snapshot>
diff --git a/v3po/impl/src/main/config/default-config.xml b/v3po/impl/src/main/config/default-config.xml
deleted file mode 100644
index 63f40c624..000000000
--- a/v3po/impl/src/main/config/default-config.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2015 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.
--->
-<snapshot>
-  <required-capabilities>
-      <capability>urn:opendaylight:params:xml:ns:yang:v3po:impl?module=v3po-impl&amp;revision=2014-12-10</capability>
-      <capability>urn:honeycomb:params:xml:ns:yang:translate:utils?module=translate-utils&amp;revision=2016-04-06</capability>
-      <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:data:api?module=data-api&amp;revision=2016-04-11</capability>
-      <capability>urn:honeycomb:params:xml:ns:yang:data:impl?module=data-impl&amp;revision=2016-04-11</capability>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</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:translate:utils">prefix:delegating-reader-registry</type>
-          <name>read-registry</name>
-        </module>
-        <module>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:utils">prefix:delegating-writer-registry</type>
-          <name>write-registry</name>
-        </module>
-
-        <!-- In-memory data tree for HC config data tree -->
-        <module>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:impl">prefix:inmemory-data-tree</type>
-          <name>inmemory-config-data-tree</name>
-          <schema-service>
-            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-            <name>yang-schema-service</name>
-          </schema-service>
-          <type xmlns="urn:honeycomb:params:xml:ns:yang:data:impl">config</type>
-        </module>
-
-        <!-- DataTree adapter with persistence for config DT -->
-        <module>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:impl">prefix:persisting-data-tree-adapter</type>
-          <name>inmemory-persisted-config-data-tree</name>
-          <delegate>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:api">prefix:data-tree</type>
-            <name>inmemory-config-data-tree</name>
-          </delegate>
-          <schema-service>
-            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-            <name>yang-schema-service</name>
-          </schema-service>
-          <persist-file-path>etc/opendaylight/honeycomb/config.json</persist-file-path>
-        </module>
-
-
-        <!-- HC config data tree -->
-        <module>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:impl">prefix:honeycomb-config-data-tree</type>
-          <name>config-data-tree</name>
-          <!-- Without persistence -->
-          <!--<data-tree>-->
-            <!--<type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:impl">prefix:data-tree</type>-->
-            <!--<name>inmemory-config-data-tree</name>-->
-          <!--</data-tree>-->
-          <!-- With persistence -->
-          <data-tree>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:api">prefix:data-tree</type>
-            <name>inmemory-persisted-config-data-tree</name>
-          </data-tree>
-
-          <serializer>
-            <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-dom-mapping-service</type>
-            <name>runtime-mapping-singleton</name>
-          </serializer>
-          <writer-registry-builder>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-writer-registry-builder</type>
-            <name>write-registry-builder</name>
-          </writer-registry-builder>
-          <context-binding-broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-            <name>honeycomb-context-binding-data-broker</name>
-          </context-binding-broker>
-        </module>
-
-        <!-- HC operational data tree -->
-        <module>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:impl">prefix:honeycomb-operational-data-tree</type>
-          <name>operational-data-tree</name>
-          <schema-service>
-            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-            <name>yang-schema-service</name>
-          </schema-service>
-          <serializer>
-            <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-dom-mapping-service</type>
-            <name>runtime-mapping-singleton</name>
-          </serializer>
-          <reader-registry-builder>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-reader-registry</type>
-            <name>read-registry</name>
-          </reader-registry-builder>
-          <context-binding-broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-            <name>honeycomb-context-binding-data-broker</name>
-          </context-binding-broker>
-        </module>
-
-        <!-- DOM data broker which provides transaction functionality for HC using BI format-->
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:honeycomb-dom-data-broker</type>
-          <name>honeycomb-dom-data-broker</name>
-          <config-data-tree>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:api">prefix:honeycomb-modifiable-data-tree</type>
-            <name>config-data-tree</name>
-          </config-data-tree>
-          <operational-data-tree>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:api">prefix:honeycomb-readable-data-tree</type>
-            <name>operational-data-tree</name>
-          </operational-data-tree>
-        </module>
-
-        <!-- Binding data broker which provides transaction functionality for HC using BA format -->
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-forwarded-data-broker</type>
-          <name>honeycomb-binding-data-broker</name>
-          <binding-forwarded-data-broker xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">
-
-            <dom-async-broker>
-              <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type>
-              <name>honeycomb-dom-data-broker</name>
-            </dom-async-broker>
-            <schema-service>
-              <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-              <name>yang-schema-service</name>
-            </schema-service>
-            <binding-mapping-service>
-              <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding:binding-dom-mapping-service</type>
-              <name>runtime-mapping-singleton</name>
-            </binding-mapping-service>
-          </binding-forwarded-data-broker>
-        </module>
-
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:v3po</type>
-          <name>v3po-default</name>
-          <dom-broker>
-            <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">prefix:dom-broker-osgi-registry</type>
-            <name>dom-broker</name>
-          </dom-broker>
-          <honeycomb-dom-data-broker>
-            <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">prefix:dom-async-data-broker</type>
-            <name>honeycomb-dom-data-broker</name>
-          </honeycomb-dom-data-broker>
-          <honeycomb-dom-notification-service>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:notification:api">prefix:dom-notification-service</type>
-            <name>honeycomb-dom-notification-service</name>
-          </honeycomb-dom-notification-service>
-        </module>
-      </modules>
-
-      <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-
-        <service>
-          <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type>
-          <instance>
-            <name>honeycomb-dom-data-broker</name>
-            <provider>/modules/module[type='honeycomb-dom-data-broker'][name='honeycomb-dom-data-broker']</provider>
-          </instance>
-        </service>
-
-        <service>
-          <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-          <instance>
-            <name>honeycomb-binding-data-broker</name>
-            <provider>/modules/module[type='binding-forwarded-data-broker'][name='honeycomb-binding-data-broker']</provider>
-          </instance>
-        </service>
-
-        <service>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-reader-registry</type>
-          <instance>
-            <name>read-registry</name>
-            <provider>/modules/module[type='delegating-reader-registry'][name='read-registry']</provider>
-          </instance>
-        </service>
-        <service>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-writer-registry</type>
-          <instance>
-            <name>write-registry</name>
-            <provider>/modules/module[type='delegating-writer-registry'][name='write-registry']</provider>
-          </instance>
-        </service>
-        <service>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-writer-registry-builder</type>
-          <instance>
-            <name>write-registry-builder</name>
-            <provider>/modules/module[type='delegating-writer-registry'][name='write-registry']</provider>
-          </instance>
-        </service>
-
-        <service>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:api">prefix:data-tree</type>
-          <instance>
-            <name>inmemory-config-data-tree</name>
-            <provider>/modules/module[type='inmemory-data-tree'][name='inmemory-config-data-tree']
-            </provider>
-          </instance>
-          <instance>
-            <name>inmemory-persisted-config-data-tree</name>
-            <provider>/modules/module[type='persisting-data-tree-adapter'][name='inmemory-persisted-config-data-tree']
-            </provider>
-          </instance>
-        </service>
-
-        <service>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:api">prefix:honeycomb-modifiable-data-tree</type>
-          <instance>
-            <name>config-data-tree</name>
-            <provider>/modules/module[type='honeycomb-config-data-tree'][name='config-data-tree']
-            </provider>
-          </instance>
-        </service>
-        <service>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:api">prefix:honeycomb-readable-data-tree</type>
-          <instance>
-            <name>operational-data-tree</name>
-            <provider>/modules/module[type='honeycomb-operational-data-tree'][name='operational-data-tree']
-            </provider>
-          </instance>
-        </service>
-        <service>
-          <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">
-            dom:dom-broker-osgi-registry
-          </type>
-          <instance>
-            <name>vpp-dom-broker</name>
-            <provider>/modules/module[type='v3po'][name='v3po-default']</provider>
-          </instance>
-        </service>
-
-      </services>
-    </data>
-  </configuration>
-</snapshot>
diff --git a/v3po/impl/src/main/config/initializer-config.xml b/v3po/impl/src/main/config/initializer-config.xml
deleted file mode 100644
index a7a9bd2c4..000000000
--- a/v3po/impl/src/main/config/initializer-config.xml
+++ /dev/null
@@ -1,242 +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:opendaylight:params:xml:ns:yang:v3po:impl?module=v3po-impl&amp;revision=2014-12-10</capability>
-      <capability>urn:honeycomb:params:xml:ns:yang:translate:utils?module=translate-utils&amp;revision=2016-04-06</capability>
-      <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:vpp:data:init?module=vpp-cfg-init&amp;revision=2016-04-07</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:data:impl?module=data-impl&amp;revision=2016-04-11</capability>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</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">
-        <!-- Config initialization -->
-        <!-- Empty registry which does not pass data to VPP  -->
-        <module>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:utils">prefix:noop-writer-registry-builder</type>
-          <name>noop-writer-registry-builder</name>
-        </module>
-        <!-- Config data tree which does not pass data to translation layer (uses noop-write-registry)  -->
-        <module>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:impl">prefix:honeycomb-config-data-tree</type>
-          <name>cfg-init-config-data-tree</name>
-          <!-- Without persistence -->
-          <data-tree>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:api">prefix:data-tree</type>
-            <name>inmemory-config-data-tree</name>
-          </data-tree>
-          <serializer>
-            <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-dom-mapping-service</type>
-            <name>runtime-mapping-singleton</name>
-          </serializer>
-          <writer-registry-builder>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-writer-registry-builder</type>
-            <name>noop-writer-registry-builder</name>
-          </writer-registry-builder>
-          <context-binding-broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-            <name>honeycomb-context-binding-data-broker</name>
-          </context-binding-broker>
-        </module>
-        <!-- DOM data broker for config initialization -->
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:honeycomb-dom-data-broker</type>
-          <name>cfg-init-dom-data-broker</name>
-          <config-data-tree>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:api">prefix:honeycomb-modifiable-data-tree</type>
-            <name>cfg-init-config-data-tree</name>
-          </config-data-tree>
-          <operational-data-tree>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:api">prefix:honeycomb-readable-data-tree</type>
-            <name>operational-data-tree</name>
-          </operational-data-tree>
-        </module>
-        <!-- Binding data broker for config initialization -->
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-forwarded-data-broker</type>
-          <name>cfg-init-binding-data-broker</name>
-          <binding-forwarded-data-broker xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">
-            <dom-async-broker>
-              <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type>
-              <name>cfg-init-dom-data-broker</name>
-            </dom-async-broker>
-            <schema-service>
-              <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-              <name>yang-schema-service</name>
-            </schema-service>
-            <binding-mapping-service>
-              <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding:binding-dom-mapping-service</type>
-              <name>runtime-mapping-singleton</name>
-            </binding-mapping-service>
-          </binding-forwarded-data-broker>
-        </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>
-        <module>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:persisted-file-initializer</type>
-          <name>persisted-context-initializer</name>
-          <dom-data-broker>
-            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type>
-            <name>honeycomb-context-data-broker</name>
-          </dom-data-broker>
-          <schema-service>
-            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-            <name>yang-schema-service</name>
-          </schema-service>
-          <persist-file-path>etc/opendaylight/honeycomb/context.json</persist-file-path>
-          <restoration-type>merge</restoration-type>
-          <datastore-type>oper</datastore-type>
-        </module>
-        <module>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:persisted-file-initializer</type>
-          <name>persisted-config-initializer</name>
-          <dom-data-broker>
-            <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">prefix:dom-async-data-broker</type>
-            <name>honeycomb-dom-data-broker</name>
-          </dom-data-broker>
-          <schema-service>
-            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-            <name>yang-schema-service</name>
-          </schema-service>
-          <persist-file-path>etc/opendaylight/honeycomb/config.json</persist-file-path>
-          <restoration-type>merge</restoration-type>
-          <datastore-type>config</datastore-type>
-        </module>
-
-        <module>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer-registry</type>
-          <name>initializer-registry</name>
-          <persisted-context-initializer>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer</type>
-            <name>persisted-context-initializer</name>
-          </persisted-context-initializer>
-          <initializers>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer</type>
-            <name>vpp-cfg-initializer</name>
-          </initializers>
-          <initializers>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer</type>
-            <name>interfaces-cfg-initializer</name>
-          </initializers>
-          <initializers>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer</type>
-            <name>vpp-classifier-cfg-initializer</name>
-          </initializers>
-          <persisted-config-initializer>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer</type>
-            <name>persisted-config-initializer</name>
-          </persisted-config-initializer>
-        </module>
-        <!-- END: Config initialization -->
-      </modules>
-
-      <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <!-- Config initialization -->
-        <service>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-writer-registry-builder</type>
-          <instance>
-            <name>noop-writer-registry-builder</name>
-            <provider>/modules/module[type='noop-writer-registry-builder'][name='noop-writer-registry-builder']</provider>
-          </instance>
-        </service>
-        <service>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:api">prefix:honeycomb-modifiable-data-tree</type>
-          <instance>
-            <name>cfg-init-config-data-tree</name>
-            <provider>/modules/module[type='honeycomb-config-data-tree'][name='cfg-init-config-data-tree']
-            </provider>
-          </instance>
-        </service>
-        <service>
-          <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type>
-          <instance>
-            <name>cfg-init-dom-data-broker</name>
-            <provider>/modules/module[type='honeycomb-dom-data-broker'][name='cfg-init-dom-data-broker']</provider>
-          </instance>
-        </service>
-        <service>
-          <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-          <instance>
-            <name>cfg-init-binding-data-broker</name>
-            <provider>/modules/module[type='binding-forwarded-data-broker'][name='cfg-init-binding-data-broker']</provider>
-          </instance>
-        </service>
-
-        <service>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp: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>
-          <instance>
-            <name>persisted-context-initializer</name>
-            <provider>/modules/module[type='persisted-file-initializer'][name='persisted-context-initializer']
-            </provider>
-          </instance>
-          <instance>
-            <name>persisted-config-initializer</name>
-            <provider>/modules/module[type='persisted-file-initializer'][name='persisted-config-initializer']
-            </provider>
-          </instance>
-        </service>
-      </services>
-    </data>
-  </configuration>
-</snapshot>
diff --git a/v3po/impl/src/main/config/netconf-north-config.xml b/v3po/impl/src/main/config/netconf-north-config.xml
deleted file mode 100644
index 35bd5ff04..000000000
--- a/v3po/impl/src/main/config/netconf-north-config.xml
+++ /dev/null
@@ -1,496 +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>
-    <configuration>
-        <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-            <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-
-                <!-- In memory DS dedicated to NETCONF monitoring, notifications etc. -->
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:inmemory-datastore-provider">prefix:inmemory-config-datastore-provider</type>
-                    <name>netconf-config-store-service</name>
-                    <inmemory-config-datastore-provider xmlns="urn:opendaylight:params:xml:ns:yang:controller:inmemory-datastore-provider">
-                        <schema-service>
-                            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-                            <name>yang-schema-service</name>
-                        </schema-service>
-                    </inmemory-config-datastore-provider>
-                </module>
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:inmemory-datastore-provider">prefix:inmemory-operational-datastore-provider</type>
-                    <name>netconf-operational-store-service</name>
-                    <inmemory-operational-datastore-provider xmlns="urn:opendaylight:params:xml:ns:yang:controller:inmemory-datastore-provider">
-                        <schema-service>
-                            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-                            <name>yang-schema-service</name>
-                        </schema-service>
-                    </inmemory-operational-datastore-provider>
-                </module>
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl">prefix:dom-inmemory-data-broker</type>
-                    <name>netconf-inmemory-data-broker</name>
-
-                    <schema-service>
-                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-                        <name>yang-schema-service</name>
-                    </schema-service>
-
-                    <config-data-store>
-                        <type xmlns:config-dom-store-spi="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:config-dom-store">config-dom-store-spi:config-dom-datastore</type>
-                        <name>netconf-config-store-service</name>
-                    </config-data-store>
-
-                    <operational-data-store>
-                        <type xmlns:operational-dom-store-spi="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:operational-dom-store">operational-dom-store-spi:operational-dom-datastore</type>
-                        <name>netconf-operational-store-service</name>
-                    </operational-data-store>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-forwarded-data-broker</type>
-                    <name>netconf-binding-data-broker</name>
-                    <binding-forwarded-data-broker xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">
-                        <dom-async-broker>
-                            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type>
-                            <name>netconf-inmemory-data-broker</name>
-                        </dom-async-broker>
-                        <schema-service>
-                            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-                            <name>yang-schema-service</name>
-                        </schema-service>
-                        <binding-mapping-service>
-                            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding:binding-dom-mapping-service</type>
-                            <name>runtime-mapping-singleton</name>
-                        </binding-mapping-service>
-                    </binding-forwarded-data-broker>
-                </module>
-                <module>
-                    <!--binding-broker-osgi-registry-->
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:binding-broker-netconf</type>
-                    <name>binding-broker-netconf</name>
-                    <netconf-binding-broker>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-                        <name>netconf-binding-data-broker</name>
-                    </netconf-binding-broker>
-                </module>
-                <!-- END:In memory DS dedicated to NETCONF monitoring, notifications etc. -->
-
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:mapper">
-                        prefix:netconf-mdsal-mapper
-                    </type>
-                    <name>netconf-vpp-mapper</name>
-                    <root-schema-service>
-                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service
-                        </type>
-                        <name>yang-schema-service</name>
-                    </root-schema-service>
-                    <root-schema-source-provider>
-                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">
-                            dom:yang-text-source-provider
-                        </type>
-                        <name>yang-text-source-provider</name>
-                    </root-schema-source-provider>
-                    <dom-broker xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:mapper">
-                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">
-                            dom:dom-broker-osgi-registry
-                        </type>
-                        <name>vpp-dom-broker</name>
-                    </dom-broker>
-                    <mapper-aggregator xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:mapper">
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper">
-                            prefix:netconf-mapper-registry
-                        </type>
-                        <name>vpp-mapper-aggregator-registry</name>
-                    </mapper-aggregator>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl">
-                        prefix:netconf-server-dispatcher-impl
-                    </type>
-                    <name>netconf-vpp-server-dispatcher</name>
-                    <mappers xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl">
-                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper">
-                            dom:netconf-northbound-mapper
-                        </type>
-                        <name>vpp-mapper-aggregator</name>
-                    </mappers>
-                    <server-monitor
-                            xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl">
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound">
-                            prefix:netconf-server-monitoring
-                        </type>
-                        <name>vpp-server-monitor</name>
-                    </server-monitor>
-                    <boss-thread-group
-                            xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl">
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netty">
-                            prefix:netty-threadgroup
-                        </type>
-                        <name>global-boss-group</name>
-                    </boss-thread-group>
-                    <worker-thread-group
-                            xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl">
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netty">
-                            prefix:netty-threadgroup
-                        </type>
-                        <name>global-worker-group</name>
-                    </worker-thread-group>
-                    <timer xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl">
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netty">prefix:netty-timer
-                        </type>
-                        <name>global-timer</name>
-                    </timer>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:monitoring">
-                        prefix:netconf-mdsal-monitoring-mapper
-                    </type>
-                    <name>netconf-vpp-monitoring-mapper</name>
-                    <server-monitoring xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:monitoring">
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound">
-                            prefix:netconf-server-monitoring
-                        </type>
-                        <name>vpp-server-monitor</name>
-                    </server-monitoring>
-                    <binding-aware-broker
-                            xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:monitoring">
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
-                            prefix:binding-broker-osgi-registry
-                        </type>
-                        <name>binding-broker-netconf</name>
-                    </binding-aware-broker>
-                    <aggregator xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:monitoring">
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper">
-                            prefix:netconf-mapper-registry
-                        </type>
-                        <name>vpp-mapper-aggregator-registry</name>
-                    </aggregator>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl">
-                        prefix:netconf-mapper-aggregator
-                    </type>
-                    <name>vpp-mapper-aggregator</name>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl">
-                        prefix:netconf-server-monitoring-impl
-                    </type>
-                    <name>vpp-server-monitor</name>
-                    <aggregator xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl">
-                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper">
-                            dom:netconf-northbound-mapper
-                        </type>
-                        <name>vpp-mapper-aggregator</name>
-                    </aggregator>
-                </module>
-
-                <!-- Change the port of global netconf north from 2830 to 2831, so that honeycomb netconf northbound can use 2830-->
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh">prefix:netconf-northbound-ssh</type>
-                    <name>netconf-mdsal-ssh-server</name>
-                    <port xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh">2831</port>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh">
-                        prefix:netconf-northbound-ssh
-                    </type>
-                    <name>netconf-vpp-ssh-server</name>
-
-                    <port xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh">2830</port>
-                    <event-executor xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh">
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netty">
-                            prefix:netty-event-executor
-                        </type>
-                        <name>global-event-executor</name>
-                    </event-executor>
-                    <worker-thread-group xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh">
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netty">
-                            prefix:netty-threadgroup
-                        </type>
-                        <name>global-worker-group</name>
-                    </worker-thread-group>
-                    <processing-executor xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh">
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:threadpool">
-                            prefix:threadpool
-                        </type>
-                        <name>global-netconf-ssh-scheduled-executor</name>
-                    </processing-executor>
-                    <dispatcher xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh">
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound">
-                            prefix:netconf-server-dispatcher
-                        </type>
-                        <name>netconf-vpp-server-dispatcher</name>
-                    </dispatcher>
-                    <auth-provider xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh">
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:auth">
-                            prefix:netconf-auth-provider
-                        </type>
-                        <name>default-auth-provider</name>
-                    </auth-provider>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:notification:impl">
-                        prefix:netconf-notification-manager
-                    </type>
-                    <name>vpp-netconf-notification-manager</name>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:notification">
-                        prefix:netconf-mdsal-notification-mapper
-                    </type>
-                    <name>netconf-vpp-notification-mapper</name>
-                    <!--This is used to listen to netconf-state/capabilities changes to send out notifications-->
-                    <data-broker xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:notification">
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
-                            binding:binding-async-data-broker
-                        </type>
-                        <name>netconf-binding-data-broker</name>
-                    </data-broker>
-                    <!--This writes stream list into DS-->
-                    <binding-aware-broker
-                            xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:notification">
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
-                            prefix:binding-broker-osgi-registry
-                        </type>
-                        <name>binding-broker-netconf</name>
-                    </binding-aware-broker>
-                    <aggregator xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:notification">
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper">
-                            prefix:netconf-mapper-registry
-                        </type>
-                        <name>vpp-mapper-aggregator-registry</name>
-                    </aggregator>
-                    <notification-registry
-                            xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:notification">
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:notification">
-                            prefix:netconf-notification-registry
-                        </type>
-                        <name>vpp-netconf-notification-manager</name>
-                    </notification-registry>
-                    <notification-collector>
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:notification">
-                            prefix:netconf-notification-collector
-                        </type>
-                        <name>vpp-netconf-notification-manager</name>
-                    </notification-collector>
-                </module>
-
-
-                <!--TCP endpoint for MD-SAL netconf server -->
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:tcp">
-                        prefix:netconf-northbound-tcp
-                    </type>
-                    <name>netconf-vpp-tcp-server</name>
-                    <dispatcher xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:tcp">
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound">
-                            prefix:netconf-server-dispatcher
-                        </type>
-                        <name>netconf-vpp-server-dispatcher</name>
-                    </dispatcher>
-                    <port xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:tcp">7777</port>
-                </module>
-
-                <!-- Special reader for Netconf monitoring. The problem is that we store netconf monitoring in a dedicated DS.
-                However netconf is wired to our reader registry, so we need to delegate the reads of netconf-monitoring
-                through our readers to the dedicated DS-->
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:netconf-monitoring-reader</type>
-                    <name>netconf-monitoring-reader</name>
-                    <netconf-monitoring-binding-broker>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-                        <name>netconf-binding-data-broker</name>
-                    </netconf-monitoring-binding-broker>
-                </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>netconf-monitoring-reader</name>
-                    </reader-factory>
-                </module>
-                <!-- END: Special reader for Netconf monitoring. -->
-
-            </modules>
-
-            <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <service>
-                    <type xmlns:config-dom-store-spi="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:config-dom-store">config-dom-store-spi:config-dom-datastore</type>
-                    <instance>
-                        <name>netconf-config-store-service</name>
-                        <provider>/modules/module[type='inmemory-config-datastore-provider'][name='netconf-config-store-service']</provider>
-                    </instance>
-                </service>
-                <service>
-                    <type xmlns:operational-dom-store-spi="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:operational-dom-store">operational-dom-store-spi:operational-dom-datastore</type>
-                    <instance>
-                        <name>netconf-operational-store-service</name>
-                        <provider>/modules/module[type='inmemory-operational-datastore-provider'][name='netconf-operational-store-service']</provider>
-                    </instance>
-                </service>
-                <service>
-                    <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type>
-                    <instance>
-                        <name>netconf-inmemory-data-broker</name>
-                        <provider>/modules/module[type='dom-inmemory-data-broker'][name='netconf-inmemory-data-broker']</provider>
-                    </instance>
-                </service>
-
-                <service>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-reader-factory</type>
-                    <instance>
-                        <name>netconf-monitoring-reader</name>
-                        <provider>/modules/module[type='netconf-monitoring-reader'][name='netconf-monitoring-reader']</provider>
-                    </instance>
-                </service>
-
-                <!-- In memory DS dedicated to NETCONF monitoring, notifications etc. -->
-
-                <service>
-                    <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-                    <instance>
-                        <name>netconf-binding-data-broker</name>
-                        <provider>/modules/module[type='binding-forwarded-data-broker'][name='netconf-binding-data-broker']</provider>
-                    </instance>
-                </service>
-                <service>
-                    <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
-                    <instance>
-                        <name>binding-broker-netconf</name>
-                        <provider>/modules/module[type='binding-broker-netconf'][name='binding-broker-netconf']</provider>
-                    </instance>
-                </service>
-                <!-- END:In memory DS dedicated to NETCONF monitoring, notifications etc. -->
-
-               <service>
-                   <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound">
-                       prefix:netconf-server-monitoring
-                   </type>
-                   <instance>
-                       <name>vpp-server-monitor</name>
-                       <provider>/modules/module[type='netconf-server-monitoring-impl'][name='vpp-server-monitor']
-                       </provider>
-                   </instance>
-               </service>
-               <service>
-                   <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper">
-                       prefix:netconf-northbound-mapper
-                   </type>
-                   <instance>
-                       <name>netconf-vpp-mapper</name>
-                       <provider>/modules/module[type='netconf-mdsal-mapper'][name='netconf-vpp-mapper']</provider>
-                   </instance>
-               </service>
-               <service>
-                   <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper">
-                       prefix:netconf-northbound-mapper
-                   </type>
-                   <instance>
-                       <name>vpp-mapper-aggregator</name>
-                       <provider>/modules/module[type='netconf-mapper-aggregator'][name='vpp-mapper-aggregator']</provider>
-                   </instance>
-               </service>
-               <service>
-                   <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper">
-                       prefix:netconf-mapper-registry
-                   </type>
-                   <instance>
-                       <name>vpp-mapper-aggregator-registry</name>
-                       <provider>/modules/module[type='netconf-mapper-aggregator'][name='vpp-mapper-aggregator']</provider>
-                   </instance>
-               </service>
-               <service>
-                   <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound">
-                       prefix:netconf-server-dispatcher
-                   </type>
-                   <instance>
-                       <name>netconf-vpp-server-dispatcher</name>
-                       <provider>
-                           /modules/module[type='netconf-server-dispatcher-impl'][name='netconf-vpp-server-dispatcher']
-                       </provider>
-                   </instance>
-               </service>
-               <service>
-                   <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper">
-                       prefix:netconf-northbound-mapper
-                   </type>
-                   <instance>
-                       <name>netconf-vpp-notification-mapper</name>
-                       <provider>
-                           /modules/module[type='netconf-mdsal-notification-mapper'][name='netconf-vpp-notification-mapper']
-                       </provider>
-                   </instance>
-               </service>
-               <service>
-                   <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:notification">
-                       prefix:netconf-notification-collector
-                   </type>
-                   <instance>
-                       <name>vpp-netconf-notification-manager</name>
-                       <provider>
-                           /modules/module[type='netconf-notification-manager'][name='vpp-netconf-notification-manager']
-                       </provider>
-                   </instance>
-               </service>
-               <service>
-                   <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:notification">
-                       prefix:netconf-notification-registry
-                   </type>
-                   <instance>
-                       <name>vpp-netconf-notification-manager</name>
-                       <provider>
-                           /modules/module[type='netconf-notification-manager'][name='vpp-netconf-notification-manager']
-                       </provider>
-                   </instance>
-               </service>
-           </services>
-
-       </data>
-   </configuration>
-   <required-capabilities>
-       <capability>urn:opendaylight:params:xml:ns:yang:v3po:impl?module=v3po-impl&amp;revision=2014-12-10</capability>
-       <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-       <capability>urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:mapper?module=netconf-mdsal-mapper&amp;revision=2015-01-14</capability>
-       <capability>
-           urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:monitoring?module=netconf-mdsal-monitoring&amp;revision=2015-02-18
-       </capability>
-       <capability>urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh?module=netconf-northbound-ssh&amp;revision=2015-01-14</capability>
-       <capability>urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:tcp?module=netconf-northbound-tcp&amp;revision=2015-04-23</capability>
-       <capability>
-           urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl?module=netconf-northbound-impl&amp;revision=2015-01-12
-       </capability>
-       <capability>
-           urn:opendaylight:params:xml:ns:yang:controller:threadpool:impl:scheduled?module=threadpool-impl-scheduled&amp;revision=2013-12-01
-       </capability>
-       <capability>
-           urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:notification?module=netconf-mdsal-notification&amp;revision=2015-08-03
-       </capability>
-   </required-capabilities>
-</snapshot>
diff --git a/v3po/impl/src/main/config/restconf-north-config.xml b/v3po/impl/src/main/config/restconf-north-config.xml
deleted file mode 100644
index ff2cdac18..000000000
--- a/v3po/impl/src/main/config/restconf-north-config.xml
+++ /dev/null
@@ -1,37 +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.
-  -->
-<snapshot>
-    <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:rest="urn:opendaylight:params:xml:ns:yang:controller:md:sal:rest:connector">rest:rest-connector-impl</type>
-                    <name>rest-connector-default-impl</name>
-                    <!-- Reconfiguring the default restconf northbound instance, to wire it just to honeycomb broker facade -->
-                    <dom-broker>
-                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-broker-osgi-registry</type>
-                        <name>vpp-dom-broker</name>
-                    </dom-broker>
-                </module>
-            </modules>
-        </data>
-    </configuration>
-    <required-capabilities>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:sal:restconf:service?module=sal-restconf-service&amp;revision=2015-07-08</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:rest:connector?module=opendaylight-rest-connector&amp;revision=2014-07-24</capability>
-    </required-capabilities>
-</snapshot>
-- 
cgit 1.2.3-korg