diff options
Diffstat (limited to 'mpls/api/src/main')
3 files changed, 16 insertions, 18 deletions
diff --git a/mpls/api/src/main/yang/hc2vpp-ietf-mpls-static@2017-03-10.yang b/mpls/api/src/main/yang/hc2vpp-ietf-mpls-static@2017-03-10.yang index 143d87022..ae8688bbd 100644 --- a/mpls/api/src/main/yang/hc2vpp-ietf-mpls-static@2017-03-10.yang +++ b/mpls/api/src/main/yang/hc2vpp-ietf-mpls-static@2017-03-10.yang @@ -91,10 +91,10 @@ module hc2vpp-ietf-mpls-static { "This YANG module augments the 'ietf-routing' module with basic configuration and operational state data for MPLS static"; -/* -TODO: 2017-07-02 defines grouping in-segment but does not use it. -Bump to newer version after the issue is resolved. -*/ + /* + TODO: 2017-07-02 defines grouping in-segment but does not use it. + Bump to newer version after the issue is resolved. + */ revision "2017-03-10" { description "Latest revision: diff --git a/mpls/api/src/main/yang/hc2vpp-ietf-mpls@2017-07-02.yang b/mpls/api/src/main/yang/hc2vpp-ietf-mpls@2017-07-02.yang index 7aa1a5c35..16ac32cb9 100644 --- a/mpls/api/src/main/yang/hc2vpp-ietf-mpls@2017-07-02.yang +++ b/mpls/api/src/main/yang/hc2vpp-ietf-mpls@2017-07-02.yang @@ -78,9 +78,13 @@ module hc2vpp-ietf-mpls { } /* Identities */ - + /* + added "-identity" to resolve class naming conflicts + bug in mdsal reported here: https://jira.opendaylight.org/browse/MDSAL-332 + TODO(HC2VPP-298): remove "-identity" postfix when resolved + */ identity mpls { - base rt:address-family; + base rt:address-family-identity; description "This identity represents the MPLS address family."; } @@ -350,9 +354,6 @@ module hc2vpp-ietf-mpls { "MPLS local label."; } } -/* - TODO: we use older routing model which does not define next-hop container under route. - Uncomment following augmentation after HC2VPP-253 is resolved. augment "/rt:routing-state/rt:ribs/rt:rib/rt:routes/rt:route/" + "rt:next-hop/rt:next-hop-options/rt:simple-next-hop" { @@ -370,13 +371,10 @@ module hc2vpp-ietf-mpls { uses nhlfe-contents; } - */ - -/* - TODO(HC2VPP-253): we use older routing model which does not define active-route - as action but as an RPC. - Even after bump to ietf-routing@2016-08-18, we would fail due to - https://jira.opendaylight.org/browse/YANGTOOLS-822 + /* + TODO(HC2VPP-298): + needed to comment out action augmentations which caused problems. probapby simmilar to: + https://jira.opendaylight.org/browse/YANGTOOLS-841 augment "/rt:routing-state/rt:ribs/rt:rib/rt:active-route/rt:input" { diff --git a/mpls/api/src/main/yang/vpp-mpls@2017-11-20.yang b/mpls/api/src/main/yang/vpp-mpls@2017-11-20.yang index c58478102..c417046c0 100644 --- a/mpls/api/src/main/yang/vpp-mpls@2017-11-20.yang +++ b/mpls/api/src/main/yang/vpp-mpls@2017-11-20.yang @@ -10,7 +10,7 @@ module vpp-mpls { import hc2vpp-ietf-routing { prefix "rt"; - revision-date 2014-05-24; + revision-date 2018-03-13; } import hc2vpp-ietf-mpls-static { @@ -110,4 +110,4 @@ module vpp-mpls { description "Augments static-lsp list entry with lookup options available in VPP."; } -}
\ No newline at end of file +} |