Remove workarounds from ietf-routing-types related to MDSAL-269

Change-Id: Iadd17a3a44a20711e58c272934fb15dfe89bf2be
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

1 files changed, 1 insertions, 14 deletions

diff --git a/routing/routing-api/src/main/yang/hc2vpp-ietf-routing-types@2017-12-04.yang b/routing/routing-api/src/main/yang/ietf-routing-types@2017-12-04.yang
index 46917a120..7680cc530 100755
--- a/routing/routing-api/src/main/yang/hc2vpp-ietf-routing-types@2017-12-04.yang
+++ b/routing/routing-api/src/main/yang/ietf-routing-types@2017-12-04.yang
@@ -1,14 +1,8 @@
-module hc2vpp-ietf-routing-types {
+module ietf-routing-types {
 
   namespace "urn:ietf:params:xml:ns:yang:ietf-routing-types";
   prefix rt-types;
 
-  /*
-     This models was modified due to ODL bugs described here: https://jira.fd.io/browse/HC2VPP-298.
-     Affected sections are renamed or commented, see comments below.
-     TODO: revert these changes and rename model to ietf-routing-types once bugs are fixed.
-  */
-
   import ietf-yang-types {
     prefix yang;
   }
@@ -684,17 +678,10 @@ module hc2vpp-ietf-routing-types {
   }
 
   typedef mpls-label {
-    /*
-    TODO: binding generator creates invalid type bindings, so we changed type to uint32.
-    Change back after https://jira.opendaylight.org/browse/MDSAL-269 is resolved.
     type union {
       type mpls-label-special-purpose;
       type mpls-label-general-use;
     }
-    */
-    type uint32 {
-        range "0..1048575";
-    }
     description
       "The 20-bit label value in an MPLS label stack as specified
        in RFC 3032.  This label value does not include the