Use existing policy processor

batfish · Aug 6, 2021 · 58a16cf · 58a16cf
1 parent ef60aaa
commit 58a16cf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 18 deletions.
diff --git a/...ish-common-protocol/src/main/java/org/batfish/datamodel/routing_policy/RoutingPolicy.java b/...ish-common-protocol/src/main/java/org/batfish/datamodel/routing_policy/RoutingPolicy.java
@@ -232,23 +232,6 @@ public boolean process(
         inputRoute, outputRoute, null, null, direction, ribIntersectsPrefixSpaceEvaluator, null);
   }
 
-  /** @return True if the policy accepts the route. */
-  public boolean process(
-      AbstractRouteDecorator inputRoute,
-      AbstractRouteBuilder<?, ?> outputRoute,
-      BgpSessionProperties bgpSessionProperties,
-      Direction direction,
-      BiFunction<RibExpr, PrefixSpace, Boolean> ribIntersectsPrefixSpaceEvaluator) {
-    return process(
-        inputRoute,
-        outputRoute,
-        bgpSessionProperties,
-        null,
-        direction,
-        ribIntersectsPrefixSpaceEvaluator,
-        null);
-  }
-
   public boolean process(
       @Nonnull AbstractRouteDecorator inputRoute,
       @Nonnull AbstractRouteBuilder<?, ?> outputRoute,

diff --git a/projects/batfish/src/main/java/org/batfish/dataplane/ibdp/BgpRoutingProcess.java b/projects/batfish/src/main/java/org/batfish/dataplane/ibdp/BgpRoutingProcess.java
@@ -1805,7 +1805,7 @@ static boolean processExternalBgpAdvertisementImport(
             : null;
 
     // TODO Figure out whether transformedOutgoingRoute ought to have an annotation
-    return ipv4ImportPolicy.process(
+    return ipv4ImportPolicy.processBgpRoute(
         inputRoute, outputRouteBuilder, bgpSessionProperties, IN, ribExprEvaluator);
   }