X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-impl%2Fsrc%2Fmain%2Fyang%2Fnetconf-northbound-impl.yang;h=7ad1fef55da1975e486012e690b8de0d929f3a15;hb=fb3ca10a354d54d067201f18943504c212b93613;hp=6ca0a7781c815d08966397941080b1394d793863;hpb=c2eb34d0fe909f382bc4d9201d955e471ae1d80a;p=controller.git

diff --git a/opendaylight/netconf/netconf-impl/src/main/yang/netconf-northbound-impl.yang b/opendaylight/netconf/netconf-impl/src/main/yang/netconf-northbound-impl.yang
index 6ca0a7781c..7ad1fef55d 100644
--- a/opendaylight/netconf/netconf-impl/src/main/yang/netconf-northbound-impl.yang
+++ b/opendaylight/netconf/netconf-impl/src/main/yang/netconf-northbound-impl.yang
@@ -67,6 +67,15 @@ module netconf-northbound-impl {
                 }
             }
 
+            container server-monitor {
+                uses config:service-ref {
+                    refine type {
+                        mandatory true;
+                        config:required-identity nn:netconf-server-monitoring;
+                    }
+                }
+            }
+
             container timer {
                 uses config:service-ref {
                     refine type {
@@ -77,4 +86,43 @@ module netconf-northbound-impl {
         }
     }
 
+
+    identity netconf-server-monitoring-impl {
+            base config:module-type;
+            config:provided-service nn:netconf-server-monitoring;
+            config:java-name-prefix NetconfServerMonitoring;
+    }
+
+    // TODO Monitoring could expose the monitoring data over JMX...
+
+    augment "/config:modules/config:module/config:configuration" {
+        case netconf-server-monitoring-impl {
+            when "/config:modules/config:module/config:type = 'netconf-server-monitoring-impl'";
+
+            container aggregator {
+                uses config:service-ref {
+                    refine type {
+                        config:required-identity nnm:netconf-northbound-mapper;
+                    }
+                }
+            }
+
+        }
+    }
+
+    identity netconf-mapper-aggregator {
+        base config:module-type;
+        config:provided-service nnm:netconf-northbound-mapper;
+        config:provided-service nnm:netconf-mapper-registry;
+        config:java-name-prefix NetconfMapperAggregator;
+        description "Aggregated operation provider for netconf servers. Joins all the operations and capabilities of all the mappers it aggregates and exposes them as a single service. The dependency orientation is reversed in order to prevent cyclic dependencies when monitoring service is considered";
+    }
+
+    augment "/config:modules/config:module/config:configuration" {
+        case netconf-mapper-aggregator {
+            when "/config:modules/config:module/config:type = 'netconf-mapper-aggregator'";
+
+        }
+    }
+
 }
\ No newline at end of file