From 27e4870b6255477b0c69fd2a1b5dbe207ea4c154 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: Ic7185f1fe85b53fe00b29c1023762d704cd3e51a
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
---
 commons/binding-parent/pom.xml          |  5 +++--
 commons/config-parent/pom.xml           | 26 ++++++++++++++++++------
 features/pom.xml                        |  9 +++++++++
 features/src/main/features/features.xml |  3 ++-
 fibmanager/fibmanager-api/pom.xml       | 18 ++++++-----------
 idmanager/idmanager-api/pom.xml         |  4 +---
 interfacemgr/interfacemgr-api/pom.xml   | 27 ++++++++-----------------
 interfacemgr/interfacemgr-impl/pom.xml  |  3 +--
 model-bgp/pom.xml                       | 10 +++------
 nexthopmgr/nexthopmgr-api/pom.xml       | 21 +++++++------------
 vpnmanager/vpnmanager-api/pom.xml       | 19 ++++++-----------
 11 files changed, 66 insertions(+), 79 deletions(-)

diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml
index e3308361..e2135c27 100644
--- a/commons/binding-parent/pom.xml
+++ b/commons/binding-parent/pom.xml
@@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <groupId>org.opendaylight.yangtools</groupId>
+    <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
     <version>0.8.0-SNAPSHOT</version>
     <relativePath/>
@@ -28,7 +28,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <iana.if.type.version>2014.05.08.8-SNAPSHOT</iana.if.type.version>
     <yang.ext.version>2013.09.07.8-SNAPSHOT</yang.ext.version>
     <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
-    <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+    <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
+    <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
     <vpns.mdsalutil.version>0.2.0-SNAPSHOT</vpns.mdsalutil.version>
     <model.bgp.version>2013.07.15.8-SNAPSHOT</model.bgp.version>
   </properties>
diff --git a/commons/config-parent/pom.xml b/commons/config-parent/pom.xml
index 22e0307d..0416c9d4 100644
--- a/commons/config-parent/pom.xml
+++ b/commons/config-parent/pom.xml
@@ -24,18 +24,32 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <properties>
     <!-- ODL -->
     <vpnservices.version>0.2.0-SNAPSHOT</vpnservices.version>
-    <ietf.inet.types.version>2010.09.24.8-SNAPSHOT</ietf.inet.types.version>
-    <ietf.yang.types.version>2010.09.24.8-SNAPSHOT</ietf.yang.types.version>
-    <ietf.interfaces.version>2014.05.08.8-SNAPSHOT</ietf.interfaces.version>
-    <iana.if.type.version>2014.05.08.8-SNAPSHOT</iana.if.type.version>
-    <yang.ext.version>2013.09.07.8-SNAPSHOT</yang.ext.version>
     <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
-    <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+    <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
     <vpns.mdsalutil.version>0.2.0-SNAPSHOT</vpns.mdsalutil.version>
     <model.bgp.version>2013.07.15.8-SNAPSHOT</model.bgp.version>
     <openflowplugin.version>0.2.0-SNAPSHOT</openflowplugin.version>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.mdsal.model</groupId>
+        <artifactId>mdsal-model-artifacts</artifactId>
+        <version>0.8.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <!-- Testing Dependencies -->
     <dependency>
diff --git a/features/pom.xml b/features/pom.xml
index 1eb18629..26c591ef 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -25,6 +25,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <openflowplugin.version>0.2.0-SNAPSHOT</openflowplugin.version>
     <restconf.version>1.3.0-SNAPSHOT</restconf.version>
     <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
+    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
     <vpnservices.version>0.2.0-SNAPSHOT</vpnservices.version>
     <mdsalutil.version>${vpnservices.version}</mdsalutil.version>
     <vpnmanager.version>${vpnservices.version}</vpnmanager.version>
@@ -69,6 +70,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <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.openflowplugin</groupId>
       <artifactId>features-openflowplugin</artifactId>
diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 7b5d8d2d..0948fc81 100644
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -12,11 +12,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
   <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
   <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.openflowplugin/features-openflowplugin/${openflowplugin.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.controller/features-restconf/${restconf.version}/xml/features</repository>
   <feature name='odl-vpnservice-api' version='${project.version}' description='OpenDaylight :: vpnservice :: api '>
     <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${yangtools.version}'>odl-yangtools-models</feature>
+    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
     <feature version='${openflowplugin.version}'>odl-openflowplugin-nsf-model</feature>
     <bundle>mvn:org.opendaylight.vpnservice/model-bgp/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.vpnservice/idmanager-api/${idmanager.version}</bundle>
diff --git a/fibmanager/fibmanager-api/pom.xml b/fibmanager/fibmanager-api/pom.xml
index 32548ccd..9f4e754d 100644
--- a/fibmanager/fibmanager-api/pom.xml
+++ b/fibmanager/fibmanager-api/pom.xml
@@ -22,39 +22,33 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>yang-binding</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
-      <version>${ietf.inet.types.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-yang-types</artifactId>
-      <version>${ietf.yang.types.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-interfaces</artifactId>
-      <version>${ietf.interfaces.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>iana-if-type-2014-05-08</artifactId>
-      <version>${iana.if.type.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-inventory</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
diff --git a/idmanager/idmanager-api/pom.xml b/idmanager/idmanager-api/pom.xml
index 54040f4b..7e14a28f 100644
--- a/idmanager/idmanager-api/pom.xml
+++ b/idmanager/idmanager-api/pom.xml
@@ -22,14 +22,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>yang-binding</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/interfacemgr/interfacemgr-api/pom.xml b/interfacemgr/interfacemgr-api/pom.xml
index 56776abb..8c244560 100644
--- a/interfacemgr/interfacemgr-api/pom.xml
+++ b/interfacemgr/interfacemgr-api/pom.xml
@@ -22,44 +22,33 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>yang-binding</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>yang-common</artifactId>
-      <version>${yangtools.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>yang-ext</artifactId>
-      <version>${yang.ext.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
-      <version>${ietf.inet.types.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-yang-types</artifactId>
-      <version>${ietf.yang.types.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-interfaces</artifactId>
-      <version>${ietf.interfaces.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>iana-if-type-2014-05-08</artifactId>
-      <version>${iana.if.type.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-inventory</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.vpnservice</groupId>
@@ -67,4 +56,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${vpns.mdsalutil.version}</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/interfacemgr/interfacemgr-impl/pom.xml b/interfacemgr/interfacemgr-impl/pom.xml
index da429c34..32d1ab6d 100644
--- a/interfacemgr/interfacemgr-impl/pom.xml
+++ b/interfacemgr/interfacemgr-impl/pom.xml
@@ -32,9 +32,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${openflowplugin.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-interfaces</artifactId>
-      <version>${ietf.interfaces.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.vpnservice</groupId>
diff --git a/model-bgp/pom.xml b/model-bgp/pom.xml
index 714b9d07..b8d44000 100644
--- a/model-bgp/pom.xml
+++ b/model-bgp/pom.xml
@@ -26,24 +26,20 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${yangtools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
-            <version>${yangtools.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
-            <version>${ietf.inet.types.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-yang-types</artifactId>
-            <version>${ietf.yang.types.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nexthopmgr/nexthopmgr-api/pom.xml b/nexthopmgr/nexthopmgr-api/pom.xml
index bca8ff0a..7f037d19 100644
--- a/nexthopmgr/nexthopmgr-api/pom.xml
+++ b/nexthopmgr/nexthopmgr-api/pom.xml
@@ -22,44 +22,37 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>yang-binding</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>yang-ext</artifactId>
-      <version>${yang.ext.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
-      <version>${ietf.inet.types.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-yang-types</artifactId>
-      <version>${ietf.yang.types.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-interfaces</artifactId>
-      <version>${ietf.interfaces.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>iana-if-type-2014-05-08</artifactId>
-      <version>${iana.if.type.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-inventory</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/vpnmanager/vpnmanager-api/pom.xml b/vpnmanager/vpnmanager-api/pom.xml
index f6591923..81ee623c 100644
--- a/vpnmanager/vpnmanager-api/pom.xml
+++ b/vpnmanager/vpnmanager-api/pom.xml
@@ -22,39 +22,32 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>yang-binding</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>yang-ext</artifactId>
-      <version>${yang.ext.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
-      <version>${ietf.inet.types.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-yang-types</artifactId>
-      <version>${ietf.yang.types.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-interfaces</artifactId>
-      <version>${ietf.interfaces.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>iana-if-type-2014-05-08</artifactId>
-      <version>${iana.if.type.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.vpnservice</groupId>
-- 
2.36.6