JunOS: link firewall-filters (#5509)

batfish · Feb 3, 2020 · 3144fb4 · 3144fb4
1 parent 70cd1b7
commit 3144fb4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/projects/batfish/src/main/java/org/batfish/representation/juniper/JuniperConfiguration.java b/projects/batfish/src/main/java/org/batfish/representation/juniper/JuniperConfiguration.java
@@ -193,6 +193,18 @@ public final class JuniperConfiguration extends VendorConfiguration {
     return String.format("%s %s", policyName, termName);
   }
 
+  @VisibleForTesting
+  public static TraceElement matchingFirewallFilter(String filename, String filterName) {
+    return TraceElement.builder()
+        .add("Matched ")
+        .add(
+            String.format(
+                "%s %s", JuniperStructureType.FIREWALL_FILTER.getDescription(), filterName),
+            new VendorStructureId(
+                filename, JuniperStructureType.FIREWALL_FILTER.getDescription(), filterName))
+        .build();
+  }
+
   /** Returns a trace element for a firewall filter term for the given test config. */
   @VisibleForTesting
   public static TraceElement matchingFirewallFilterTerm(
@@ -2340,9 +2352,8 @@ IpAccessList filterToIpAccessList(FirewallFilter f) throws VendorConversionExcep
       ImmutableList.Builder<AclLine> lines = ImmutableList.builder();
       for (FirewallFilter inner : filter.getInner()) {
         String filterName = inner.getName();
-        String lineName = String.format("Match firewall filter %s", filterName);
-        String matchedDescription = String.format("Matched firewall filter %s", filterName);
-        lines.add(new AclAclLine(lineName, filterName, TraceElement.of(matchedDescription)));
+        lines.add(
+            new AclAclLine(filterName, filterName, matchingFirewallFilter(_filename, filterName)));
       }
       return IpAccessList.builder().setName(filter.getName()).setLines(lines.build()).build();
     }

diff --git a/...ts/batfish/src/test/java/org/batfish/representation/juniper/JuniperConfigurationTest.java b/...ts/batfish/src/test/java/org/batfish/representation/juniper/JuniperConfigurationTest.java
@@ -14,6 +14,7 @@
 import static org.batfish.representation.juniper.JuniperConfiguration.OSPF_DEAD_INTERVAL_HELLO_MULTIPLIER;
 import static org.batfish.representation.juniper.JuniperConfiguration.buildScreen;
 import static org.batfish.representation.juniper.JuniperConfiguration.getRouterId;
+import static org.batfish.representation.juniper.JuniperConfiguration.matchingFirewallFilter;
 import static org.batfish.representation.juniper.JuniperConfiguration.mergeIpAccessListLines;
 import static org.batfish.representation.juniper.JuniperConfiguration.toOspfDeadInterval;
 import static org.batfish.representation.juniper.JuniperConfiguration.toOspfHelloInterval;
@@ -174,7 +175,7 @@ public void testCompositeFirewallFilter() {
 
     assertThat(
         compositeAcl.getLines(),
-        contains(hasTraceElement(TraceElement.of("Matched firewall filter F"))));
+        contains(hasTraceElement(matchingFirewallFilter(config.getFilename(), "F"))));
   }
 
   /**