commit 248cc242154628ed9f00975983cec188d49ad056
author Andrea Campanella <andrea@opennetworking.org> Fri Sep 21 13:58:38 2018 +0200
committer Thomas Vachuska <tom@opennetworking.org> Mon Oct 29 22:24:16 2018 +0000
tree 5e30fac2c8fe2cd3a457b358ceeeba7ce5b9c358
parent 3014983309027553f06ef68f4b70ae008af40276

Fix for multiple rtEntries in Juniper Driver

Change-Id: I462ecdeee6597a5daad67ea734f09d56922ad835

drivers/juniper/src/main/java/org/onosproject/drivers/juniper/JuniperUtils.java

diff --git a/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/JuniperUtils.java b/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/JuniperUtils.java
index 3cf5eec..fca4697 100644
--- a/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/JuniperUtils.java
+++ b/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/JuniperUtils.java
@@ -592,15 +592,17 @@
             List<HierarchicalConfiguration> routes = routeTable.configurationsAt("rt");
             for (HierarchicalConfiguration route : routes) {
                 if (route != null) {
-                    HierarchicalConfiguration rtEntry = route.configurationAt("rt-entry");
-                    if (rtEntry.getString(PROTOCOL_NAME) != null &&
-                            rtEntry.getString(PROTOCOL_NAME).contains("Static")) {
-                        parseStaticRoute(rtEntry,
-                                route.getString("rt-destination"),
-                                rtEntry.getString("metric"))
-                                .ifPresent(x -> staticRoutes.add(x));
+                    List<HierarchicalConfiguration> rtEntries = route.configurationsAt("rt-entry");
+                    rtEntries.forEach(rtEntry -> {
+                        if (rtEntry.getString(PROTOCOL_NAME) != null &&
+                                rtEntry.getString(PROTOCOL_NAME).contains("Static")) {
+                            parseStaticRoute(rtEntry,
+                                    route.getString("rt-destination"),
+                                    rtEntry.getString("metric"))
+                                    .ifPresent(staticRoutes::add);
 
-                    }
+                        }
+                    });
                 }
             }
         }