From 85e8751ceb79ed8ed8eadfe70c9568b7741449f9 Mon Sep 17 00:00:00 2001 From: Maros Marsalek 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 --- v3po/impl/src/main/config/default-config.xml | 71 +++++ v3po/impl/src/main/config/netconf-north-config.xml | 290 ++++++++++----------- .../rev141210/NetconfMonitoringReaderModule.java | 28 ++ .../NetconfMonitoringReaderModuleFactory.java | 13 + v3po/impl/src/main/yang/v3po-impl.yang | 21 ++ 5 files changed, 264 insertions(+), 159 deletions(-) create mode 100644 v3po/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/NetconfMonitoringReaderModule.java create mode 100644 v3po/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/NetconfMonitoringReaderModuleFactory.java (limited to 'v3po/impl/src/main') diff --git a/v3po/impl/src/main/config/default-config.xml b/v3po/impl/src/main/config/default-config.xml index 518a6fa58..fac06e136 100644 --- a/v3po/impl/src/main/config/default-config.xml +++ b/v3po/impl/src/main/config/default-config.xml @@ -66,6 +66,48 @@ + + + prefix:inmemory-config-datastore-provider + netconf-config-store-service + + + dom:schema-service + yang-schema-service + + + + + prefix:inmemory-operational-datastore-provider + netconf-operational-store-service + + + dom:schema-service + yang-schema-service + + + + + prefix:dom-inmemory-data-broker + netconf-inmemory-data-broker + + + dom:schema-service + yang-schema-service + + + + config-dom-store-spi:config-dom-datastore + netconf-config-store-service + + + + operational-dom-store-spi:operational-dom-datastore + netconf-operational-store-service + + + + prefix:honeycomb-operational-data-tree @@ -82,6 +124,10 @@ prefix:honeycomb-reader-registry read-registry + + dom:dom-async-data-broker + netconf-inmemory-data-broker + @@ -212,6 +258,31 @@ + + + + config-dom-store-spi:config-dom-datastore + + netconf-config-store-service + /modules/module[type='inmemory-config-datastore-provider'][name='netconf-config-store-service'] + + + + operational-dom-store-spi:operational-dom-datastore + + netconf-operational-store-service + /modules/module[type='inmemory-operational-datastore-provider'][name='netconf-operational-store-service'] + + + + dom:dom-async-data-broker + + netconf-inmemory-data-broker + /modules/module[type='dom-inmemory-data-broker'][name='netconf-inmemory-data-broker'] + + + + dom:dom-async-data-broker 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 @@ - - prefix:inmemory-config-datastore-provider - netconf-config-store-service - - - dom:schema-service - yang-schema-service - - - - - prefix:inmemory-operational-datastore-provider - netconf-operational-store-service - - - dom:schema-service - yang-schema-service - - - - - prefix:dom-inmemory-data-broker - netconf-inmemory-data-broker - - - dom:schema-service - yang-schema-service - - - config-dom-store-spi:config-dom-datastore - netconf-config-store-service - - - - operational-dom-store-spi:operational-dom-datastore - netconf-operational-store-service - - @@ -318,31 +280,41 @@ 7777 + + + prefix:netconf-monitoring-reader + netconf-monitoring-reader + + binding:binding-async-data-broker + netconf-binding-data-broker + + + + + + + + + + + + + - - - config-dom-store-spi:config-dom-datastore - - netconf-config-store-service - /modules/module[type='inmemory-config-datastore-provider'][name='netconf-config-store-service'] - - - - operational-dom-store-spi:operational-dom-datastore - - netconf-operational-store-service - /modules/module[type='inmemory-operational-datastore-provider'][name='netconf-operational-store-service'] - - - dom:dom-async-data-broker + prefix:honeycomb-reader - netconf-inmemory-data-broker - /modules/module[type='dom-inmemory-data-broker'][name='netconf-inmemory-data-broker'] + netconf-monitoring-reader + /modules/module[type='netconf-monitoring-reader'][name='netconf-monitoring-reader'] + + + binding:binding-async-data-broker @@ -359,108 +331,108 @@ - - - prefix:netconf-server-monitoring - - - vpp-server-monitor - /modules/module[type='netconf-server-monitoring-impl'][name='vpp-server-monitor'] - - - - - - prefix:netconf-northbound-mapper - - - netconf-vpp-mapper - /modules/module[type='netconf-mdsal-mapper'][name='netconf-vpp-mapper'] - - - - - prefix:netconf-northbound-mapper - - - vpp-mapper-aggregator - /modules/module[type='netconf-mapper-aggregator'][name='vpp-mapper-aggregator'] - - - - - prefix:netconf-mapper-registry - - - vpp-mapper-aggregator-registry - /modules/module[type='netconf-mapper-aggregator'][name='vpp-mapper-aggregator'] - - - - - prefix:netconf-server-dispatcher - - - netconf-vpp-server-dispatcher - - /modules/module[type='netconf-server-dispatcher-impl'][name='netconf-vpp-server-dispatcher'] - - - - - - prefix:netconf-northbound-mapper - - - netconf-vpp-notification-mapper - - /modules/module[type='netconf-mdsal-notification-mapper'][name='netconf-vpp-notification-mapper'] - - - - - - prefix:netconf-notification-collector - - - vpp-netconf-notification-manager - - /modules/module[type='netconf-notification-manager'][name='vpp-netconf-notification-manager'] - - - - - - prefix:netconf-notification-registry - - - vpp-netconf-notification-manager - - /modules/module[type='netconf-notification-manager'][name='vpp-netconf-notification-manager'] - - - - + + + prefix:netconf-server-monitoring + + + vpp-server-monitor + /modules/module[type='netconf-server-monitoring-impl'][name='vpp-server-monitor'] + + + + + + prefix:netconf-northbound-mapper + + + netconf-vpp-mapper + /modules/module[type='netconf-mdsal-mapper'][name='netconf-vpp-mapper'] + + + + + prefix:netconf-northbound-mapper + + + vpp-mapper-aggregator + /modules/module[type='netconf-mapper-aggregator'][name='vpp-mapper-aggregator'] + + + + + prefix:netconf-mapper-registry + + + vpp-mapper-aggregator-registry + /modules/module[type='netconf-mapper-aggregator'][name='vpp-mapper-aggregator'] + + + + + prefix:netconf-server-dispatcher + + + netconf-vpp-server-dispatcher + + /modules/module[type='netconf-server-dispatcher-impl'][name='netconf-vpp-server-dispatcher'] + + + + + + prefix:netconf-northbound-mapper + + + netconf-vpp-notification-mapper + + /modules/module[type='netconf-mdsal-notification-mapper'][name='netconf-vpp-notification-mapper'] + + + + + + prefix:netconf-notification-collector + + + vpp-netconf-notification-manager + + /modules/module[type='netconf-notification-manager'][name='vpp-netconf-notification-manager'] + + + + + + prefix:netconf-notification-registry + + + vpp-netconf-notification-manager + + /modules/module[type='netconf-notification-manager'][name='vpp-netconf-notification-manager'] + + + + - - - - urn:opendaylight:params:xml:ns:yang:v3po:impl?module=v3po-impl&revision=2014-12-10 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 - urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:mapper?module=netconf-mdsal-mapper&revision=2015-01-14 - - urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:monitoring?module=netconf-mdsal-monitoring&revision=2015-02-18 - - urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh?module=netconf-northbound-ssh&revision=2015-01-14 - urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:tcp?module=netconf-northbound-tcp&revision=2015-04-23 - - urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl?module=netconf-northbound-impl&revision=2015-01-12 - - - urn:opendaylight:params:xml:ns:yang:controller:threadpool:impl:scheduled?module=threadpool-impl-scheduled&revision=2013-12-01 - - - urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:notification?module=netconf-mdsal-notification&revision=2015-08-03 - - + + + + urn:opendaylight:params:xml:ns:yang:v3po:impl?module=v3po-impl&revision=2014-12-10 + urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 + urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:mapper?module=netconf-mdsal-mapper&revision=2015-01-14 + + urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:monitoring?module=netconf-mdsal-monitoring&revision=2015-02-18 + + urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh?module=netconf-northbound-ssh&revision=2015-01-14 + urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:tcp?module=netconf-northbound-tcp&revision=2015-04-23 + + urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl?module=netconf-northbound-impl&revision=2015-01-12 + + + urn:opendaylight:params:xml:ns:yang:controller:threadpool:impl:scheduled?module=threadpool-impl-scheduled&revision=2013-12-01 + + + urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:notification?module=netconf-mdsal-notification&revision=2015-08-03 + + diff --git a/v3po/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/NetconfMonitoringReaderModule.java b/v3po/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/NetconfMonitoringReaderModule.java new file mode 100644 index 000000000..feb7768a2 --- /dev/null +++ b/v3po/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/NetconfMonitoringReaderModule.java @@ -0,0 +1,28 @@ +package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210; + +import io.fd.honeycomb.v3po.translate.util.read.BindingBrokerReader; +import io.fd.honeycomb.v3po.translate.util.read.CloseableReader; +import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.NetconfState; + +public class NetconfMonitoringReaderModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210.AbstractNetconfMonitoringReaderModule { + public NetconfMonitoringReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { + super(identifier, dependencyResolver); + } + + public NetconfMonitoringReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210.NetconfMonitoringReaderModule 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 CloseableReader<>(new BindingBrokerReader<>(NetconfState.class, getNetconfMonitoringBindingBrokerDependency(), + LogicalDatastoreType.OPERATIONAL)); + } + +} diff --git a/v3po/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/NetconfMonitoringReaderModuleFactory.java b/v3po/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/NetconfMonitoringReaderModuleFactory.java new file mode 100644 index 000000000..b8b7bec63 --- /dev/null +++ b/v3po/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/NetconfMonitoringReaderModuleFactory.java @@ -0,0 +1,13 @@ +/* +* Generated file +* +* Generated from: yang module name: v3po-impl yang module local name: netconf-monitoring-reader +* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator +* Generated at: Tue Apr 12 13:03:40 CEST 2016 +* +* Do not modify this file unless it is present under src/main directory +*/ +package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210; +public class NetconfMonitoringReaderModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210.AbstractNetconfMonitoringReaderModuleFactory { + +} diff --git a/v3po/impl/src/main/yang/v3po-impl.yang b/v3po/impl/src/main/yang/v3po-impl.yang index d6fd25199..9509b02ec 100644 --- a/v3po/impl/src/main/yang/v3po-impl.yang +++ b/v3po/impl/src/main/yang/v3po-impl.yang @@ -127,4 +127,25 @@ module v3po-impl { } } + + identity netconf-monitoring-reader { + base config:module-type; + config:provided-service tapi:honeycomb-reader; + } + + augment "/config:modules/config:module/config:configuration" { + case netconf-monitoring-reader { + when "/config:modules/config:module/config:type = 'netconf-monitoring-reader'"; + + container netconf-monitoring-binding-broker { + uses config:service-ref { + refine type { + mandatory true; + config:required-identity md-sal-binding:binding-async-data-broker; + } + } + } + + } + } } -- cgit 1.2.3-korg