From: Basheeruddin Ahmed Date: Thu, 26 Jun 2014 12:57:41 +0000 (-0700) Subject: Registering Distributed Datastore for SchemaContext changes X-Git-Tag: release/helium~532^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=2906c8b8fbd35cb606f638e6c3c580d3edea7d11 Registering Distributed Datastore for SchemaContext changes Change-Id: I049291cf528323652c4ea4961a8b45ce59d80f41 Signed-off-by: Basheeruddin Ahmed --- 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 ad2fb02a30..665cb2d441 100644 --- 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 9e215a436d..e4f30ac723 100644 --- 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 ab824c4479..5d3758986c 100644 --- 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; + } + } + } } } }