commit 0dcbf0e9b78015808318a69b31b25fcfad9b98be
author pierventre <pier@opennetworking.org> Mon Oct 11 13:07:09 2021 +0200
committer pierventre <pier@opennetworking.org> Tue Oct 12 17:48:10 2021 +0200
tree 2f4dc3d565525b9558cd89f2c5b737e276c8b553
parent 872bb6bae2d8f83dcf00e46ca2d8df9abbb94e0d

[SDFAB-6] Intermittent failures in the DynamicConfig tests

shouldProgram is now enforced also on dynamic interface config.

Change-Id: I70a877065dc6e5f030c1d93bf1c1f6e73ef3ffdd

impl/src/main/java/org/onosproject/segmentrouting/RouteHandler.java

diff --git a/impl/src/main/java/org/onosproject/segmentrouting/RouteHandler.java b/impl/src/main/java/org/onosproject/segmentrouting/RouteHandler.java
index dc1a25a..dae673d 100644
--- a/impl/src/main/java/org/onosproject/segmentrouting/RouteHandler.java
+++ b/impl/src/main/java/org/onosproject/segmentrouting/RouteHandler.java
@@ -154,7 +154,8 @@
         // Revoke subnet from all locations and reset oldRoutes such that system will be reprogrammed from scratch
         if (oldRoutes.size() > 2) {
             log.info("Revoke subnet {} and reset oldRoutes");
-            srManager.defaultRoutingHandler.revokeSubnet(allPrefixes);
+            // FIXME remove routes more precisely by memorizing the old locations
+            srManager.defaultRoutingHandler.revokeSubnet(allPrefixes, null);
             oldRoutes = Sets.newHashSet();
         }
 
@@ -213,7 +214,8 @@
             allPrefixes.add(route.prefix());
         });
         log.debug("RouteRemoved. revokeSubnet {}", allPrefixes);
-        srManager.defaultRoutingHandler.revokeSubnet(allPrefixes);
+        // FIXME remove routes more precisely by memorizing the old locations
+        srManager.defaultRoutingHandler.revokeSubnet(allPrefixes, null);
 
         routes.forEach(route -> {
             IpPrefix prefix = route.prefix();