Integrate controller-2.0.1 68/90168/2
authorRobert Varga <robert.varga@pantheon.tech>
Sun, 31 May 2020 12:14:02 +0000 (14:14 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Sun, 31 May 2020 12:46:54 +0000 (14:46 +0200)
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 <robert.varga@pantheon.tech>
45 files changed:
algo/algo-artifacts/pom.xml
algo/pom.xml
artifacts/pom.xml
bgp/bgp-artifacts/pom.xml
bgp/config-example/pom.xml
bgp/extensions/pom.xml
bgp/pom.xml
bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java
binding-parent/pom.xml
bmp/bmp-artifacts/pom.xml
bmp/bmp-config-example/pom.xml
bmp/pom.xml
config-loader/config-loader-artifacts/pom.xml
config-loader/pom.xml
distribution-karaf/pom.xml
feature-repo-parent/pom.xml
features/algo/pom.xml
features/bgp/pom.xml
features/bgpcep-extras/pom.xml
features/bmp/pom.xml
features/concepts/pom.xml
features/config-loader/pom.xml
features/graph/pom.xml
features/pcep/pom.xml
features/pom.xml
features/rsvp/pom.xml
features/topology/pom.xml
graph/graph-artifacts/pom.xml
graph/pom.xml
parent/pom.xml
pcep/config-example/pom.xml
pcep/pcep-artifacts/pom.xml
pcep/pom.xml
pcep/server/pom.xml
pcep/topology/pom.xml
pcep/tunnel/pom.xml
pom.xml
programming/pom.xml
programming/programming-artifacts/pom.xml
rsvp/pom.xml
rsvp/rsvp-artifacts/pom.xml
single-feature-parent/pom.xml
testtool-parent/pom.xml
topology/pom.xml
topology/topology-artifacts/pom.xml

index 5baa399ec2aacb01b815f365165f898bcc22e40a..c1e742672039910861a110ca8ee7a035e40755d0 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 5f8585fe5bed60c56b201b98a9b012ef40bee107..916d35a08323ea716859e94a50637d3712780225 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index f7533e8d22d00801527865d54e8121b41cddb10b..ecd0bbbb6174c146620665a7c8589d799de5f547 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>7.0.1</version>
+      <version>7.0.2</version>
       <relativePath/>
     </parent>
 
index de37a2d1efffe64826700e1109fc78dac06b3eb5..c6dd917679c11fa3e9ae69d69168d5a11748dbc8 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index b1d45b493569871e78de30986c2c5b8f655f9226..90b1f3b79bd6dfa49c3fc03854d7c7bc5b908fd9 100644 (file)
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index b4a3aa10a226f7b9aaca70a9d34b806afebe31b2..9f6be86e8c5a99755e83645904048822e63d95a1 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index c759bd1fc3c996973817e47baba07885d389446c..74ecb9e2247a00be67540aec2084cc34077e8920 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 94862226575afe9bb08513e91ecdf6005452fa4d..21f562b6a0699f9b6829b332780b17bb96027d50 100644 (file)
@@ -410,6 +410,24 @@ public abstract class AbstractRIBSupport<
         return putRoutes(tx, tablePath, nlri, attributes, ROUTES_NID);
     }
 
+    @Override
+    public final Collection<NodeIdentifierWithPredicates> putRoutes(final DOMDataTreeWriteTransaction tx,
+                                                                    final YangInstanceIdentifier tablePath,
+                                                                    final ContainerNode nlri,
+                                                                    final ContainerNode attributes,
+                                                                    final NodeIdentifier routesNodeId) {
+        final Optional<DataContainerChild<? extends PathArgument, ?>> 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<MapEntryNode> advertised, final Collection<MapEntryNode> withdrawn,
             final Attributes attr) {
@@ -452,24 +470,6 @@ public abstract class AbstractRIBSupport<
         }
     }
 
