From: guillaume.lambert <guillaume.lambert@orange.com>
Date: Wed, 25 Jul 2018 15:36:17 +0000 (+0200)
Subject: remove rfc8345 dependencies
X-Git-Tag: v0.2.0~25
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F68%2F74468%2F5;p=transportpce.git

remove rfc8345 dependencies

- remove direct dependencies in ordmodels
- remove indirect dependencies inherited from mdsal models in others pom
- repackage correctly ietf-network-* models revision 2015-06-08

JIRA: TRNSPRTPCE-29

Change-Id: Icbf5f9cef59fed6f04c741f2cfb0875f63a82026
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
---

diff --git a/api/src/main/yang/olm@2017-04-18.yang b/api/src/main/yang/olm@2017-04-18.yang
index a0b58126f..541b429cc 100644
--- a/api/src/main/yang/olm@2017-04-18.yang
+++ b/api/src/main/yang/olm@2017-04-18.yang
@@ -8,7 +8,7 @@ module olm {
       revision-date 2017-09-07;
   }
 
-  import old-ietf-network-topology {
+  import ietf-network-topology {
      prefix ietf-network-topology;
      revision-date 2015-06-08;
   }
diff --git a/features/odl-transportpce-api/pom.xml b/features/odl-transportpce-api/pom.xml
index af54d8261..04d5678b8 100644
--- a/features/odl-transportpce-api/pom.xml
+++ b/features/odl-transportpce-api/pom.xml
@@ -37,10 +37,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>odl-mdsal-models</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
+      <artifactId>ietf-inet-types-2013-07-15</artifactId>
+      <version>${netconf.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/features/odl-transportpce-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml
index cd2d5ba0f..8e95a6fad 100644
--- a/features/odl-transportpce-ordmodels/pom.xml
+++ b/features/odl-transportpce-ordmodels/pom.xml
@@ -36,10 +36,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>odl-mdsal-models</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
+      <artifactId>ietf-inet-types-2013-07-15</artifactId>
+      <version>${netconf.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}.ordmodels</groupId>
diff --git a/features/odl-transportpce-stubmodels/pom.xml b/features/odl-transportpce-stubmodels/pom.xml
index 8af42f65e..af8ce30b7 100644
--- a/features/odl-transportpce-stubmodels/pom.xml
+++ b/features/odl-transportpce-stubmodels/pom.xml
@@ -33,10 +33,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>odl-mdsal-models</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
+      <artifactId>ietf-inet-types-2013-07-15</artifactId>
+      <version>1.5.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml
index 64c115707..50f546b05 100644
--- a/ordmodels/network/pom.xml
+++ b/ordmodels/network/pom.xml
@@ -50,7 +50,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-yang-types-20130715</artifactId>
     </dependency>
-    <dependency>
+    <!--dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc8345</artifactId>
     </dependency>
@@ -66,7 +66,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc8345-ietf-network-topology-state</artifactId>
     </dependency>
-    <!--dependency>
+    <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-network-2015-06-08</artifactId>
       <version>1.5.0-SNAPSHOT</version>
diff --git a/ordmodels/network/src/main/yang/old-ietf-network-topology@2015-06-08.yang b/ordmodels/network/src/main/yang/ietf-network-topology@2015-06-08.yang
similarity index 96%
rename from ordmodels/network/src/main/yang/old-ietf-network-topology@2015-06-08.yang
rename to ordmodels/network/src/main/yang/ietf-network-topology@2015-06-08.yang
index 81a8a2871..e262d8799 100644
--- a/ordmodels/network/src/main/yang/old-ietf-network-topology@2015-06-08.yang
+++ b/ordmodels/network/src/main/yang/ietf-network-topology@2015-06-08.yang
@@ -1,4 +1,4 @@
-module old-ietf-network-topology {
+module ietf-network-topology {
   yang-version 1;
   namespace "urn:ietf:params:xml:ns:yang:ietf-network-topology";
   prefix lnk;
@@ -6,7 +6,7 @@ module old-ietf-network-topology {
   import ietf-inet-types {
     prefix inet;
   }
-  import old-ietf-network {
+  import ietf-network {
     prefix nd;
   }
 
diff --git a/ordmodels/network/src/main/yang/old-ietf-network@2015-06-08.yang b/ordmodels/network/src/main/yang/ietf-network@2015-06-08.yang
similarity index 95%
rename from ordmodels/network/src/main/yang/old-ietf-network@2015-06-08.yang
rename to ordmodels/network/src/main/yang/ietf-network@2015-06-08.yang
index cc90ce2a2..c74634325 100644
--- a/ordmodels/network/src/main/yang/old-ietf-network@2015-06-08.yang
+++ b/ordmodels/network/src/main/yang/ietf-network@2015-06-08.yang
@@ -1,4 +1,4 @@
-module old-ietf-network {
+module ietf-network {
   yang-version 1;
   namespace "urn:ietf:params:xml:ns:yang:ietf-network";
   prefix nd;
diff --git a/ordmodels/network/src/main/yang/org-openroadm-clli-network@2017-06-26.yang b/ordmodels/network/src/main/yang/org-openroadm-clli-network@2017-06-26.yang
index 45916db36..6dbd262d7 100644
--- a/ordmodels/network/src/main/yang/org-openroadm-clli-network@2017-06-26.yang
+++ b/ordmodels/network/src/main/yang/org-openroadm-clli-network@2017-06-26.yang
@@ -2,7 +2,7 @@ module org-openroadm-clli-network {
   namespace "http://org/openroadm/clli/network";
   prefix cn;
 
-  import old-ietf-network {
+  import ietf-network {
     prefix nd;
     revision-date 2015-06-08;
   }
diff --git a/ordmodels/network/src/main/yang/org-openroadm-network-topology@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-network-topology@2017-09-29.yang
index afa5f7162..817cdf164 100644
--- a/ordmodels/network/src/main/yang/org-openroadm-network-topology@2017-09-29.yang
+++ b/ordmodels/network/src/main/yang/org-openroadm-network-topology@2017-09-29.yang
@@ -2,11 +2,11 @@ module org-openroadm-network-topology {
   namespace "http://org/openroadm/network/topology";
   prefix topo;
 
-  import old-ietf-network {
+  import ietf-network {
     prefix nd;
     revision-date 2015-06-08;
   }
-  import old-ietf-network-topology {
+  import ietf-network-topology {
     prefix nwt;
     revision-date 2015-06-08;
   }
diff --git a/ordmodels/network/src/main/yang/org-openroadm-network-types@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-network-types@2017-09-29.yang
index 308f7124f..bfc6da9c4 100644
--- a/ordmodels/network/src/main/yang/org-openroadm-network-types@2017-09-29.yang
+++ b/ordmodels/network/src/main/yang/org-openroadm-network-types@2017-09-29.yang
@@ -2,7 +2,7 @@ module org-openroadm-network-types {
   namespace "http://org/openroadm/network/types";
   prefix nt;
 
-  import old-ietf-network-topology {
+  import ietf-network-topology {
     prefix nwt;
     revision-date 2015-06-08;
   }
diff --git a/ordmodels/network/src/main/yang/org-openroadm-network@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-network@2017-09-29.yang
index 8a87a3a76..cb9498675 100644
--- a/ordmodels/network/src/main/yang/org-openroadm-network@2017-09-29.yang
+++ b/ordmodels/network/src/main/yang/org-openroadm-network@2017-09-29.yang
@@ -2,7 +2,7 @@ module org-openroadm-network {
   namespace "http://org/openroadm/network";
   prefix net;
 
-  import old-ietf-network {
+  import ietf-network {
     prefix nd;
     revision-date 2015-06-08;
   }
diff --git a/ordmodels/network/src/main/yang/org-openroadm-opposite-links@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-opposite-links@2017-09-29.yang
index 36bdbd8c0..67641777c 100644
--- a/ordmodels/network/src/main/yang/org-openroadm-opposite-links@2017-09-29.yang
+++ b/ordmodels/network/src/main/yang/org-openroadm-opposite-links@2017-09-29.yang
@@ -2,11 +2,11 @@ module org-openroadm-opposite-links {
   namespace "http://org/openroadm/opposite/links";
   prefix opp-links;
 
-  import old-ietf-network {
+  import ietf-network {
     prefix nd;
     revision-date 2015-06-08;
   }
-  import old-ietf-network-topology {
+  import ietf-network-topology {
     prefix nwt;
     revision-date 2015-06-08;
   }
diff --git a/ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2017-09-29.yang
index 3de95e74a..2b890510d 100644
--- a/ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2017-09-29.yang
+++ b/ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2017-09-29.yang
@@ -2,11 +2,11 @@ module org-openroadm-otn-network-topology {
   namespace "http://org/openroadm/otn/network/topology";
   prefix otn-topo;
 
-  import old-ietf-network {
+  import ietf-network {
     prefix nd;
     revision-date 2015-06-08;
   }
-  import old-ietf-network-topology {
+  import ietf-network-topology {
     prefix nwt;
     revision-date 2015-06-08;
   }
diff --git a/ordmodels/network/src/main/yang/org-openroadm-xponder@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-xponder@2017-09-29.yang
index f6f03b8dc..d6934d2be 100644
--- a/ordmodels/network/src/main/yang/org-openroadm-xponder@2017-09-29.yang
+++ b/ordmodels/network/src/main/yang/org-openroadm-xponder@2017-09-29.yang
@@ -2,11 +2,11 @@ module org-openroadm-xponder {
   namespace "http://org/openroadm/xponder";
   prefix xpndr;
 
-  import old-ietf-network {
+  import ietf-network {
     prefix nd;
     revision-date 2015-06-08;
   }
-  import old-ietf-network-topology {
+  import ietf-network-topology {
     prefix nwt;
     revision-date 2015-06-08;
   }