HC2VPP-253 - Bump routing models 54/10954/31
authorMichal Cmarada <[email protected]>
Fri, 4 May 2018 14:13:09 +0000 (16:13 +0200)
committerMichal Cmarada <[email protected]>
Wed, 9 May 2018 12:36:21 +0000 (14:36 +0200)
commit8f9fe3ca424abc56d212a96af4ec5750a29e7673
treec3472885ef0fb57452b88b4ea76f2935f81ca39f
parentd5883157bff11ee89b95bc1abe7f62fca3509950
HC2VPP-253 - Bump routing models

This patch updates (for support of SRv6 and MPLS) routing models to:
[email protected]
  (RFC 8349, https://tools.ietf.org/html/rfc8349)
[email protected] (RFC 8349)
[email protected] (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 <[email protected]>
111 files changed:
mpls/api/src/main/yang/[email protected]
mpls/api/src/main/yang/[email protected]
mpls/api/src/main/yang/[email protected]
mpls/impl/src/main/java/io/fd/hc2vpp/mpls/ImposeAndForwardWriter.java
mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsSwapWriter.java
mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsWriterFactory.java
mpls/impl/src/test/java/io/fd/hc2vpp/mpls/ImposeAndForwardTest.java
mpls/impl/src/test/java/io/fd/hc2vpp/mpls/MplsInterfaceCustomizerTest.java
mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndIpv4LookupTest.java
mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndMplsLookupTest.java
mpls/impl/src/test/java/io/fd/hc2vpp/mpls/SwapAndForwardTest.java
routing/routing-api/src/main/yang/[email protected] [deleted file]
routing/routing-api/src/main/yang/[email protected] [new file with mode: 0755]
routing/routing-api/src/main/yang/[email protected] [new file with mode: 0755]
routing/routing-api/src/main/yang/[email protected] [deleted file]
routing/routing-api/src/main/yang/[email protected] [new file with mode: 0755]
routing/routing-api/src/main/yang/[email protected] [deleted file]
routing/routing-api/src/main/yang/[email protected] [new file with mode: 0755]
routing/routing-api/src/main/yang/[email protected] [deleted file]
routing/routing-api/src/main/yang/[email protected] [new file with mode: 0755]
routing/routing-api/src/main/yang/[email protected] [new file with mode: 0644]
routing/routing-api/src/main/yang/[email protected] [new file with mode: 0644]
routing/routing-api/src/main/yang/[email protected] [moved from routing/routing-api/src/main/yang/[email protected] with 89% similarity]
routing/routing-api/src/main/yang/[email protected] [moved from routing/routing-api/src/main/yang/[email protected] with 51% similarity]
routing/routing-api/src/main/yang/[email protected] [moved from routing/routing-api/src/main/yang/[email protected] with 79% similarity]
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/Ipv4RoutingNodes.java [new file with mode: 0644]
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/Ipv6RoutingNodes.java [new file with mode: 0644]
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/RoutingConfiguration.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/RoutingIIds.java [new file with mode: 0644]
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/RoutingModule.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/naming/Ipv4RouteNamesFactory.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/naming/Ipv6RouteNamesFactory.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizer.java [moved from routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/RoutingProtocolCustomizer.java with 62% similarity]
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv4ReadRoutingNodes.java [deleted file]
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizer.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv6ReadRoutingNodes.java [deleted file]
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizer.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/RoutingInstanceCustomizer.java [deleted file]
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/RoutingReaderFactory.java [new file with mode: 0644]
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/RoutingStateCustomizer.java [deleted file]
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/RoutingStateReaderFactory.java [deleted file]
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/Ipv4RoutePathParser.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/Ipv6RoutePathParser.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/RouteMapper.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/ControlPlaneProtocolCustomizer.java [moved from routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingProtocolCustomizer.java with 78% similarity]
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizer.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv4WriteRoutingNodes.java [deleted file]
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizer.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv6WriteRoutingNodes.java [deleted file]
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/PrefixCustomizer.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizer.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingCustomizer.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingInstanceCustomizer.java [deleted file]
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingInterfaceCustomizer.java [deleted file]
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingWriterFactory.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactory.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactory.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactory.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/TableLookupRequestFactory.java
routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/trait/RouteRequestProducer.java
routing/routing-impl/src/main/resources/honeycomb-minimal-resources/config/routing.json
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv4RouteNamesFactoryTest.java
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv6RouteData.java
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv6RouteNamesFactoryTest.java
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/RoutingModuleTest.java
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/SchemaContextTestHelper.java
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizerTest.java [moved from routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/RoutingProtocolCustomizerTest.java with 82% similarity]
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizerTest.java
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizerTest.java
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/RoutingStateCustomizerTest.java [deleted file]
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/ControlPlaneProtocolCustomizerTest.java [moved from routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RoutingProtocolCustomizerTest.java with 81% similarity]
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizerTest.java
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizerTest.java
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/PrefixCustomizerTest.java
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizerTest.java
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RoutingInstanceCustomizerTest.java [deleted file]
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RoutingInterfaceCustomizerTest.java [deleted file]
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv4Test.java
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv6Test.java
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv4Test.java
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv6Test.java
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv4Test.java
routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv6Test.java
routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithClassifier.json
routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithNoRouteAttrs.json
routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithoutClassifier.json
routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteNoRouteAttrs.json
routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteWithClassifier.json
routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteWithoutClassifier.json
routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteBlackhole.json
routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteProhibited.json
routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteReceive.json
routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteUnreachable.json
routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithClassifier.json
routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutClassifier.json
routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutRouteAttrs.json
routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithClassifier.json
routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutClassifier.json
routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutRouteAttrs.json
routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteBlackhole.json
routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteProhibited.json
routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteReceive.json
routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteUnreachable.json
routing/routing-impl/src/test/resources/ra/complexRa.json
routing/routing-impl/src/test/resources/ra/simpleRa.json
routing/routing-impl/src/test/resources/routing.json
routing/routing_adv_postman_collection.json [deleted file]
routing/routing_advertisements_postman_collection.json [new file with mode: 0755]
routing/routing_postman_collection.json [changed mode: 0644->0755]
vpp-integration/api-docs/scripts/src/main/resources/routing.json