Update iana-if-type revision and packaging

This bumps packaged model to the latest available registry
and repackages it to match packaging rules.

Change-Id: I0947f90bedf8c628eaf6e68c21344ef72ed0c6cd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 40259c7704139258ff078f808a0b8b42b107ea2e..00fe90db03fe8e1c1317e6e56c8b6e44847cb5b9 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -472,11 +472,11 @@
                 <version>1.2.0-SNAPSHOT</version>
             </dependency>
 
-            <!-- RFC7224, live version lives here: https://github.com/YangModels/yang/blob/master/standard/ietf/RFC/iana-if-type.yang -->
+            <!-- RFC7224, live version: https://github.com/YangModels/yang/blob/master/standard/ietf/RFC/iana-if-type.yang -->
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>iana-if-type-2014-05-08</artifactId>
-                <version>2014.05.08.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
+                <artifactId>iana-if-type</artifactId>
+                <version>1.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- RFC7277 -->

diff --git a/features/odl-mdsal-model-rfc7224/pom.xml b/features/odl-mdsal-model-rfc7224/pom.xml
index 10cc14d8e23f72b16ff730dc7743fd29202890e6..38fe7966d4126669dc96fcb0158558c5d5aaebac 100644 (file)
--- a/features/odl-mdsal-model-rfc7224/pom.xml
+++ b/features/odl-mdsal-model-rfc7224/pom.xml
@@ -43,8 +43,8 @@
             <type>xml</type>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>iana-if-type-2014-05-08</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
+            <artifactId>iana-if-type</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/model/iana/iana-if-type-2014-05-08/pom.xml b/model/iana/iana-if-type/pom.xml
similarity index 78%
rename from model/iana/iana-if-type-2014-05-08/pom.xml
rename to model/iana/iana-if-type/pom.xml
index e9e682aa2740f52581ac56e94e7b7cd3e9dc40d4..a6359e5f0293effd131568c121ab583ad563b92b 100644 (file)
--- a/model/iana/iana-if-type-2014-05-08/pom.xml
+++ b/model/iana/iana-if-type/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: -->
 <!--
- Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
+ Copyright (c) 2018 Pantheon Technologies, s.r.o. and others.  All rights reserved.
 
  This program and the accompanying materials are made available under the
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -17,13 +17,14 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.opendaylight.mdsal.model</groupId>
-    <artifactId>iana-if-type-2014-05-08</artifactId>
-    <version>2014.05.08.15.0-SNAPSHOT</version>
-    <name>${project.artifactId}</name>
-    <description>${project.artifactId}</description>
+    <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
+    <artifactId>iana-if-type</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
+    <name>${project.artifactId}</name>
+    <description>iana-if-type@2017-01-19.yang</description>
+
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>

