From: Marek Gradzki <mgradzki@cisco.com>
Date: Tue, 17 Jul 2018 05:28:23 +0000 (+0200)
Subject: Remove workarounds from ietf-routing-types related to MDSAL-309
X-Git-Tag: v1.18.07-RC1~9
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F97%2F13497%2F2;p=hc2vpp.git

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

MDSAL-309 was fixed in Oxygen SR1 used in HC since 18.07.

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

diff --git a/routing/routing-api/src/main/yang/hc2vpp-ietf-routing-types@2017-12-04.yang b/routing/routing-api/src/main/yang/hc2vpp-ietf-routing-types@2017-12-04.yang
index a0d6e19ed..46917a120 100755
--- a/routing/routing-api/src/main/yang/hc2vpp-ietf-routing-types@2017-12-04.yang
+++ b/routing/routing-api/src/main/yang/hc2vpp-ietf-routing-types@2017-12-04.yang
@@ -468,11 +468,7 @@ module hc2vpp-ietf-routing-types {
   typedef ipv4-multicast-source-address {
     type union {
       type enumeration {
-      /* Needed to change '*' to 'any' otherwise it will fail to build java classes from this enum
-         bug in mdsal reported here: https://jira.opendaylight.org/browse/MDSAL-332
-         TODO(HC2VPP-298): change back to '*' when resolved
-      */
-        enum any {
+        enum '*' {
           description
             "Any source address.";
         }
@@ -486,11 +482,7 @@ module hc2vpp-ietf-routing-types {
   typedef ipv6-multicast-source-address {
     type union {
       type enumeration {
-      /* Needed to change '*' to 'any' otherwise it will fail to build java classes from this enum
-         bug in mdsal reported here: https://jira.opendaylight.org/browse/MDSAL-332
-         TODO(HC2VPP-298): change back to '*' when resolved
-      */
-        enum any {
+        enum '*' {
           description
             "Any source address.";
         }