From 8f9fe3ca424abc56d212a96af4ec5750a29e7673 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Fri, 4 May 2018 16:13:09 +0200 Subject: HC2VPP-253 - Bump routing models This patch updates (for support of SRv6 and MPLS) routing models to: - hc2vpp-ietf-routing@2018-03-13.yang (RFC 8349, https://tools.ietf.org/html/rfc8349) - hc2vpp-ietf-ipv4-unicast-routing@2018-03-13.yang (RFC 8349) - hc2vpp-ietf-ipv6-unicast-routing@2018-03-13.yang (RFC 8349) - hc2vpp-ietf-ipv6-router-advertisements@2018-03-13 (RFC 8349) - hc2vpp-ietf-routing-types@2017-12-04 (RFC 8294 ,https://tools.ietf.org/html/rfc8294) Due to odl bugs these models were changed, see HC2VPP-298 for more details. Significant changes in updated models: - Routing instance was removed, we used vpp-routing-instance as single instance before, which is no longer needed. - Routing-protocol and Routing-protocols were refactored to Control-plane-protocol/s. Control-protocol now uses type and name as key - Route Key was changed from id to ipPrefix - Next-hop and Next-Hop-list were refactored See attached routing_postman_collection.json for updated data structures and examples for both IPv4 and IPv6 routes. For router advertisements see routing_advertisments_postman_collection.json Another fixes in this patch: - fixes in MPLS module due to Routing model updates - fixes doc module due to changes in Routing model Change-Id: I33704a50061aef97dfbd73a7701ff6fe5274d6f0 Signed-off-by: Michal Cmarada --- .../multihop/multiHopRouteWithoutClassifier.json | 37 +++++++++++----------- 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithoutClassifier.json') diff --git a/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithoutClassifier.json b/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithoutClassifier.json index d4d4a0693..4c49ba9a8 100644 --- a/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithoutClassifier.json +++ b/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithoutClassifier.json @@ -3,28 +3,29 @@ "ipv4": { "route": [ { - "id": 1, "destination-prefix": "192.168.2.1/24", - "vpp-ipv4-route": { + "vpp-v4ur:vpp-ipv4-route": { }, - "next-hop-list": { - "next-hop": [ - { - "id": "1", - "address": "192.168.2.1", - "outgoing-interface": "iface", - "weight": "2" - }, - { - "id": "2", - "address": "192.168.2.2", - "outgoing-interface": "iface", - "weight": "3" - } - ] + "next-hop": { + "next-hop-list": { + "next-hop": [ + { + "index": "1", + "next-hop-address": "192.168.2.1", + "outgoing-interface": "iface", + "weight": "2" + }, + { + "index": "2", + "next-hop-address": "192.168.2.2", + "outgoing-interface": "iface", + "weight": "3" + } + ] + } } } ] } } -} \ No newline at end of file +} -- cgit 1.2.3-korg