From bbf757556378fa52b0b0446d19b0c4cf806c9cef Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Tue, 17 Jul 2018 12:28:58 +0200 Subject: Remove workaround for YANGTOOLS-678 from ietf-ipv6-unicast-routing model YANGTOOLS-678 was fixed in Oxygen SR2 used in HC since 18.07. Change-Id: I7a68e8f7178a7448216825ae64d968552686bba3 Signed-off-by: Marek Gradzki --- .../yang/hc2vpp-ietf-ipv6-unicast-routing@2018-03-13.yang | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/routing/routing-api/src/main/yang/hc2vpp-ietf-ipv6-unicast-routing@2018-03-13.yang b/routing/routing-api/src/main/yang/hc2vpp-ietf-ipv6-unicast-routing@2018-03-13.yang index 359e23362..e969b3c1e 100755 --- a/routing/routing-api/src/main/yang/hc2vpp-ietf-ipv6-unicast-routing@2018-03-13.yang +++ b/routing/routing-api/src/main/yang/hc2vpp-ietf-ipv6-unicast-routing@2018-03-13.yang @@ -26,21 +26,6 @@ module hc2vpp-ietf-ipv6-unicast-routing { is required."; } - /* - Copied ietf-ip import from hc2vpp-ietf-ipv6-router-advertisements as a workaround - for https://jira.opendaylight.org/browse/YANGTOOLS-876. - - TODO: Remove ietf-ip import once YANGTOOLS-876 is fixed and HC adapts to proper yangtools version. - Bug fix will be available in yangtools 2.0.4 version. - */ - import ietf-ip { - prefix "ip"; - description - "An 'ietf-ip' module version that is compatible with - the Network Management Datastore Architecture (NMDA) - is required."; - } - include hc2vpp-ietf-ipv6-router-advertisements { revision-date 2018-03-13; } -- cgit 1.2.3-korg