Merge "Registering Distributed Datastore for SchemaContext changes"

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedConfigDataStoreProviderModule.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedConfigDataStoreProviderModule.java
index ad2fb02a30d3fe332840f6866063882105a7afcf..665cb2d44148a6a3b6bb41d403e54b95cfe45363 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedConfigDataStoreProviderModule.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedConfigDataStoreProviderModule.java
@@ -25,6 +25,7 @@ public class DistributedConfigDataStoreProviderModule extends org.opendaylight.c
 
 
       final DistributedDataStore configDatastore = new DistributedDataStore(actorSystem, "config");
+      getSchemaServiceDependency().registerSchemaServiceListener(configDatastore);
 
       final class AutoCloseableDistributedDataStore implements AutoCloseable {
 

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java
index 9e215a436de439975da8544d6dbc882d740764da..e4f30ac723d009f0a23bbf5799bf4ecb2be66a24 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java
@@ -23,6 +23,7 @@ public class DistributedOperationalDataStoreProviderModule extends org.opendayli
     final ActorSystem actorSystem = ActorSystem.create("opendaylight-cluster", ConfigFactory
         .load().getConfig("ODLCluster"));
     final DistributedDataStore operationalStore = new DistributedDataStore(actorSystem, "operational");
+    getSchemaServiceDependency().registerSchemaServiceListener(operationalStore);
 
     final class AutoCloseableDistributedDataStore implements AutoCloseable {
 

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/yang/distributed-datastore-provider.yang b/opendaylight/md-sal/sal-distributed-datastore/src/main/yang/distributed-datastore-provider.yang
index ab824c4479f03e86820c8826f58733effe0f5bfb..5d3758986c40fc8858005aad29cf74f85c9af857 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/yang/distributed-datastore-provider.yang
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/yang/distributed-datastore-provider.yang
@@ -40,6 +40,14 @@ module distributed-datastore-provider {
     augment "/config:modules/config:module/config:configuration" {
         case distributed-config-datastore-provider {
             when "/config:modules/config:module/config:type = 'distributed-config-datastore-provider'";
+            container schema-service {
+                          uses config:service-ref {
+                               refine type {
+                                      mandatory false;
+                                      config:required-identity sal:schema-service;
+                                }
+                          }
+                        }
         }
     }
 
@@ -47,6 +55,14 @@ module distributed-datastore-provider {
         augment "/config:modules/config:module/config:configuration" {
             case distributed-operational-datastore-provider {
                 when "/config:modules/config:module/config:type = 'distributed-operational-datastore-provider'";
+                container schema-service {
+                              uses config:service-ref {
+                                   refine type {
+                                          mandatory false;
+                                          config:required-identity sal:schema-service;
+                                    }
+                              }
+                            }
             }
         }
 }