From: Robert Varga Date: Sun, 31 May 2020 12:14:02 +0000 (+0200) Subject: Integrate controller-2.0.1 X-Git-Tag: release/aluminium~56 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=f4df3310e410576d4c24f56756e8d7b059092806;p=bgpcep.git Integrate controller-2.0.1 This bumps versions to the following: - odlparent-7.0.2 - yangtools-5.0.2 - mdsal-6.0.1 - controller-2.0.1 Change-Id: I392ee1604c693643d83008aef760db3eb9c772ae Signed-off-by: Robert Varga --- diff --git a/algo/algo-artifacts/pom.xml b/algo/algo-artifacts/pom.xml index 5baa399ec2..c1e7426720 100644 --- a/algo/algo-artifacts/pom.xml +++ b/algo/algo-artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/algo/pom.xml b/algo/pom.xml index 5f8585fe5b..916d35a083 100644 --- a/algo/pom.xml +++ b/algo/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/artifacts/pom.xml b/artifacts/pom.xml index f7533e8d22..ecd0bbbb61 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/bgp/bgp-artifacts/pom.xml b/bgp/bgp-artifacts/pom.xml index de37a2d1ef..c6dd917679 100644 --- a/bgp/bgp-artifacts/pom.xml +++ b/bgp/bgp-artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/bgp/config-example/pom.xml b/bgp/config-example/pom.xml index b1d45b4935..90b1f3b79b 100644 --- a/bgp/config-example/pom.xml +++ b/bgp/config-example/pom.xml @@ -15,7 +15,7 @@ org.opendaylight.odlparent odlparent - 7.0.1 + 7.0.2 diff --git a/bgp/extensions/pom.xml b/bgp/extensions/pom.xml index b4a3aa10a2..9f6be86e8c 100644 --- a/bgp/extensions/pom.xml +++ b/bgp/extensions/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/bgp/pom.xml b/bgp/pom.xml index c759bd1fc3..74ecb9e224 100644 --- a/bgp/pom.xml +++ b/bgp/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java index 9486222657..21f562b6a0 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java @@ -410,6 +410,24 @@ public abstract class AbstractRIBSupport< return putRoutes(tx, tablePath, nlri, attributes, ROUTES_NID); } + @Override + public final Collection putRoutes(final DOMDataTreeWriteTransaction tx, + final YangInstanceIdentifier tablePath, + final ContainerNode nlri, + final ContainerNode attributes, + final NodeIdentifier routesNodeId) { + final Optional> maybeRoutes = nlri.getChild(ADVERTISED_ROUTES); + if (maybeRoutes.isPresent()) { + final ContainerNode destination = getDestination(maybeRoutes.get(), destinationContainerIdentifier()); + if (destination != null) { + return putDestinationRoutes(tx, tablePath, destination, attributes, routesNodeId); + } + } else { + LOG.debug("Advertized routes are not present in NLRI {}", nlri); + } + return Collections.emptyList(); + } + @Override public final Update buildUpdate(final Collection advertised, final Collection withdrawn, final Attributes attr) { @@ -452,24 +470,6 @@ public abstract class AbstractRIBSupport< } } - @Override - public final Collection putRoutes(final DOMDataTreeWriteTransaction tx, - final YangInstanceIdentifier tablePath, - final ContainerNode nlri, - final ContainerNode attributes, - final NodeIdentifier routesNodeId) { - final Optional> maybeRoutes = nlri.getChild(ADVERTISED_ROUTES); - if (maybeRoutes.isPresent()) { - final ContainerNode destination = getDestination(maybeRoutes.get(), destinationContainerIdentifier()); - if (destination != null) { - return putDestinationRoutes(tx, tablePath, destination, attributes, routesNodeId); - } - } else { - LOG.debug("Advertized routes are not present in NLRI {}", nlri); - } - return Collections.emptyList(); - } - private static final class DeleteRoute implements ApplyRoute { @Override public void apply(final DOMDataTreeWriteTransaction tx, final YangInstanceIdentifier base, diff --git a/binding-parent/pom.xml b/binding-parent/pom.xml index dee41072bc..967919f4c9 100644 --- a/binding-parent/pom.xml +++ b/binding-parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.mdsal binding-parent - 6.0.0 + 6.0.1 diff --git a/bmp/bmp-artifacts/pom.xml b/bmp/bmp-artifacts/pom.xml index b467bfc07e..8dcfc7f703 100644 --- a/bmp/bmp-artifacts/pom.xml +++ b/bmp/bmp-artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/bmp/bmp-config-example/pom.xml b/bmp/bmp-config-example/pom.xml index 24c4beb7e5..84802f7858 100644 --- a/bmp/bmp-config-example/pom.xml +++ b/bmp/bmp-config-example/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 7.0.1 + 7.0.2 diff --git a/bmp/pom.xml b/bmp/pom.xml index 7ec7401c6a..c9b59493a8 100644 --- a/bmp/pom.xml +++ b/bmp/pom.xml @@ -16,7 +16,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/config-loader/config-loader-artifacts/pom.xml b/config-loader/config-loader-artifacts/pom.xml index b9d77feb28..054cae7813 100644 --- a/config-loader/config-loader-artifacts/pom.xml +++ b/config-loader/config-loader-artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/config-loader/pom.xml b/config-loader/pom.xml index ad2e67501c..ed189042c1 100644 --- a/config-loader/pom.xml +++ b/config-loader/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml index 240375e4b8..5f631f58bb 100644 --- a/distribution-karaf/pom.xml +++ b/distribution-karaf/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.odlparent karaf4-parent - 7.0.1 + 7.0.2 diff --git a/feature-repo-parent/pom.xml b/feature-repo-parent/pom.xml index a10e082a0e..636ba605dd 100644 --- a/feature-repo-parent/pom.xml +++ b/feature-repo-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 7.0.1 + 7.0.2 diff --git a/features/algo/pom.xml b/features/algo/pom.xml index 99b044b827..e273cd23dd 100644 --- a/features/algo/pom.xml +++ b/features/algo/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/features/bgp/pom.xml b/features/bgp/pom.xml index e819799d3d..e90df711ac 100644 --- a/features/bgp/pom.xml +++ b/features/bgp/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/features/bgpcep-extras/pom.xml b/features/bgpcep-extras/pom.xml index 75ae2fefd7..07b3f3c527 100644 --- a/features/bgpcep-extras/pom.xml +++ b/features/bgpcep-extras/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/features/bmp/pom.xml b/features/bmp/pom.xml index 8fb307d469..102e6ad6b7 100644 --- a/features/bmp/pom.xml +++ b/features/bmp/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/features/concepts/pom.xml b/features/concepts/pom.xml index d7faefc796..070722666c 100644 --- a/features/concepts/pom.xml +++ b/features/concepts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/features/config-loader/pom.xml b/features/config-loader/pom.xml index b06e93661c..be018fd0a1 100644 --- a/features/config-loader/pom.xml +++ b/features/config-loader/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/features/graph/pom.xml b/features/graph/pom.xml index f532ecaac1..7bbe453cb6 100644 --- a/features/graph/pom.xml +++ b/features/graph/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/features/pcep/pom.xml b/features/pcep/pom.xml index 456373a3f5..9450a2d374 100644 --- a/features/pcep/pom.xml +++ b/features/pcep/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/features/pom.xml b/features/pom.xml index bded183181..75690e14b3 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/features/rsvp/pom.xml b/features/rsvp/pom.xml index d02b6a19e3..e09835f0cb 100644 --- a/features/rsvp/pom.xml +++ b/features/rsvp/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/features/topology/pom.xml b/features/topology/pom.xml index 1f881cc706..c83de0efe6 100644 --- a/features/topology/pom.xml +++ b/features/topology/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/graph/graph-artifacts/pom.xml b/graph/graph-artifacts/pom.xml index c7bb79bef9..2ea8e70c8a 100644 --- a/graph/graph-artifacts/pom.xml +++ b/graph/graph-artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/graph/pom.xml b/graph/pom.xml index c4d76246f9..79bb328920 100644 --- a/graph/pom.xml +++ b/graph/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/parent/pom.xml b/parent/pom.xml index 8a2f6117b0..b72404eef0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 7.0.1 + 7.0.2 @@ -43,7 +43,7 @@ org.opendaylight.controller controller-artifacts - 2.0.0 + 2.0.1 import pom @@ -51,7 +51,7 @@ org.opendaylight.yangtools yangtools-artifacts - 5.0.1 + 5.0.2 import pom @@ -59,7 +59,7 @@ org.opendaylight.mdsal mdsal-artifacts - 6.0.0 + 6.0.1 pom import diff --git a/pcep/config-example/pom.xml b/pcep/config-example/pom.xml index 37a9493881..149c204712 100644 --- a/pcep/config-example/pom.xml +++ b/pcep/config-example/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 7.0.1 + 7.0.2 diff --git a/pcep/pcep-artifacts/pom.xml b/pcep/pcep-artifacts/pom.xml index e4d91b7e6b..1e30f889fb 100644 --- a/pcep/pcep-artifacts/pom.xml +++ b/pcep/pcep-artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/pcep/pom.xml b/pcep/pom.xml index 8c12aa1cdb..ea588435f8 100644 --- a/pcep/pom.xml +++ b/pcep/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/pcep/server/pom.xml b/pcep/server/pom.xml index 1915957f9c..51b142aba3 100644 --- a/pcep/server/pom.xml +++ b/pcep/server/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/pcep/topology/pom.xml b/pcep/topology/pom.xml index 825b849cc9..cb6b461589 100644 --- a/pcep/topology/pom.xml +++ b/pcep/topology/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/pcep/tunnel/pom.xml b/pcep/tunnel/pom.xml index eeef10d045..4bf899d246 100644 --- a/pcep/tunnel/pom.xml +++ b/pcep/tunnel/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/pom.xml b/pom.xml index c3f6ab0a59..24d1a8c848 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/programming/pom.xml b/programming/pom.xml index 116fac923c..58c483c8f0 100644 --- a/programming/pom.xml +++ b/programming/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/programming/programming-artifacts/pom.xml b/programming/programming-artifacts/pom.xml index 2e457fa93c..5b26c954c3 100644 --- a/programming/programming-artifacts/pom.xml +++ b/programming/programming-artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/rsvp/pom.xml b/rsvp/pom.xml index 15241c8eee..588021420f 100644 --- a/rsvp/pom.xml +++ b/rsvp/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/rsvp/rsvp-artifacts/pom.xml b/rsvp/rsvp-artifacts/pom.xml index ad51caf622..f89ac3bcbe 100644 --- a/rsvp/rsvp-artifacts/pom.xml +++ b/rsvp/rsvp-artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/single-feature-parent/pom.xml b/single-feature-parent/pom.xml index 9df226c463..4c5a9e9e50 100644 --- a/single-feature-parent/pom.xml +++ b/single-feature-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/testtool-parent/pom.xml b/testtool-parent/pom.xml index 4a6e0f091c..6489fefdc9 100644 --- a/testtool-parent/pom.xml +++ b/testtool-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 7.0.1 + 7.0.2 diff --git a/topology/pom.xml b/topology/pom.xml index bd08146968..ac38e80b5d 100644 --- a/topology/pom.xml +++ b/topology/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/topology/topology-artifacts/pom.xml b/topology/topology-artifacts/pom.xml index b66ad20509..eba738ada5 100644 --- a/topology/topology-artifacts/pom.xml +++ b/topology/topology-artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2