From fafef4045d0c3bb6923194dc8c6d68fdae932ce1 Mon Sep 17 00:00:00 2001
From: Tony Tkacik <ttkacik@cisco.com>
Date: Wed, 2 Sep 2015 16:13:29 +0200
Subject: [PATCH] Migration to use MD-SAL Project

Change-Id: Iafdfbcf553978717be7ec80b488f94b64f688eea
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
---
 features/netconf-connector/pom.xml            | 69 +++++++++------
 .../src/main/resources/features.xml           | 14 +--
 features/netconf/pom.xml                      |  5 +-
 .../netconf/src/main/resources/features.xml   |  7 +-
 features/pom.xml                              |  2 +-
 features/restconf/pom.xml                     | 34 +------
 .../restconf/src/main/resources/features.xml  | 88 ++-----------------
 karaf/pom.xml                                 |  2 +-
 .../netconf/config-netconf-connector/pom.xml  |  4 +-
 .../netconf/mdsal-netconf-monitoring/pom.xml  |  2 +-
 .../models/ietf-netconf-monitoring/pom.xml    |  4 +-
 .../models/ietf-netconf-notifications/pom.xml |  2 +-
 .../netconf/models/ietf-netconf/pom.xml       |  2 +-
 opendaylight/netconf/netconf-api/pom.xml      |  4 +-
 opendaylight/netconf/netconf-impl/pom.xml     |  2 +-
 .../netconf/netconf-monitoring/pom.xml        |  2 +-
 .../netconf-notifications-impl/pom.xml        | 10 +--
 opendaylight/netconf/netconf-ssh/pom.xml      |  2 +-
 opendaylight/netconf/pom.xml                  | 33 ++-----
 .../netconf/sal-netconf-connector/pom.xml     | 10 +--
 .../netconf/tools/netconf-cli/pom.xml         |  2 +-
 .../netconf/tools/netconf-testtool/pom.xml    |  4 +-
 opendaylight/netconf/tools/pom.xml            |  2 +-
 opendaylight/restconf/pom.xml                 | 27 +-----
 .../restconf/sal-rest-connector/pom.xml       |  6 +-
 .../restconf/sal-rest-docgen-maven/pom.xml    |  2 +-
 pom.xml                                       | 57 +++++++++++-
 27 files changed, 161 insertions(+), 237 deletions(-)

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 2b0bf7d0fe..66c248a95d 100644
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -13,6 +13,7 @@
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
+    <!-- FIXME: Convert to features-parent -->
    <artifactId>features-netconf-connector</artifactId>
 
    <packaging>jar</packaging>
@@ -21,32 +22,48 @@
    </properties>
    <dependencies>
     <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>features-yangtools</artifactId>