diff --git a/model/iana/iana-if-type-2014-05-08/src/main/yang/iana-if-type@2014-05-08.yang b/model/iana/iana-if-type/src/main/yang/iana-if-type@2017-01-19.yang
similarity index 92%
rename from model/iana/iana-if-type-2014-05-08/src/main/yang/iana-if-type@2014-05-08.yang
rename to model/iana/iana-if-type/src/main/yang/iana-if-type@2017-01-19.yang
index 81b217563d0538514f45d5cd04c13d7b319d4aba..7bfee36478edc7c65677cfe48b2630bffff791cb 100644 (file)
--- a/model/iana/iana-if-type-2014-05-08/src/main/yang/iana-if-type@2014-05-08.yang
+++ b/model/iana/iana-if-type/src/main/yang/iana-if-type@2017-01-19.yang
@@ -11,11 +11,12 @@ module iana-if-type {
     "        Internet Assigned Numbers Authority
 
      Postal: ICANN
-             4676 Admiralty Way, Suite 330
-             Marina del Rey, CA 90292
+             12025 Waterfront Drive, Suite 300
+             Los Angeles, CA 90094-2536
+             United States
 
-     Tel:    +1 310 823 9358
-     <mailto:iana@iana.org>";
+     Tel:    +1 310 301 5800
+     <mailto:iana&iana.org>";
   description
     "This YANG module defines YANG identities for IANA-registered
      interface types.
@@ -27,7 +28,7 @@ module iana-if-type {
      the IANA web site.
 
      Requests for new values should be made to IANA via
-     email (iana@iana.org).
+     email (iana&iana.org).
 
      Copyright (c) 2014 IETF Trust and the persons identified as
      authors of the code.  All rights reserved.
@@ -41,10 +42,48 @@ module iana-if-type {
 
      The initial version of this YANG module is part of RFC 7224;
      see the RFC itself for full legal notices.";
-    reference
-      "IANA 'ifType definitions' registry.
-       <http://www.iana.org/assignments/smi-numbers>";
+  reference
+    "IANA 'ifType definitions' registry.
+     <http://www.iana.org/assignments/smi-numbers>";
+
+  revision 2017-01-19 {
+    description
+      "Registered ifType 289.";
+  }
+
+  revision 2016-11-23 {
+    description
+      "Registered ifTypes 283-288.";
+  }
 
+  revision 2016-06-09 {
+    description
+      "Registered ifType 282.";
+  }
+  revision 2016-05-03 {
+    description
+      "Registered ifType 281.";
+  }
+  revision 2015-06-12 {
+    description
+      "Corrected formatting issue.";
+  }  
+  revision 2014-09-24 {
+    description
+      "Registered ifType 280.";
+  }
+  revision 2014-09-19 {
+    description
+      "Registered ifType 279.";
+  }
+  revision 2014-07-03 {
+    description
+      "Registered ifTypes 277-278.";
+  }
+  revision 2014-05-19 {
+    description
+      "Updated the contact address.";
+  }
   revision 2014-05-08 {
     description
       "Initial revision.";
@@ -153,7 +192,6 @@ module iana-if-type {
       "RFC 4805 - Definitions of Managed Objects for the
                   DS1, J1, E1, DS2, and E2 Interface Types";
   }
-
   identity basicISDN {
     base iana-interface-type;
     description
@@ -247,7 +285,6 @@ module iana-if-type {
     description
       "ARCnet Plus.";
   }
-
   identity atm {
     base iana-interface-type;
     description
@@ -295,7 +332,6 @@ module iana-if-type {
   identity hippi {
     base iana-interface-type;
   }
-
   identity modem {
     base iana-interface-type;
     description
@@ -341,7 +377,6 @@ module iana-if-type {
     description
       "Fibre Channel.";
   }
-
   identity hippiInterface {
     base iana-interface-type;
     description
@@ -387,7 +422,6 @@ module iana-if-type {
       "RFC 1356 - Multiprotocol Interconnect on X.25 and ISDN
                   in the Packet Mode";
   }
-
   identity v11 {
     base iana-interface-type;
     description
@@ -674,7 +708,6 @@ module iana-if-type {
   identity gigabitEthernet {
     base iana-interface-type;
     status deprecated;
-
     description
       "Obsoleted via RFC 3635.
        ethernetCsmacd(6) should be used instead.";
@@ -722,7 +755,6 @@ module iana-if-type {
     description
       "Fast channel.";
   }
-
   identity ip {
     base iana-interface-type;
     description
@@ -770,7 +802,6 @@ module iana-if-type {
     description
       "ATM Sub Interface.";
   }
-
   identity l2vlan {
     base iana-interface-type;
     description
@@ -960,7 +991,6 @@ module iana-if-type {
     description
       "Packet over SONET/SDH Interface.";
   }
-
   identity dvbAsiIn {
     base iana-interface-type;
     description
@@ -1006,7 +1036,6 @@ module iana-if-type {
     description
       "Cisco proprietary Maclayer.";
   }
-
   identity propDocsWirelessDownstream {
     base iana-interface-type;
     description
@@ -1100,7 +1129,6 @@ module iana-if-type {
     description
       "Voice Over Cable Interface.";
   }
-
   identity infiniband {
     base iana-interface-type;
     description
@@ -1146,7 +1174,6 @@ module iana-if-type {
     description
       "FSAN 155Mb Symetrical PON interface.";
   }
-
   identity pon622 {
     base iana-interface-type;
     description
@@ -1240,7 +1267,6 @@ module iana-if-type {
     description
       "Resilient Packet Ring Interface Type.";
   }
-
   identity qam {
     base iana-interface-type;
     description
@@ -1431,7 +1457,6 @@ module iana-if-type {
     description
       "DOCSIS CATV Upstream RF Port.";
   }
-
   identity cableDownstreamRfPort {
     base iana-interface-type;
     description
@@ -1520,4 +1545,75 @@ module iana-if-type {
     description
       "VMware NIC Team.";
   }
+  identity docsOfdmDownstream {
+    base iana-interface-type;
+    description
+      "CATV Downstream OFDM interface.";
+  }
+  identity docsOfdmaUpstream {
+    base iana-interface-type;
+    description
+      "CATV Upstream OFDMA interface.";
+  }
+  identity gfast {
+    base iana-interface-type;
+    description
+      "G.fast port.";
+    reference
+      "ITU-T G.9701";
+  }
+  identity sdci {
+    base iana-interface-type;
+    description
+      "SDCI (IO-Link).";
+    reference
+      "IEC 61131-9 Edition 1.0 2013-09";
+  }
+  identity xboxWireless {
+    base iana-interface-type;
+    description
+      "Xbox wireless.";
+  }
+  identity fastdsl {
+    base iana-interface-type;
+    description
+      "FastDSL.";
+    reference
+      "BBF TR-355";
+  }
+  identity docsCableScte55d1FwdOob {
+    base iana-interface-type;
+    description
+      "Cable SCTE 55-1 OOB Forward Channel.";
+  }
+  identity docsCableScte55d1RetOob {
+    base iana-interface-type;
+    description
+      "Cable SCTE 55-1 OOB Return Channel.";
+  }
+  identity docsCableScte55d2DsOob {
+    base iana-interface-type;
+    description
+      "Cable SCTE 55-2 OOB Downstream Channel.";
+  }
+  identity docsCableScte55d2UsOob {
+    base iana-interface-type;
+    description
+      "Cable SCTE 55-2 OOB Upstream Channel.";
+  }
+  identity docsCableNdf {
+    base iana-interface-type;
+    description
+      "Cable Narrowband Digital Forward.";
+  }
+  identity docsCableNdr {
+    base iana-interface-type;
+    description
+      "Cable Narrowband Digital Return.";
+  }
+  identity ptm {
+    base iana-interface-type;
+    description
+      "Packet Transfer Mode.";
+  }
 }

diff --git a/model/iana/pom.xml b/model/iana/pom.xml
index e1528beacf960442682042dc38a08de630a26399..90a7ec11871478f099bb8d993efe75b7591ae90e 100644 (file)
--- a/model/iana/pom.xml
+++ b/model/iana/pom.xml
@@ -25,14 +25,17 @@
     <description>${project.artifactId}</description>
 
     <modules>
-        <module>iana-afn-safi</module>
-        <module>iana-if-type-2014-05-08</module>
+        <!-- RFC7224 and updates -->
+        <module>iana-if-type</module>
 
         <!-- RFC8294 and updates -->
         <module>iana-routing-types</module>
 
         <!-- RFC8348 and updates -->
         <module>iana-hardware</module>
+
+        <!-- drafts -->
+        <module>iana-afn-safi</module>
     </modules>
 
     <build>