From 85e8751ceb79ed8ed8eadfe70c9568b7741449f9 Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Tue, 12 Apr 2016 16:19:31 +0200
Subject: HONEYCOMB-8: Fix netconf monitoring operational data provisioning

Local storage for netconf monitoring was not wired with
netconf northbound for vpp.

Change-Id: I864614ffcbf7acf16eccc65ab58b9821b2682f93
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 v3po/impl/src/main/config/netconf-north-config.xml | 290 ++++++++++-----------
 1 file changed, 131 insertions(+), 159 deletions(-)

(limited to 'v3po/impl/src/main/config/netconf-north-config.xml')

diff --git a/v3po/impl/src/main/config/netconf-north-config.xml b/v3po/impl/src/main/config/netconf-north-config.xml
index fc913fcb1..f7f0629d4 100644
--- a/v3po/impl/src/main/config/netconf-north-config.xml
+++ b/v3po/impl/src/main/config/netconf-north-config.xml
@@ -23,45 +23,7 @@
             <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>
@@ -318,31 +280,41 @@
                     <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>
+                <!--FIXME disable the reader until this patch is merged and released by ODL: TODO link -->
+                <!--<module>-->
+                    <!--<type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:utils">prefix:delegating-reader-registry</type>-->
+                    <!--<name>read-registry</name>-->
+                    <!--<root-readers>-->
+                        <!--<type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-reader</type>-->
+                        <!--<name>netconf-monitoring-reader</name>-->
+                    <!--</root-readers>-->
+                <!--</module>-->
+                <!-- END: Special reader for Netconf monitoring. -->
+
             </modules>
 
             <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <!-- In memory DS dedicated to NETCONF monitoring, notifications etc. -->
-                <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>
+                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-reader</type>
                     <instance>
-                        <name>netconf-inmemory-data-broker</name>
-                        <provider>/modules/module[type='dom-inmemory-data-broker'][name='netconf-inmemory-data-broker']</provider>
+                        <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>
@@ -359,108 +331,108 @@
                 </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>
+               <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>
+       </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>
-- 
cgit 1.2.3-korg