diff options
author | Michal Cmarada <michal.cmarada@pantheon.tech> | 2018-05-04 16:13:09 +0200 |
---|---|---|
committer | Michal Cmarada <michal.cmarada@pantheon.tech> | 2018-05-09 14:36:21 +0200 |
commit | 8f9fe3ca424abc56d212a96af4ec5750a29e7673 (patch) | |
tree | c3472885ef0fb57452b88b4ea76f2935f81ca39f /routing/routing-impl/src/test/resources/ipv6 | |
parent | d5883157bff11ee89b95bc1abe7f62fca3509950 (diff) |
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 <michal.cmarada@pantheon.tech>
Diffstat (limited to 'routing/routing-impl/src/test/resources/ipv6')
10 files changed, 89 insertions, 79 deletions
diff --git a/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithClassifier.json b/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithClassifier.json index c8b1e208e..17fe9d67e 100644 --- a/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithClassifier.json +++ b/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithClassifier.json @@ -3,29 +3,30 @@ "ipv6": { "route": [ { - "id": 1, "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64", "vpp-ipv6-route": { "classify-table": "classify-table-one" }, - "next-hop-list": { - "next-hop": [ - { - "id": "1", - "address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002", - "outgoing-interface": "iface", - "weight": "2" - }, - { - "id": "2", - "address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002", - "outgoing-interface": "iface", - "weight": "2" - } - ] + "next-hop": { + "next-hop-list": { + "next-hop": [ + { + "index": "1", + "next-hop-address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002", + "outgoing-interface": "iface", + "weight": "2" + }, + { + "index": "2", + "next-hop-address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002", + "outgoing-interface": "iface", + "weight": "2" + } + ] + } } } ] } } -}
\ No newline at end of file +} diff --git a/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutClassifier.json b/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutClassifier.json index 2e44ebcf5..612db90c0 100644 --- a/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutClassifier.json +++ b/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutClassifier.json @@ -3,28 +3,29 @@ "ipv6": { "route": [ { - "id": 1, "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64", "vpp-ipv6-route": { }, - "next-hop-list": { - "next-hop": [ - { - "id": "1", - "address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002", - "outgoing-interface": "iface", - "weight": "2" - }, - { - "id": "2", - "address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002", - "outgoing-interface": "iface", - "weight": "2" - } - ] + "next-hop": { + "next-hop-list": { + "next-hop": [ + { + "index": "1", + "next-hop-address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002", + "outgoing-interface": "iface", + "weight": "2" + }, + { + "index": "2", + "next-hop-address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002", + "outgoing-interface": "iface", + "weight": "2" + } + ] + } } } ] } } -}
\ No newline at end of file +} diff --git a/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutRouteAttrs.json b/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutRouteAttrs.json index f85b1b716..f34084238 100644 --- a/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutRouteAttrs.json +++ b/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutRouteAttrs.json @@ -3,26 +3,27 @@ "ipv6": { "route": [ { - "id": 1, "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64", - "next-hop-list": { - "next-hop": [ - { - "id": "1", - "address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002", - "outgoing-interface": "iface", - "weight": "2" - }, - { - "id": "2", - "address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002", - "outgoing-interface": "iface", - "weight": "2" - } - ] + "next-hop": { + "next-hop-list": { + "next-hop": [ + { + "index": "1", + "next-hop-address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002", + "outgoing-interface": "iface", + "weight": "2" + }, + { + "index": "2", + "next-hop-address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002", + "outgoing-interface": "iface", + "weight": "2" + } + ] + } } } ] } } -}
\ No newline at end of file +} diff --git a/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithClassifier.json b/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithClassifier.json index c011a8d01..7f09a590e 100644 --- a/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithClassifier.json +++ b/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithClassifier.json @@ -3,15 +3,16 @@ "ipv6": { "route": [ { - "id": 1, "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64", - "vpp-ipv6-route": { - "classify-table": "classify-table-one" + "next-hop": { + "next-hop-address" : "2001:0db8:0a0b:12f0:0000:0000:0000:0002", + "outgoing-interface": "iface" }, - "next-hop": "2001:0db8:0a0b:12f0:0000:0000:0000:0002", - "outgoing-interface": "iface" + "vpp-ipv6-route" : { + "classify-table": "classify-table-one" + } } ] } } -}
\ No newline at end of file +} diff --git a/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutClassifier.json b/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutClassifier.json index 1cb663ca7..feca92c88 100644 --- a/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutClassifier.json +++ b/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutClassifier.json @@ -3,14 +3,15 @@ "ipv6": { "route": [ { - "id": 1, "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64", - "vpp-ipv6-route": { + "next-hop": { + "next-hop-address" : "2001:0db8:0a0b:12f0:0000:0000:0000:0002", + "outgoing-interface": "iface" }, - "next-hop": "2001:0db8:0a0b:12f0:0000:0000:0000:0002", - "outgoing-interface": "iface" + "vpp-v6ur:vpp-ipv6-route": { + } } ] } } -}
\ No newline at end of file +} diff --git a/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutRouteAttrs.json b/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutRouteAttrs.json index a735c193c..fd66f2283 100644 --- a/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutRouteAttrs.json +++ b/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutRouteAttrs.json @@ -3,12 +3,13 @@ "ipv6": { "route": [ { - "id": 1, "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64", - "next-hop": "2001:0db8:0a0b:12f0:0000:0000:0000:0002", - "outgoing-interface": "iface" + "next-hop": { + "next-hop-address" : "2001:0db8:0a0b:12f0:0000:0000:0000:0002", + "outgoing-interface": "iface" + } } ] } } -}
\ No newline at end of file +} diff --git a/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteBlackhole.json b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteBlackhole.json index 1cc319107..43e8366ff 100644 --- a/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteBlackhole.json +++ b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteBlackhole.json @@ -3,9 +3,10 @@ "ipv6": { "route": [ { - "id": 1, - "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/24", - "special-next-hop": "blackhole" + "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64", + "next-hop": { + "special-next-hop-enum": "blackhole" + } } ] } diff --git a/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteProhibited.json b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteProhibited.json index d69e817d7..e8f0a0e2e 100644 --- a/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteProhibited.json +++ b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteProhibited.json @@ -3,9 +3,10 @@ "ipv6": { "route": [ { - "id": 1, - "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/24", - "special-next-hop": "prohibit" + "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64", + "next-hop": { + "special-next-hop-enum": "prohibit" + } } ] } diff --git a/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteReceive.json b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteReceive.json index 50d447de0..5296e3f01 100644 --- a/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteReceive.json +++ b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteReceive.json @@ -3,9 +3,10 @@ "ipv6": { "route": [ { - "id": 1, - "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/24", - "special-next-hop": "receive" + "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64", + "next-hop": { + "special-next-hop-enum": "receive" + } } ] } diff --git a/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteUnreachable.json b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteUnreachable.json index c874549d1..2d351956d 100644 --- a/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteUnreachable.json +++ b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteUnreachable.json @@ -3,11 +3,12 @@ "ipv6": { "route": [ { - "id": 1, - "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/24", - "special-next-hop": "unreachable" + "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64", + "next-hop": { + "special-next-hop-enum": "unreachable" + } } ] } } -}
\ No newline at end of file +} |