-          <version>${yangtools.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>features-mdsal</artifactId>
-          <version>${mdsal.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>features-netconf</artifactId>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.aaa</groupId>
-          <artifactId>features-aaa</artifactId>
-          <version>${aaa.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>features-yangtools</artifactId>
+      <version>${yangtools.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>features-mdsal</artifactId>
+      <version>${mdsal.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>features-mdsal-model</artifactId>
+      <version>${mdsal.model.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-mdsal</artifactId>
+      <version>${controller.mdsal.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>features-netconf</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.aaa</groupId>
+      <artifactId>features-aaa</artifactId>
+      <version>${aaa.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>sal-netconf-connector</artifactId>
diff --git a/features/netconf-connector/src/main/resources/features.xml b/features/netconf-connector/src/main/resources/features.xml
index dd6d60541f..eb8daa622e 100644
--- a/features/netconf-connector/src/main/resources/features.xml
+++ b/features/netconf-connector/src/main/resources/features.xml
@@ -10,7 +10,9 @@
 <features name="odl-controller-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-    <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
+
+    <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-mdsal/${controller.mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netconf/features-netconf/${netconf.version}/xml/features</repository>
 
@@ -22,17 +24,17 @@
     <feature name='odl-message-bus' version='${project.version}'>
         <!-- messagebus endpoint for netconf connector-->
         <feature version='${project.version}'>odl-netconf-connector-all</feature>
-        <feature version='${mdsal.version}'>odl-message-bus-collector</feature>
+        <feature version='${controller.mdsal.version}'>odl-message-bus-collector</feature>
         <bundle>mvn:org.opendaylight.netconf/messagebus-netconf/${netconf.version}</bundle>
         <configfile finalname="${config.configfile.directory}/06-message-netconf.xml">mvn:org.opendaylight.netconf/messagebus-netconf/${netconf.version}/xml/config</configfile>
     </feature>
 
     <feature name='odl-netconf-connector' version='${project.version}' description="OpenDaylight :: Netconf Connector :: Netconf Connector">
-        <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+        <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
         <feature version='${netconf.version}'>odl-netconf-client</feature>
-        <feature version='${yangtools.version}'>odl-yangtools-models</feature>
-        <bundle>mvn:org.opendaylight.netconf/sal-netconf-connector/${mdsal.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller.model/model-inventory/${mdsal.version}</bundle>
+        <feature version='${yangtools.version}'>odl-mdsal-models</feature>
+        <bundle>mvn:org.opendaylight.netconf/sal-netconf-connector/${controller.mdsal.version}</bundle>
+        <bundle>mvn:org.opendaylight.controller.model/model-inventory/${controller.mdsal.version}</bundle>
     </feature>
 
     <feature name='odl-netconf-connector-ssh' version='${project.version}' description="OpenDaylight :: Netconf Connector :: Netconf Connector + Netconf SSH Server + loopback connection configuration">
diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 4f7dbecdd4..5431973946 100644
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -7,6 +7,7 @@
     <version>1.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
+  <!-- FIXME: Convert to features-parent -->
   <artifactId>features-netconf</artifactId>
 
   <packaging>jar</packaging>
@@ -86,11 +87,11 @@
       <artifactId>ietf-netconf-notifications</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-yang-types</artifactId>
     </dependency>
       <dependency>
diff --git a/features/netconf/src/main/resources/features.xml b/features/netconf/src/main/resources/features.xml
index 0db66c6d0a..13794e789b 100644
--- a/features/netconf/src/main/resources/features.xml
+++ b/features/netconf/src/main/resources/features.xml
@@ -24,6 +24,7 @@
 
   <feature name='odl-netconf-api' version='${project.version}' description="OpenDaylight :: Netconf :: API">
     <feature version='${protocol-framework.version}'>odl-protocol-framework</feature>
+    <!-- FIXME: Reference YANGTools via feateure instead of bundles -->
     <bundle>mvn:org.opendaylight.yangtools/yang-model-api/${yangtools.version}</bundle>
     <bundle>mvn:org.opendaylight.controller/config-util/${config.version}</bundle>
     <bundle>mvn:org.opendaylight.netconf/netconf-api/${project.version}</bundle>
@@ -32,9 +33,9 @@
     <bundle>mvn:org.opendaylight.netconf/ietf-netconf/${project.version}</bundle>
     <bundle>mvn:org.opendaylight.netconf/ietf-netconf-notifications/${project.version}</bundle>
     <bundle>mvn:org.opendaylight.netconf/ietf-netconf-monitoring-extension/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.yangtools.model/ietf-inet-types/${ietf-inet-types.version}</bundle>
-    <bundle>mvn:org.opendaylight.yangtools.model/ietf-yang-types/${ietf-yang-types.version}</bundle>
-    <bundle>mvn:org.opendaylight.yangtools.model/ietf-yang-types-20130715/2013.07.15.8-SNAPSHOT</bundle>
+    <bundle>mvn:org.opendaylight.mdsal.model/ietf-inet-types/${ietf-inet-types.version}</bundle>
+    <bundle>mvn:org.opendaylight.mdsal.model/ietf-yang-types/${ietf-yang-types.version}</bundle>
+    <bundle>mvn:org.opendaylight.mdsal.model/ietf-yang-types-20130715/2013.07.15.8-SNAPSHOT</bundle>
   </feature>
 
   <feature name='odl-netconf-mapping-api' version='${project.version}' description="OpenDaylight :: Netconf :: Mapping API">
diff --git a/features/pom.xml b/features/pom.xml
index ee7c2c66fd..4fb561a3a3 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -34,7 +34,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index 2f9e6043ed..5a05198b0d 100644
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -13,6 +13,7 @@
     <version>1.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
    </parent>
+   <!-- FIXME: Convert to features-parent -->
    <!--
     Necessary TODO: Hookup your parent pom here, else you will not get necessary versions,
     maven repos etc.  If you run this archetype in a subdirectory of your project, it
@@ -106,7 +107,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-mdsal</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -217,37 +218,6 @@
         <artifactId>yang-data-codec-gson</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.opendaylight.controller.samples</groupId>
-      <artifactId>clustering-it-model</artifactId>
-      <version>${mdsal.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller.samples</groupId>
-      <artifactId>clustering-it-provider</artifactId>
-      <version>${mdsal.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller.samples</groupId>
-      <artifactId>clustering-it-config</artifactId>
-      <version>${mdsal.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller.samples</groupId>
-      <artifactId>clustering-it-config</artifactId>
-      <version>${mdsal.version}</version>
-      <type>xml</type>
-      <classifier>testmoduleshardconf</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller.samples</groupId>
-      <artifactId>clustering-it-config</artifactId>
-      <version>${mdsal.version}</version>
-      <type>xml</type>
-      <classifier>testmoduleconf</classifier>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>sal-rest-docgen</artifactId>
diff --git a/features/restconf/src/main/resources/features.xml b/features/restconf/src/main/resources/features.xml
index 4ac4592000..269525826c 100644
--- a/features/restconf/src/main/resources/features.xml
+++ b/features/restconf/src/main/resources/features.xml
@@ -10,90 +10,25 @@
 <features name="odl-controller-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-    <!--
-        Necessary TODO: Please read the features guidelines:
-        https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Feature_Best_Practices
-    -->
-    <!--
-    Necessary TODO: Add repo entries for the repositories of features you refer to
-        in this feature file but do not define here.
-        Examples:
-            <repository>mvn:org.opendaylight.yangtools/features-yangtools/0.8.0-SNAPSHOT/xml/features</repository>
-            <repository>mvn:org.opendaylight.controller/features-mdsal/1.3.0-SNAPSHOT/xml/features</repository>
-            <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.2.0-SNAPSHOT/xml/features</repository>
-    -->
-    <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
+
+    <repository>mvn:org.opendaylight.controller/features-mdsal/${controller.mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.aaa/features-aaa/${aaa.version}/xml/features</repository>
     <feature name='odl-restconf-all' version='${project.version}' description='OpenDaylight :: Restconf :: All'>
-        <!--
-            Necessary TODO:
-            List all of the user consumable features you define in this feature file here.
-            Generally you would *not* list individual bundles here, but only features defined in *this* file.
-            It is useful to list them in the same order they occur in the file.
-
-            Examples:
-            <feature version='${project.version}'>odl-controller-provider</feature>
-            <feature version='${project.version}'>odl-controller-model</feature>
-        -->
         <feature version='${project.version}'>odl-restconf</feature>
         <feature version='${project.version}'>odl-mdsal-apidocs</feature>
     </feature>
-    <!--
-        Necessary TODO: Define your features.  It is useful to list then in order of dependency.  So if A depends on B, list A first.
-        When naming your features please be mindful of the guidelines:
-            https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines
-        Particularly:
-            a) Prefixing names with 'odl-': https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Feature_Naming
-            b) Descriptions: https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Description
-            c) Avoid start-levels: https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Avoid_start-levels
-
-        It's also nice to list inside a feature, first the features it needs, then the bundles it needs, then the configfiles.
-        Examples:
-
-        * Basic MD-SAL Provider
-        <feature name='odl-controller-provider' version='${project.version}' description='OpenDaylight :: controller :: Provider '>
-            <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</feature>
-            <feature version='${project.version}'>odl-controller-model</feature>
-            <bundle>mvn:org.opendaylight.controller/controller-provider/${project.version}</bundle>
-            ... whatever other bundles you need
-        </feature>
-
-        * Basic MD-SAL Model feature
-        <feature name='odl-controller-model' version='${project.version}' description='OpenDaylight :: controller :: Model'>
-            <feature version='0.8.0-SNAPSHOT'>odl-yangtools-binding</feature>
-            <feature version='0.8.0-SNAPSHOT'>odl-yangtools-models</feature>
-            <bundle>mvn:org.opendaylight.controller/controller-model/${project.version}</bundle>
-            ... whatever other bundles you need
-        </feature>
-
-        * Config Subsystem example - the config file is your config subsystem configuration
-        <feature name='odl-controller-provider' version='${project.version}' description='OpenDaylight :: controller :: Provider'>
-            <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</feature>
-            <bundle>mvn:org.opendaylight.controller/controller-provider/${project.version}</bundle>
-            <configfile finalname="etc/opendaylight/karaf/80-controller.xml">mvn:org.opendaylight.controller/controller-config/${project.version}/xml/config</configfile>
-            ... whatever other bundles you need
-        </feature>
-
-        * Basic MD-SAL Provider that uses openflowplugin-flow-services (which brings along odl-mdsal-broker)
-        <feature name='odl-controller-provider' version='${project.version}' description='OpenDaylight :: controller :: Provider'>
-            <feature version='0.2.0-SNAPSHOT'>odl-openflowplugin-flow-services</feature>
-            <bundle>mvn:org.opendaylight.controller/controller-provider/${project.version}</bundle>
-            ... whatever other bundles you need
-        </feature>
-
-    -->
 
     <feature name='odl-restconf' version='${project.version}' description="OpenDaylight :: Restconf">
         <feature version='${aaa.version}'>odl-aaa-authn</feature>
         <feature version='${project.version}'>odl-restconf-noauth</feature>
     </feature>
     <feature name='odl-restconf-noauth' version='${project.version}' description="OpenDaylight :: Restconf">
-        <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+        <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
         <feature>war</feature>
         <!-- presently we need sal-remote to be listed BEFORE sal-rest-connector because sal-rest-connector
              has a yang file which augments a yang file in sal-remote, and order seems to matter -->
-        <bundle>mvn:org.opendaylight.controller/sal-remote/${mdsal.version}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-remote/${controller.mdsal.version}</bundle>
         <bundle>mvn:org.opendaylight.netconf/sal-rest-connector/${project.version}</bundle>
         <bundle>mvn:com.google.code.gson/gson/${gson.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-codec-gson/${yangtools.version}</bundle>
@@ -107,7 +42,7 @@
         <bundle>mvn:io.netty/netty-common/${netty.version}</bundle>
         <bundle>mvn:io.netty/netty-handler/${netty.version}</bundle>
         <bundle>mvn:io.netty/netty-transport/${netty.version}</bundle>
-        <configfile finalname="${config.configfile.directory}/${config.restconf.configfile}">mvn:org.opendaylight.controller/sal-rest-connector-config/${mdsal.version}/xml/config</configfile>
+        <configfile finalname="${config.configfile.directory}/${config.restconf.configfile}">mvn:org.opendaylight.netconf/sal-rest-connector-config/${project.version}/xml/config</configfile>
     </feature>
     <feature name ='odl-mdsal-apidocs' version='${project.version}' description="OpenDaylight :: MDSAL :: APIDOCS">
         <feature version='${project.version}'>odl-restconf</feature>
@@ -125,17 +60,4 @@
         <bundle>wrap:mvn:org.json/json/${org.json.version}</bundle>
     </feature>
 
-    <!--TODO move this into md-sal features if possible-->
-    <!--<feature name='odl-toaster-rest' version='${project.version}'>-->
-        <!--<feature version='${project.version}'>odl-restconf</feature>-->
-        <!--<feature version='${mdsal.version}'>odl-toaster</feature>-->
-    <!--</feature>-->
-
-    <!--<feature name='odl-toaster-ui' version='${project.version}'>-->
-        <!--<feature version='${project.version}'>odl-mdsal-apidocs</feature>-->
-        <!--<feature version='${mdsal.version}'>odl-mdsal-xsql</feature>-->
-        <!--<feature version='${project.version}'>odl-toaster-rest</feature>-->
-    <!--</feature>-->
-    <!-- Optional TODO: Remove TODO Comments -->
-
 </features>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 93332aabc4..81b9bad6c2 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>features-netconf-connector</artifactId>
-      <version>${restconf.version}</version>
+      <version>${netconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
diff --git a/opendaylight/netconf/config-netconf-connector/pom.xml b/opendaylight/netconf/config-netconf-connector/pom.xml
index b07e9ae51b..019202242a 100644
--- a/opendaylight/netconf/config-netconf-connector/pom.xml
+++ b/opendaylight/netconf/config-netconf-connector/pom.xml
@@ -63,8 +63,8 @@
       <artifactId>mockito-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>binding-generator-impl</artifactId>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-generator-impl</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/opendaylight/netconf/mdsal-netconf-monitoring/pom.xml b/opendaylight/netconf/mdsal-netconf-monitoring/pom.xml
index 6505abd41c..fb1cf5a0e6 100644
--- a/opendaylight/netconf/mdsal-netconf-monitoring/pom.xml
+++ b/opendaylight/netconf/mdsal-netconf-monitoring/pom.xml
@@ -43,7 +43,7 @@
       <artifactId>mockito-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
     </dependency>
     <dependency>
diff --git a/opendaylight/netconf/models/ietf-netconf-monitoring/pom.xml b/opendaylight/netconf/models/ietf-netconf-monitoring/pom.xml
index ffb93bb2f1..0d889ac85d 100644
--- a/opendaylight/netconf/models/ietf-netconf-monitoring/pom.xml
+++ b/opendaylight/netconf/models/ietf-netconf-monitoring/pom.xml
@@ -17,11 +17,11 @@
       <artifactId>guava</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-yang-types</artifactId>
     </dependency>
     <dependency>
diff --git a/opendaylight/netconf/models/ietf-netconf-notifications/pom.xml b/opendaylight/netconf/models/ietf-netconf-notifications/pom.xml
index ef410d8f0b..aa4ee271d6 100644
--- a/opendaylight/netconf/models/ietf-netconf-notifications/pom.xml
+++ b/opendaylight/netconf/models/ietf-netconf-notifications/pom.xml
@@ -28,7 +28,7 @@
       <artifactId>ietf-netconf</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-yang-types</artifactId>
     </dependency>
     <dependency>
diff --git a/opendaylight/netconf/models/ietf-netconf/pom.xml b/opendaylight/netconf/models/ietf-netconf/pom.xml
index 449f3e8d01..cdf9efc7e7 100644
--- a/opendaylight/netconf/models/ietf-netconf/pom.xml
+++ b/opendaylight/netconf/models/ietf-netconf/pom.xml
@@ -25,7 +25,7 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
         <dependency>
diff --git a/opendaylight/netconf/netconf-api/pom.xml b/opendaylight/netconf/netconf-api/pom.xml
index 694cf9bce3..ebc626c104 100644
--- a/opendaylight/netconf/netconf-api/pom.xml
+++ b/opendaylight/netconf/netconf-api/pom.xml
@@ -33,11 +33,11 @@
       <artifactId>protocol-framework</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-yang-types</artifactId>
     </dependency>
   </dependencies>
diff --git a/opendaylight/netconf/netconf-impl/pom.xml b/opendaylight/netconf/netconf-impl/pom.xml
index 0f4512449a..0c46217315 100644
--- a/opendaylight/netconf/netconf-impl/pom.xml
+++ b/opendaylight/netconf/netconf-impl/pom.xml
@@ -68,7 +68,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
     </dependency>
 
diff --git a/opendaylight/netconf/netconf-monitoring/pom.xml b/opendaylight/netconf/netconf-monitoring/pom.xml
index 3ae4e471ca..cb22568a2c 100644
--- a/opendaylight/netconf/netconf-monitoring/pom.xml
+++ b/opendaylight/netconf/netconf-monitoring/pom.xml
@@ -35,7 +35,7 @@
       <artifactId>mockito-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
     </dependency>
     <dependency>
diff --git a/opendaylight/netconf/netconf-notifications-impl/pom.xml b/opendaylight/netconf/netconf-notifications-impl/pom.xml
index 6eadf37bad..b0c2d0b8eb 100644
--- a/opendaylight/netconf/netconf-notifications-impl/pom.xml
+++ b/opendaylight/netconf/netconf-notifications-impl/pom.xml
@@ -29,12 +29,12 @@
             <artifactId>netconf-util</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>binding-generator-impl</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-generator-impl</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>binding-data-codec</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-dom-codec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -68,4 +68,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/opendaylight/netconf/netconf-ssh/pom.xml b/opendaylight/netconf/netconf-ssh/pom.xml
index 6941ce8615..265c3d6959 100644
--- a/opendaylight/netconf/netconf-ssh/pom.xml
+++ b/opendaylight/netconf/netconf-ssh/pom.xml
@@ -37,7 +37,7 @@
       </dependency>
 
       <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
     </dependency>
     <dependency>
diff --git a/opendaylight/netconf/pom.xml b/opendaylight/netconf/pom.xml
index cf719572ac..1dc83d8733 100644
--- a/opendaylight/netconf/pom.xml
+++ b/opendaylight/netconf/pom.xml
@@ -61,27 +61,6 @@
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.aaa</groupId>
-        <artifactId>aaa-artifacts</artifactId>
-        <version>${aaa.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-artifacts</artifactId>
-        <version>${config.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
@@ -106,27 +85,27 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>messagebus-api</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>messagebus-config</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>messagebus-impl</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>messagebus-spi</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>messagebus-util</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
       </dependency>
 
       <dependency>
@@ -145,7 +124,7 @@
         <version>${exi.nagasena.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
+        <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>maven-sal-api-gen-plugin</artifactId>
         <version>${yangtools.version}</version>
       </dependency>
diff --git a/opendaylight/netconf/sal-netconf-connector/pom.xml b/opendaylight/netconf/sal-netconf-connector/pom.xml
index baca9d08c3..5dbd9e1d7f 100644
--- a/opendaylight/netconf/sal-netconf-connector/pom.xml
+++ b/opendaylight/netconf/sal-netconf-connector/pom.xml
@@ -12,7 +12,7 @@
   <packaging>bundle</packaging>
 
   <!-- Preserve version from mdsal -->
-  <version>${mdsal.version}</version>
+  <version>${controller.mdsal.version}</version>
 
   <dependencies>
     <dependency>
@@ -56,8 +56,8 @@
       <artifactId>sal-binding-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>binding-generator-impl</artifactId>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-generator-impl</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -72,7 +72,7 @@
       <artifactId>model-inventory</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-topology</artifactId>
     </dependency>
     <dependency>
@@ -88,7 +88,7 @@
       <artifactId>yang-parser-impl</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
     </dependency>
     <dependency>
diff --git a/opendaylight/netconf/tools/netconf-cli/pom.xml b/opendaylight/netconf/tools/netconf-cli/pom.xml
index 423484008b..cfe1f994d4 100644
--- a/opendaylight/netconf/tools/netconf-cli/pom.xml
+++ b/opendaylight/netconf/tools/netconf-cli/pom.xml
@@ -69,7 +69,7 @@
       <artifactId>netconf-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>yang-binding</artifactId>
     </dependency>
     <dependency>
diff --git a/opendaylight/netconf/tools/netconf-testtool/pom.xml b/opendaylight/netconf/tools/netconf-testtool/pom.xml
index 2516e0e96a..c3fccc2f21 100644
--- a/opendaylight/netconf/tools/netconf-testtool/pom.xml
+++ b/opendaylight/netconf/tools/netconf-testtool/pom.xml
@@ -101,11 +101,11 @@
             <artifactId>netconf-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-yang-types</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
         <dependency>
diff --git a/opendaylight/netconf/tools/pom.xml b/opendaylight/netconf/tools/pom.xml
index d5039615ea..aa346861bc 100644
--- a/opendaylight/netconf/tools/pom.xml
+++ b/opendaylight/netconf/tools/pom.xml
@@ -37,7 +37,7 @@
           <version>${yangtools.version}</version>
           <dependencies>
             <dependency>
-              <groupId>org.opendaylight.yangtools</groupId>
+              <groupId>org.opendaylight.mdsal</groupId>
               <artifactId>maven-sal-api-gen-plugin</artifactId>
               <version>${yangtools.version}</version>
             </dependency>
diff --git a/opendaylight/restconf/pom.xml b/opendaylight/restconf/pom.xml
index f28fe17239..6c4cbc47de 100644
--- a/opendaylight/restconf/pom.xml
+++ b/opendaylight/restconf/pom.xml
@@ -18,33 +18,15 @@
         <module>sal-rest-connector-config</module>
         <module>sal-rest-docgen</module>
         <module>sal-rest-docgen-maven</module>
+        <!--
+        FIXME: Needs to be reimplemented to not use YANGTools restconf impl
         <module>sal-restconf-broker</module>
+        -->
         <module>restconf-artifacts</module>
     </modules>
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>config-artifacts</artifactId>
-                <version>${config.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>${mdsal.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>${yangtools.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>restconf-artifacts</artifactId>
@@ -52,7 +34,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-core</artifactId>
@@ -66,7 +47,7 @@
                 <version>2.4</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
+                <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>maven-sal-api-gen-plugin</artifactId>
                 <version>${yangtools.version}</version>
             </dependency>
diff --git a/opendaylight/restconf/sal-rest-connector/pom.xml b/opendaylight/restconf/sal-rest-connector/pom.xml
index daf3a282bb..cf10586053 100644
--- a/opendaylight/restconf/sal-rest-connector/pom.xml
+++ b/opendaylight/restconf/sal-rest-connector/pom.xml
@@ -67,15 +67,15 @@
       <artifactId>yang-parser-impl</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-restconf</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-yang-types-20130715</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
     </dependency>
     <dependency>
diff --git a/opendaylight/restconf/sal-rest-docgen-maven/pom.xml b/opendaylight/restconf/sal-rest-docgen-maven/pom.xml
index e3f40a2686..e3cf496e12 100644
--- a/opendaylight/restconf/sal-rest-docgen-maven/pom.xml
+++ b/opendaylight/restconf/sal-rest-docgen-maven/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-rest-docgen</artifactId>
-            <version>${mdsal.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
diff --git a/pom.xml b/pom.xml
index bba7c8bdb3..3f14c6fa98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,10 @@
         <ietf-topology.version>2013.10.21.8-SNAPSHOT</ietf-topology.version>
         <ietf-yang-types.version>2010.09.24.8-SNAPSHOT</ietf-yang-types.version>
         <jersey-servlet.version>1.17</jersey-servlet.version>
-        <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+
+        <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
+        <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
+        <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
         <netconf.version>1.0.0-SNAPSHOT</netconf.version>
         <restconf.version>1.3.0-SNAPSHOT</restconf.version>
         <protocol-framework.version>0.7.0-SNAPSHOT</protocol-framework.version>
@@ -54,6 +57,54 @@
 
     </properties>
 
+
+    <dependencyManagement>
+      <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yangtools-artifacts</artifactId>
+            <version>${yangtools.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.mdsal</groupId>
+          <artifactId>mdsal-artifacts</artifactId>
+          <version>${mdsal.version}</version>
+          <type>pom</type>
+          <scope>import</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.mdsal.model</groupId>
+          <artifactId>mdsal-model-artifacts</artifactId>
+          <version>${mdsal.model.version}</version>
+          <type>pom</type>
+          <scope>import</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.aaa</groupId>
+          <artifactId>aaa-artifacts</artifactId>
+          <version>${aaa.version}</version>
+          <type>pom</type>
+          <scope>import</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>config-artifacts</artifactId>
+          <version>${config.version}</version>
+          <type>pom</type>
+          <scope>import</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>mdsal-artifacts</artifactId>
+          <version>${controller.mdsal.version}</version>
+          <type>pom</type>
+          <scope>import</scope>
+        </dependency>
+      </dependencies>
+    </dependencyManagement>
+
     <build>
         <pluginManagement>
             <plugins>
@@ -130,13 +181,13 @@
                             <version>${config.version}</version>
                         </dependency>
                         <dependency>
-                            <groupId>org.opendaylight.yangtools</groupId>
+                            <groupId>org.opendaylight.mdsal</groupId>
                             <artifactId>maven-sal-api-gen-plugin</artifactId>
                             <version>${yangtools.version}</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
-                            <groupId>org.opendaylight.yangtools</groupId>
+                            <groupId>org.opendaylight.mdsal</groupId>
                             <artifactId>yang-binding</artifactId>
                             <version>${yangtools.version}</version>
                             <type>jar</type>
-- 
2.36.6