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 a0b58126f841c7ae503d5df80cd1be13f0836560..541b429ccc3aca83f9ebce32a3fd493243d10fde 100644 (file)
--- 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 af54d826118fbfa2d3958a028ae1b80dcd2b2786..04d5678b873219dc9087bf60a70a49460d907aa0 100644 (file)
--- 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 cd2d5ba0fce0e884b8e7b6e7ae0ca52a202ffad6..8e95a6fad3aaa207c1ceb0a41c3d75e8f0ff373c 100644 (file)
--- 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 8af42f65e0f6a32d4e0d4a96d8b8fbf7c9b9893a..af8ce30b7dee620842ee2020597ca226c35797e9 100644 (file)
--- 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 64c1157074eb7b07fdbb50dd4152c76df426f525..50f546b0564ea41b01b89be7146624d9690978a5 100644 (file)
--- 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 81a8a287122eb3e011e47a28a176056f0c04e245..e262d8799b352991f354fed49baffa377f3cd494 100644 (file)
--- 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 {\r
+module ietf-network-topology {\r
   yang-version 1;\r
   namespace "urn:ietf:params:xml:ns:yang:ietf-network-topology";\r
   prefix lnk;\r
@@ -6,7 +6,7 @@ module old-ietf-network-topology {
   import ietf-inet-types {\r
     prefix inet;\r
   }\r
-  import old-ietf-network {\r
+  import ietf-network {\r
     prefix nd;\r
   }\r
 \r

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 cc90ce2a2e5219989c4e5d6f9d393a47f0723de5..c7463432527dc71883f2722f1f2d9d4963646ac7 100644 (file)
--- 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 {\r
+module ietf-network {\r
   yang-version 1;\r
   namespace "urn:ietf:params:xml:ns:yang:ietf-network";\r
   prefix nd;\r

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 45916db3691c8a936bd0a5711cae714a0fc9cca8..6dbd262d70a80c9e910e07e5072bcb6aaa17ea59 100644 (file)
--- 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 afa5f7162ac801bed420730e3a8d3675f398f210..817cdf164d7025295a110cb3ccb004d2eb4ce138 100644 (file)
--- 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 308f7124f88cc578f19a35ebe32a7b296d40e004..bfc6da9c4ed1a497ffa217d8330268f7f44b3c4d 100644 (file)
--- 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 8a87a3a7634d85a573571d05ab23cc1fdb9c13e1..cb949867582bee1e3b826a5cce8bb3d684fe8f55 100644 (file)
--- 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 36bdbd8c05e5da2731804af60e42ae065b654372..67641777c27d9651551e885d31dddafe6adb0abd 100644 (file)
--- 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 3de95e74a581c27f7eb4de6c65b3f5d18b1689f8..2b890510de5742b85539bc3fbf9d3da177d58e14 100644 (file)
--- 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 f6f03b8dcc154e9c23a4662cc9597dc6a0c128bc..d6934d2be20483763775dc3ea72d9c2270d94ee8 100644 (file)
--- 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;
   }