commit 76c751ce80109cd429cd45d32a04015f7715546b
author Vince Lehman <vslehman@memphis.edu> Tue Nov 18 17:36:38 2014 -0600
committer Alex Afanasyev <alexander.afanasyev@ucla.edu> Fri Mar 13 19:57:39 2015 -0700
tree b0cd71f00c0a9e48ff8a5193bdc27c6476bdb4b3
parent e4eec1310896a10cb88708a94ea8dda2a10c35ee

rib: Perform FIB updates before modifying RIB

refs: #1941

Change-Id: I1457f71ddd1c120daae48308d5cc02a7c0ecf93d

tests/rib/remote-registrator.t.cpp

diff --git a/tests/rib/remote-registrator.t.cpp b/tests/rib/remote-registrator.t.cpp
index 5c81f88..dc41cda 100644
--- a/tests/rib/remote-registrator.t.cpp
+++ b/tests/rib/remote-registrator.t.cpp
@@ -63,32 +63,30 @@
                              bind(&RemoteRegistrator::loadConfig, remoteRegistrator, _1));
 
 
-    if (isSetRetry)
-      {
-        const std::string CONFIG_STRING =
-        "remote_register\n"
-        "{\n"
-        "  cost 15\n"
-        "  timeout 1000\n"
-        "  retry 1\n"
-        "  refresh_interval 5\n"
-        "}";
+    if (isSetRetry) {
+      const std::string CONFIG_STRING =
+      "remote_register\n"
+      "{\n"
+      "  cost 15\n"
+      "  timeout 1000\n"
+      "  retry 1\n"
+      "  refresh_interval 5\n"
+      "}";
 
-        config.parse(CONFIG_STRING, true, "test-remote-register");
-      }
-    else
-      {
-        const std::string CONFIG_STRING =
-        "remote_register\n"
-        "{\n"
-        "  cost 15\n"
-        "  timeout 100000\n"
-        "  retry 0\n"
-        "  refresh_interval 5\n"
-        "}";
+      config.parse(CONFIG_STRING, true, "test-remote-register");
+    }
+    else {
+      const std::string CONFIG_STRING =
+      "remote_register\n"
+      "{\n"
+      "  cost 15\n"
+      "  timeout 100000\n"
+      "  retry 0\n"
+      "  refresh_interval 5\n"
+      "}";
 
-        config.parse(CONFIG_STRING, true, "test-remote-register");
-      }
+      config.parse(CONFIG_STRING, true, "test-remote-register");
+    }
   }
 
   void
@@ -156,7 +154,9 @@
   void
   eraseFace(uint64_t faceId)
   {
-    rib.erase(faceId);
+    for (const Rib::NameAndRoute& item : rib.findRoutesWithFaceId(faceId)) {
+      rib.erase(item.first, item.second);
+    }
 
     advanceClocks(time::milliseconds(1));
   }