From 477c26a243acacadcff6233bb3787662a3cd3e21 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Wed, 22 Jul 2015 14:59:20 +0200 Subject: [PATCH] Bug 4035: Extract dom-config from core-api and broker-impl This patch introduces two new artefacts sal-dom-config and sal-dom-broker-config which hosts all config subsystem related MD-SAL DOM Broker implementation. This patch is required for MD-SAL split in order to not have cyclic dependency between controller and md-sal project. Change-Id: Ic93c583c07ae3e088dcf0e74cbdaaf627a8e79f6 Signed-off-by: Tony Tkacik --- .../mdsal/src/main/resources/features.xml | 4 +- opendaylight/md-sal/mdsal-artifacts/pom.xml | 18 +++- opendaylight/md-sal/pom.xml | 6 +- .../md-sal/sal-binding-config/pom.xml | 2 +- opendaylight/md-sal/sal-binding-it/pom.xml | 5 +- .../test/sal/binding/it/TestHelper.java | 18 ++-- .../md-sal/sal-distributed-datastore/pom.xml | 2 +- .../md-sal/sal-dom-broker-config/pom.xml | 82 +++++++++++++++++++ .../md/sal/dom/impl/DomBrokerImplModule.java | 0 .../dom/impl/DomBrokerImplModuleFactory.java | 0 .../dom/impl/DomInmemoryDataBrokerModule.java | 0 .../DomInmemoryDataBrokerModuleFactory.java | 0 .../SchemaServiceImplSingletonModule.java | 0 ...hemaServiceImplSingletonModuleFactory.java | 0 .../pingpong/PingpongDataBrokerModule.java | 0 .../PingpongDataBrokerModuleFactory.java | 0 .../yang/opendaylight-dom-broker-impl.yang | 0 .../yang/opendaylight-pingpong-broker.yang | 0 opendaylight/md-sal/sal-dom-broker/pom.xml | 28 ++----- opendaylight/md-sal/sal-dom-config/pom.xml | 73 +++++++++++++++++ .../opendaylight-config-dom-datastore.yang | 0 .../main/yang/opendaylight-md-sal-common.yang | 0 .../main/yang/opendaylight-md-sal-dom.yang | 0 ...pendaylight-operational-dom-datastore.yang | 0 .../md-sal/sal-inmemory-datastore/pom.xml | 5 ++ .../md-sal/sal-remoterpc-connector/pom.xml | 5 ++ .../netconf/mdsal-netconf-connector/pom.xml | 7 +- 27 files changed, 218 insertions(+), 37 deletions(-) create mode 100644 opendaylight/md-sal/sal-dom-broker-config/pom.xml rename opendaylight/md-sal/{sal-dom-broker => sal-dom-broker-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java (100%) rename opendaylight/md-sal/{sal-dom-broker => sal-dom-broker-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModuleFactory.java (100%) rename opendaylight/md-sal/{sal-dom-broker => sal-dom-broker-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java (100%) rename opendaylight/md-sal/{sal-dom-broker => sal-dom-broker-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModuleFactory.java (100%) rename opendaylight/md-sal/{sal-dom-broker => sal-dom-broker-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java (100%) rename opendaylight/md-sal/{sal-dom-broker => sal-dom-broker-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModuleFactory.java (100%) rename opendaylight/md-sal/{sal-dom-broker => sal-dom-broker-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModule.java (100%) rename opendaylight/md-sal/{sal-dom-broker => sal-dom-broker-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModuleFactory.java (100%) rename opendaylight/md-sal/{sal-dom-broker => sal-dom-broker-config}/src/main/yang/opendaylight-dom-broker-impl.yang (100%) rename opendaylight/md-sal/{sal-dom-broker => sal-dom-broker-config}/src/main/yang/opendaylight-pingpong-broker.yang (100%) create mode 100644 opendaylight/md-sal/sal-dom-config/pom.xml rename opendaylight/md-sal/{sal-dom-spi => sal-dom-config}/src/main/yang/opendaylight-config-dom-datastore.yang (100%) rename opendaylight/md-sal/{sal-dom-api => sal-dom-config}/src/main/yang/opendaylight-md-sal-common.yang (100%) rename opendaylight/md-sal/{sal-dom-api => sal-dom-config}/src/main/yang/opendaylight-md-sal-dom.yang (100%) rename opendaylight/md-sal/{sal-dom-spi => sal-dom-config}/src/main/yang/opendaylight-operational-dom-datastore.yang (100%) diff --git a/features/mdsal/src/main/resources/features.xml b/features/mdsal/src/main/resources/features.xml index 01820510a9..31e1ab2196 100644 --- a/features/mdsal/src/main/resources/features.xml +++ b/features/mdsal/src/main/resources/features.xml @@ -34,11 +34,13 @@ mvn:org.opendaylight.controller/sal-core-spi/${project.version} mvn:org.opendaylight.controller/sal-broker-impl/${project.version} mvn:org.opendaylight.controller/sal-binding-api/${project.version} - mvn:org.opendaylight.controller/sal-binding-config/${project.version} mvn:org.opendaylight.controller/sal-binding-broker-impl/${project.version} mvn:org.opendaylight.controller/sal-binding-util/${project.version} mvn:org.opendaylight.controller/sal-connector-api/${project.version} + mvn:org.opendaylight.controller/sal-dom-config/${project.version} + mvn:org.opendaylight.controller/sal-binding-config/${project.version} mvn:org.opendaylight.controller/sal-inmemory-datastore/${project.version} + mvn:org.opendaylight.controller/sal-dom-broker-config/${project.version} mvn:org.opendaylight.controller/md-sal-config/${mdsal.version}/xml/config diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml index 61ba3cc1a2..cfb1d26954 100644 --- a/opendaylight/md-sal/mdsal-artifacts/pom.xml +++ b/opendaylight/md-sal/mdsal-artifacts/pom.xml @@ -65,22 +65,32 @@ ${project.groupId} - sal-binding-config + sal-binding-util ${project.version} ${project.groupId} - sal-binding-util + sal-connector-api ${project.version} ${project.groupId} - sal-connector-api + sal-inmemory-datastore ${project.version} ${project.groupId} - sal-inmemory-datastore + sal-dom-config + ${project.version} + + + ${project.groupId} + sal-dom-broker-config + ${project.version} + + + ${project.groupId} + sal-binding-config ${project.version} diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 920b066572..8b003b2825 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -29,11 +29,15 @@ sal-binding-api - sal-binding-config sal-binding-broker sal-binding-util + + sal-dom-config + sal-dom-broker-config + sal-binding-config + md-sal-config diff --git a/opendaylight/md-sal/sal-binding-config/pom.xml b/opendaylight/md-sal/sal-binding-config/pom.xml index 12ba3ccaa8..ae9b92431f 100644 --- a/opendaylight/md-sal/sal-binding-config/pom.xml +++ b/opendaylight/md-sal/sal-binding-config/pom.xml @@ -20,7 +20,7 @@ org.opendaylight.controller - sal-core-api + sal-dom-config org.opendaylight.controller diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml index b24470da2c..c5c03f7060 100644 --- a/opendaylight/md-sal/sal-binding-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-it/pom.xml @@ -65,7 +65,10 @@ org.opendaylight.controller sal-binding-config - + + org.opendaylight.controller + sal-dom-broker-config + org.opendaylight.yangtools.thirdparty antlr4-runtime-osgi-nohead diff --git a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java index ae32fa1400..cb9d6c3fa3 100644 --- a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java +++ b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java @@ -93,19 +93,25 @@ public class TestHelper { mavenBundle(YANGTOOLS, "binding-data-codec").versionAsInProject(), mavenBundle(YANGTOOLS + ".thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject(), // // - mavenBundle(CONTROLLER, "sal-core-api").versionAsInProject().update(), // - mavenBundle(CONTROLLER, "sal-binding-api").versionAsInProject(), // // - mavenBundle(CONTROLLER, "sal-binding-config").versionAsInProject(), // - mavenBundle(CONTROLLER, "sal-binding-broker-impl").versionAsInProject(), // // mavenBundle(CONTROLLER, "sal-binding-util").versionAsInProject(), // mavenBundle(CONTROLLER, "sal-common-util").versionAsInProject(), // // - mavenBundle("com.lmax", "disruptor").versionAsInProject(), - mavenBundle(CONTROLLER, "sal-inmemory-datastore").versionAsInProject(), // + mavenBundle(CONTROLLER, "sal-core-api").versionAsInProject().update(), // + mavenBundle(CONTROLLER, "sal-binding-api").versionAsInProject(), // // + + mavenBundle("com.lmax", "disruptor").versionAsInProject(), // mavenBundle(CONTROLLER, "sal-broker-impl").versionAsInProject(), // // + mavenBundle(CONTROLLER, "sal-dom-config").versionAsInProject(), // // + + mavenBundle(CONTROLLER, "sal-inmemory-datastore").versionAsInProject(), // + mavenBundle(CONTROLLER, "sal-dom-broker-config").versionAsInProject(), // // + mavenBundle(CONTROLLER, "sal-core-spi").versionAsInProject().update(), // + mavenBundle(CONTROLLER, "sal-binding-broker-impl").versionAsInProject(), // // + mavenBundle(CONTROLLER, "sal-binding-config").versionAsInProject(), // + systemProperty("netconf.config.persister.active").value("1"), // systemProperty("netconf.config.persister.1.storageAdapterClass").value( "org.opendaylight.controller.config.persist.storage.file.xml.XmlFileStorageAdapter"), // diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml index 6a86b86522..14f530213b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml +++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml @@ -126,7 +126,7 @@ org.opendaylight.controller - sal-broker-impl + sal-dom-broker-config diff --git a/opendaylight/md-sal/sal-dom-broker-config/pom.xml b/opendaylight/md-sal/sal-dom-broker-config/pom.xml new file mode 100644 index 0000000000..601743b5cf --- /dev/null +++ b/opendaylight/md-sal/sal-dom-broker-config/pom.xml @@ -0,0 +1,82 @@ + + + 4.0.0 + + org.opendaylight.controller + sal-parent + 1.3.0-SNAPSHOT + + sal-dom-broker-config + bundle + + + + org.opendaylight.controller + config-api + + + org.opendaylight.controller + sal-dom-config + + + org.opendaylight.controller + sal-broker-impl + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + + {local-packages}, + org.opendaylight.controller.config.yang.md.sal.dom.impl, + org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.dom.impl.* + + + + + + org.opendaylight.yangtools + yang-maven-plugin + + + + generate-sources + + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + ${jmxGeneratorPath} + + urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + + + org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl + target/site/models + + + true + + + + + + + + scm:git:http://git.opendaylight.org/gerrit/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + HEAD + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + + diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java rename to opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModuleFactory.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModuleFactory.java rename to opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModuleFactory.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java rename to opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModuleFactory.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModuleFactory.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModuleFactory.java rename to opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModuleFactory.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java rename to opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModuleFactory.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModuleFactory.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModuleFactory.java rename to opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModuleFactory.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModule.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModule.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModule.java rename to opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModule.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModuleFactory.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModuleFactory.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModuleFactory.java rename to opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModuleFactory.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/yang/opendaylight-dom-broker-impl.yang b/opendaylight/md-sal/sal-dom-broker-config/src/main/yang/opendaylight-dom-broker-impl.yang similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/yang/opendaylight-dom-broker-impl.yang rename to opendaylight/md-sal/sal-dom-broker-config/src/main/yang/opendaylight-dom-broker-impl.yang diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/yang/opendaylight-pingpong-broker.yang b/opendaylight/md-sal/sal-dom-broker-config/src/main/yang/opendaylight-pingpong-broker.yang similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/yang/opendaylight-pingpong-broker.yang rename to opendaylight/md-sal/sal-dom-broker-config/src/main/yang/opendaylight-pingpong-broker.yang diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml index 84e19042f6..17d45ff648 100644 --- a/opendaylight/md-sal/sal-dom-broker/pom.xml +++ b/opendaylight/md-sal/sal-dom-broker/pom.xml @@ -18,10 +18,6 @@ com.lmax disruptor - - org.opendaylight.controller - config-api - org.opendaylight.controller sal-common-impl @@ -92,28 +88,18 @@ ${project.groupId}.${project.artifactId} org.opendaylight.controller.sal.dom.broker.osgi.SchemaServiceActivator - org.opendaylight.controller.sal.dom.broker.spi, - - + + + org.opendaylight.controller.sal.dom.broker, org.opendaylight.controller.sal.dom.broker.impl, - org.opendaylight.controller.sal.dom.broker.impl.*, - - - org.opendaylight.controller.md.sal.dom.broker.impl, - org.opendaylight.controller.md.sal.dom.broker.impl.jmx, - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.dom.impl.rev131028.*, - - org.opendaylight.controller.sal.dom.broker, org.opendaylight.controller.sal.dom.broker.osgi, org.opendaylight.controller.sal.dom.broker.util, - org.opendaylight.controller.config.yang.md.sal.dom.impl, - org.opendaylight.controller.config.yang.md.sal.dom.pingpong, - org.opendaylight.controller.config.yang.md.sal.dom.statistics,\ + org.opendaylight.controller.sal.dom.broker.spi, + + org.opendaylight.controller.md.sal.dom.broker.impl, org.opendaylight.controller.md.sal.dom.broker.impl.*, - org.opendaylight.yangtools.yang.util, - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.dom.pingpong.rev141107.* - + * diff --git a/opendaylight/md-sal/sal-dom-config/pom.xml b/opendaylight/md-sal/sal-dom-config/pom.xml new file mode 100644 index 0000000000..79ad948d05 --- /dev/null +++ b/opendaylight/md-sal/sal-dom-config/pom.xml @@ -0,0 +1,73 @@ + + + 4.0.0 + + org.opendaylight.controller + sal-parent + 1.3.0-SNAPSHOT + + sal-dom-config + bundle + + + + org.opendaylight.controller + config-api + + + org.opendaylight.controller + sal-core-api + + + org.opendaylight.controller + sal-core-spi + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + org.opendaylight.yangtools + yang-maven-plugin + + + + generate-sources + + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + ${jmxGeneratorPath} + + urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + + + org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl + target/site/models + + + true + + + + + + + + scm:git:http://git.opendaylight.org/gerrit/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + HEAD + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + + diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/yang/opendaylight-config-dom-datastore.yang b/opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-config-dom-datastore.yang similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/yang/opendaylight-config-dom-datastore.yang rename to opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-config-dom-datastore.yang diff --git a/opendaylight/md-sal/sal-dom-api/src/main/yang/opendaylight-md-sal-common.yang b/opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-md-sal-common.yang similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/yang/opendaylight-md-sal-common.yang rename to opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-md-sal-common.yang diff --git a/opendaylight/md-sal/sal-dom-api/src/main/yang/opendaylight-md-sal-dom.yang b/opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-md-sal-dom.yang similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/yang/opendaylight-md-sal-dom.yang rename to opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-md-sal-dom.yang diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/yang/opendaylight-operational-dom-datastore.yang b/opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-operational-dom-datastore.yang similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/yang/opendaylight-operational-dom-datastore.yang rename to opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-operational-dom-datastore.yang diff --git a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml index a152de96f9..a1ba2ecdd6 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml +++ b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml @@ -81,6 +81,11 @@ yang-parser-impl + + org.opendaylight.controller + sal-dom-config + + org.osgi org.osgi.core diff --git a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml index 098ea2dab7..3115793f8c 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml +++ b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml @@ -68,6 +68,11 @@ org.opendaylight.controller sal-core-spi + + org.opendaylight.controller + sal-dom-config + + org.opendaylight.controller sal-common-impl diff --git a/opendaylight/netconf/mdsal-netconf-connector/pom.xml b/opendaylight/netconf/mdsal-netconf-connector/pom.xml index 14b0b69dfe..31d2e7c1b3 100644 --- a/opendaylight/netconf/mdsal-netconf-connector/pom.xml +++ b/opendaylight/netconf/mdsal-netconf-connector/pom.xml @@ -47,10 +47,15 @@ org.opendaylight.yangtools object-cache-noop - + org.opendaylight.controller sal-core-api + + org.opendaylight.controller + sal-dom-config + + org.opendaylight.controller commons.logback_settings -- 2.36.6