-    @Override
-    public final Collection<NodeIdentifierWithPredicates> putRoutes(final DOMDataTreeWriteTransaction tx,
-                                                             final YangInstanceIdentifier tablePath,
-                                                             final ContainerNode nlri,
-                                                             final ContainerNode attributes,
-                                                             final NodeIdentifier routesNodeId) {
-        final Optional<DataContainerChild<? extends PathArgument, ?>> 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,
index dee41072bc4b292861989c35b3f8b273ed1c3b23..967919f4c95e0d0ccf15c1990d3e5acf9630cf64 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 
index b467bfc07e81ab7a2ef5e02e3cb5aa2638fa10c3..8dcfc7f703a8555bd5cf4eb4489bc6a5918aefe4 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 24c4beb7e58c64217359343b0c9eac1a6eace160..84802f7858e712184c14075909c131ce5f259e36 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 7ec7401c6a95229dd1b7c1bc427d0efe4a9f27d3..c9b59493a8c99ba9d078b9534ddda3fe61246d8d 100644 (file)
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index b9d77feb28b636710b59d45ab399ceda4d0c8c7b..054cae7813070e70ac8c98c618db901ed99a06b3 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index ad2e67501c89c2059484f9214be5fd4747e6296b..ed189042c181c5ceb0b243ed0cb7a0caef4ad466 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 240375e4b8aca3c066b77121f491e126e91d8cd7..5f631f58bbd4ffb85426d5c55edfceb8004fa0e7 100644 (file)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 
index a10e082a0e4a858ea182932ed53660caafe5dc93..636ba605dd472b53d827d4e8a5cdef95b1af5f3e 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 99b044b8278d1ba7b06c953f26610c166a1c8991..e273cd23dd5228af4e9723e50114a976293851a3 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index e819799d3d71204893b9315f5df2f32df29ca752..e90df711ac92103eec6818eb590436cf5a3351cb 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 75ae2fefd7d6d3777f143d5e61a3e882e2339dfe..07b3f3c527f475efd118f610ce9f4152be9e0e19 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 8fb307d4699b72e953b22d319efd1659b876663a..102e6ad6b7dd800af16849412772dbb71c1232c9 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index d7faefc796fae4f1404533db54816b2470773213..070722666cebcea1aafed3fa7224487cf62ebe95 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index b06e93661c17bb18fe675bed9a9a5f99c3ce3ce9..be018fd0a1bdb168f14dfdcdde682b9707205e64 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index f532ecaac12f94690399ad38e579fee909b7185e..7bbe453cb67d946bd027fc1dbdbcd2758c77d039 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 456373a3f5a9b725af8fa0deeeb553a22249767b..9450a2d374f7f03ebaeb342ce0469f0a0f557d9f 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index bded183181b543264dd6861ac5342b475662d048..75690e14b3beee690ed2754941c9d913e61e0bc2 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index d02b6a19e3cd4623c1b813057620e5d08301e4e5..e09835f0cb6f81faeaa610db6e0e91260930a219 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 1f881cc70654d807491e1c2958c6f113bfb3beb3..c83de0efe64c28d8370e54f1a4e7943dfee7cef5 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index c7bb79bef917b4f24f2324fa512e4db2a7d50883..2ea8e70c8a73da9913c843c70c7258bf7c5d6a26 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index c4d76246f93c196c5438e8a856b326f2762211db..79bb32892036eee5f9f03c0270d4ee375bd3592b 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 8a2f6117b00279bcc38ca597c51412cd713495e2..b72404eef075a79fb28d5beef720a4e0b6dc11d3 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
@@ -43,7 +43,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>2.0.0</version>
+                <version>2.0.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -51,7 +51,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>5.0.1</version>
+                <version>5.0.2</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -59,7 +59,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>6.0.0</version>
+                <version>6.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index 37a949388100945c93ed6178ed70de69d436f673..149c204712a5a359d3a4d5b379d3e1fdc0a3affd 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index e4d91b7e6b77113dd9d7db2843dad5c56afe5676..1e30f889fb030a0541139ff54d97ff00ac8fe72e 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 8c12aa1cdb020424953c7900f88cf7a7438a998c..ea588435f8cdfebebb26fdb48b453039bd803335 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 1915957f9c246f84cc87c78011162b49fbe3c94c..51b142aba3ac5195b81f15ee8e20d3a2d2ed5c6e 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 825b849cc9d7488776a0a0a57bb4d5cbb627c9bd..cb6b46158959ade4a331096505626a14c4591165 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index eeef10d04569f6a73dfe9fdb4727a2acbbfbe5c3..4bf899d246cb7d091f3deea4b5915b68cf19320d 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index c3f6ab0a597ee847525136569a9af9778d708674..24d1a8c848e2950e6fbdb27b01cc05e982125bf8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 116fac923c04726ce985b3bec496860ede6b1bef..58c483c8f0e189c21f508a4080d787108dd00c76 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 2e457fa93c35d3644cb44fd153ffe06049e388be..5b26c954c349e11f43c67ac04f3bed50cefbd495 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 15241c8eeed7c54b71ad90f2692a46297104a144..588021420f8e019e285efe3394c4a9ae01c254ba 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index ad51caf62223430d3be5f07dce6d4561b4c07d4a..f89ac3bcbed593368425096220d7d02f67f4435a 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 9df226c463448bbdc5c10c087c2410177e660b8b..4c5a9e9e50ce1ac1e80d91747a6114a991df3d9e 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index 4a6e0f091c7535bee0d2945653afd1bc59df3b16..6489fefdc960b85f851e5c27e5fed5ad0e000655 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index bd081469689ad8c81a127aedb0c889ed891c9fc0..ac38e80b5dd223c16fde4cb0309385d2a9327671 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
index b66ad20509bc39220eeec66dbc84e36a8a820aba..eba738ada55ab7187f26835197b471489cac8d8a 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>