JunOS: clean-up prefix-list to IpSpace conversion

batfish · Feb 18, 2022 · e2cdeaa · e2cdeaa
1 parent 66fc72b
commit e2cdeaa
Show file tree

Hide file tree

Showing 15 changed files with 76 additions and 145 deletions.
diff --git a/...cts/batfish/src/main/antlr4/org/batfish/grammar/flatjuniper/FlatJuniper_policy_options.g4 b/...cts/batfish/src/main/antlr4/org/batfish/grammar/flatjuniper/FlatJuniper_policy_options.g4
@@ -109,11 +109,6 @@ poplt_apply_path
    APPLY_PATH path = DOUBLE_QUOTED_STRING
 ;
 
-poplt_ip6
-:
-   ip6 = IPV6_ADDRESS
-;
-
 poplt_network
 :
    network = ip_prefix

diff --git a/projects/batfish/src/main/java/org/batfish/grammar/flatjuniper/ConfigurationBuilder.java b/projects/batfish/src/main/java/org/batfish/grammar/flatjuniper/ConfigurationBuilder.java
@@ -419,7 +419,6 @@
 import org.batfish.grammar.flatjuniper.FlatJuniperParser.Pocondi_prefixContext;
 import org.batfish.grammar.flatjuniper.FlatJuniperParser.Pocondi_tableContext;
 import org.batfish.grammar.flatjuniper.FlatJuniperParser.Policy_expressionContext;
-import org.batfish.grammar.flatjuniper.FlatJuniperParser.Poplt_ip6Context;
 import org.batfish.grammar.flatjuniper.FlatJuniperParser.Poplt_network6Context;
 import org.batfish.grammar.flatjuniper.FlatJuniperParser.Poplt_networkContext;
 import org.batfish.grammar.flatjuniper.FlatJuniperParser.Pops_commonContext;
@@ -5054,11 +5053,6 @@ public void exitPoc_members(Poc_membersContext ctx) {
     }
   }
 
-  @Override
-  public void exitPoplt_ip6(Poplt_ip6Context ctx) {
-    _currentPrefixList.setIpv6(true);
-  }
-
   @Override
   public void exitPoplt_network(Poplt_networkContext ctx) {
     Prefix prefix = toPrefix(ctx.network);
@@ -5067,7 +5061,7 @@ public void exitPoplt_network(Poplt_networkContext ctx) {
 
   @Override
   public void exitPoplt_network6(Poplt_network6Context ctx) {
-    _currentPrefixList.setIpv6(true);
+    _currentPrefixList.setHasIpv6(true);
   }
 
   @Override

diff --git a/...batfish/src/main/java/org/batfish/representation/juniper/FwFromDestinationPrefixList.java b/...batfish/src/main/java/org/batfish/representation/juniper/FwFromDestinationPrefixList.java
@@ -1,14 +1,11 @@
 package org.batfish.representation.juniper;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableList;
 import org.batfish.common.Warnings;
-import org.batfish.datamodel.AclIpSpace;
 import org.batfish.datamodel.Configuration;
 import org.batfish.datamodel.EmptyIpSpace;
 import org.batfish.datamodel.HeaderSpace;
-import org.batfish.datamodel.IpWildcard;
-import org.batfish.datamodel.RouteFilterList;
+import org.batfish.datamodel.IpSpace;
 import org.batfish.datamodel.TraceElement;
 import org.batfish.datamodel.acl.AclLineMatchExpr;
 import org.batfish.datamodel.acl.MatchHeaderSpace;
@@ -30,11 +27,11 @@ public Field getField() {
 
   @Override
   public AclLineMatchExpr toAclLineMatchExpr(JuniperConfiguration jc, Configuration c, Warnings w) {
-    return new MatchHeaderSpace(toHeaderspace(jc, c, w), getTraceElement());
+    return new MatchHeaderSpace(toHeaderSpace(jc, w), getTraceElement());
   }
 
   @VisibleForTesting
-  HeaderSpace toHeaderspace(JuniperConfiguration jc, Configuration c, Warnings w) {
+  HeaderSpace toHeaderSpace(JuniperConfiguration jc, Warnings w) {
     PrefixList pl = jc.getMasterLogicalSystem().getPrefixLists().get(_name);
 
     if (pl == null) {
@@ -43,25 +40,13 @@ HeaderSpace toHeaderspace(JuniperConfiguration jc, Configuration c, Warnings w)
       return HeaderSpace.builder().setDstIps(EmptyIpSpace.INSTANCE).build();
     }
 
-    if (pl.getIpv6()) {
-      // do not handle Ipv6 for now, assume matching nothing
-      return HeaderSpace.builder().setDstIps(EmptyIpSpace.INSTANCE).build();
-    }
-
-    RouteFilterList destinationPrefixList = c.getRouteFilterLists().get(_name);
-
+    IpSpace space = pl.toIpSpace();
     // if referenced prefix list is empty, it should not match anything
-    if (destinationPrefixList.getLines().isEmpty()) {
-      return HeaderSpace.builder().setDstIps(EmptyIpSpace.INSTANCE).build();
+    if (space instanceof EmptyIpSpace && !pl.getHasIpv6()) {
+      w.redFlag(String.format("destination-prefix-list \"%s\" is empty", _name));
     }
 
-    return HeaderSpace.builder()
-        .setDstIps(
-            AclIpSpace.union(
-                destinationPrefixList.getMatchingIps().stream()
-                    .map(IpWildcard::toIpSpace)
-                    .collect(ImmutableList.toImmutableList())))
-        .build();
+    return HeaderSpace.builder().setDstIps(space).build();
   }
 
   private TraceElement getTraceElement() {

diff --git a/...h/src/main/java/org/batfish/representation/juniper/FwFromDestinationPrefixListExcept.java b/...h/src/main/java/org/batfish/representation/juniper/FwFromDestinationPrefixListExcept.java
@@ -1,14 +1,11 @@
 package org.batfish.representation.juniper;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableList;
 import org.batfish.common.Warnings;
-import org.batfish.datamodel.AclIpSpace;
 import org.batfish.datamodel.Configuration;
 import org.batfish.datamodel.EmptyIpSpace;
 import org.batfish.datamodel.HeaderSpace;
-import org.batfish.datamodel.IpWildcard;
-import org.batfish.datamodel.RouteFilterList;
+import org.batfish.datamodel.IpSpace;
 import org.batfish.datamodel.TraceElement;
 import org.batfish.datamodel.acl.AclLineMatchExpr;
 import org.batfish.datamodel.acl.MatchHeaderSpace;
@@ -30,11 +27,11 @@ public Field getField() {
 
   @Override
   public AclLineMatchExpr toAclLineMatchExpr(JuniperConfiguration jc, Configuration c, Warnings w) {
-    return new MatchHeaderSpace(toHeaderspace(jc, c, w), getTraceElement());
+    return new MatchHeaderSpace(toHeaderSpace(jc, w), getTraceElement());
   }
 
   @VisibleForTesting
-  HeaderSpace toHeaderspace(JuniperConfiguration jc, Configuration c, Warnings w) {
+  HeaderSpace toHeaderSpace(JuniperConfiguration jc, Warnings w) {
     PrefixList pl = jc.getMasterLogicalSystem().getPrefixLists().get(_name);
 
     if (pl == null) {
@@ -43,25 +40,13 @@ HeaderSpace toHeaderspace(JuniperConfiguration jc, Configuration c, Warnings w)
       return HeaderSpace.builder().setNotDstIps(EmptyIpSpace.INSTANCE).build();
     }
 
-    if (pl.getIpv6()) {
-      // do not handle Ipv6 for now, assume matching nothing
-      return HeaderSpace.builder().setNotDstIps(EmptyIpSpace.INSTANCE).build();
-    }
-
-    RouteFilterList destinationPrefixList = c.getRouteFilterLists().get(_name);
-
+    IpSpace space = pl.toIpSpace();
     // if referenced prefix list is empty, it should not match anything
-    if (destinationPrefixList.getLines().isEmpty()) {
-      return HeaderSpace.builder().setNotDstIps(EmptyIpSpace.INSTANCE).build();
+    if (space instanceof EmptyIpSpace && !pl.getHasIpv6()) {
+      w.redFlag(String.format("destination-prefix-list \"%s\" is empty", _name));
     }
 
-    return HeaderSpace.builder()
-        .setNotDstIps(
-            AclIpSpace.union(
-                destinationPrefixList.getMatchingIps().stream()
-                    .map(IpWildcard::toIpSpace)
-                    .collect(ImmutableList.toImmutableList())))
-        .build();
+    return HeaderSpace.builder().setNotDstIps(space).build();
   }
 
   private TraceElement getTraceElement() {

diff --git a/projects/batfish/src/main/java/org/batfish/representation/juniper/FwFromPrefixList.java b/projects/batfish/src/main/java/org/batfish/representation/juniper/FwFromPrefixList.java
@@ -1,13 +1,10 @@
 package org.batfish.representation.juniper;
 
-import com.google.common.collect.ImmutableList;
 import org.batfish.common.Warnings;
-import org.batfish.datamodel.AclIpSpace;
 import org.batfish.datamodel.Configuration;
 import org.batfish.datamodel.EmptyIpSpace;
 import org.batfish.datamodel.HeaderSpace;
-import org.batfish.datamodel.IpWildcard;
-import org.batfish.datamodel.RouteFilterList;
+import org.batfish.datamodel.IpSpace;
 import org.batfish.datamodel.TraceElement;
 import org.batfish.datamodel.acl.AclLineMatchExpr;
 import org.batfish.datamodel.acl.MatchHeaderSpace;
@@ -29,10 +26,10 @@ public Field getField() {
 
   @Override
   public AclLineMatchExpr toAclLineMatchExpr(JuniperConfiguration jc, Configuration c, Warnings w) {
-    return new MatchHeaderSpace(toHeaderspace(jc, c, w), getTraceElement());
+    return new MatchHeaderSpace(toHeaderSpace(jc, w), getTraceElement());
   }
 
-  private HeaderSpace toHeaderspace(JuniperConfiguration jc, Configuration c, Warnings w) {
+  private HeaderSpace toHeaderSpace(JuniperConfiguration jc, Warnings w) {
     PrefixList pl = jc.getMasterLogicalSystem().getPrefixLists().get(_name);
 
     if (pl == null) {
@@ -41,25 +38,13 @@ private HeaderSpace toHeaderspace(JuniperConfiguration jc, Configuration c, Warn
       return HeaderSpace.builder().setSrcOrDstIps(EmptyIpSpace.INSTANCE).build();
     }
 
-    if (pl.getIpv6()) {
-      // do not handle Ipv6 for now, assume matching nothing
-      return HeaderSpace.builder().setSrcOrDstIps(EmptyIpSpace.INSTANCE).build();
-    }
-
-    RouteFilterList prefixList = c.getRouteFilterLists().get(_name);
-
+    IpSpace space = pl.toIpSpace();
     // if referenced prefix list is empty, it should not match anything
-    if (prefixList.getLines().isEmpty()) {
-      return HeaderSpace.builder().setSrcOrDstIps(EmptyIpSpace.INSTANCE).build();
+    if (space instanceof EmptyIpSpace && !pl.getHasIpv6()) {
+      w.redFlag(String.format("prefix-list \"%s\" is empty", _name));
     }
 
-    return HeaderSpace.builder()
-        .setSrcOrDstIps(
-            AclIpSpace.union(
-                prefixList.getMatchingIps().stream()
-                    .map(IpWildcard::toIpSpace)
-                    .collect(ImmutableList.toImmutableList())))
-        .build();
+    return HeaderSpace.builder().setSrcOrDstIps(space).build();
   }
 
   private TraceElement getTraceElement() {

diff --git a/...ects/batfish/src/main/java/org/batfish/representation/juniper/FwFromSourcePrefixList.java b/...ects/batfish/src/main/java/org/batfish/representation/juniper/FwFromSourcePrefixList.java
@@ -1,14 +1,11 @@
 package org.batfish.representation.juniper;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableList;
 import org.batfish.common.Warnings;
-import org.batfish.datamodel.AclIpSpace;
 import org.batfish.datamodel.Configuration;
 import org.batfish.datamodel.EmptyIpSpace;
 import org.batfish.datamodel.HeaderSpace;
-import org.batfish.datamodel.IpWildcard;
-import org.batfish.datamodel.RouteFilterList;
+import org.batfish.datamodel.IpSpace;
 import org.batfish.datamodel.TraceElement;
 import org.batfish.datamodel.acl.AclLineMatchExpr;
 import org.batfish.datamodel.acl.MatchHeaderSpace;
@@ -30,11 +27,11 @@ public Field getField() {
 
   @Override
   public AclLineMatchExpr toAclLineMatchExpr(JuniperConfiguration jc, Configuration c, Warnings w) {
-    return new MatchHeaderSpace(toHeaderspace(jc, c, w), getTraceElement());
+    return new MatchHeaderSpace(toHeaderSpace(jc, w), getTraceElement());
   }
 
   @VisibleForTesting
-  HeaderSpace toHeaderspace(JuniperConfiguration jc, Configuration c, Warnings w) {
+  HeaderSpace toHeaderSpace(JuniperConfiguration jc, Warnings w) {
     PrefixList pl = jc.getMasterLogicalSystem().getPrefixLists().get(_name);
 
     if (pl == null) {
@@ -43,25 +40,13 @@ HeaderSpace toHeaderspace(JuniperConfiguration jc, Configuration c, Warnings w)
       return HeaderSpace.builder().setSrcIps(EmptyIpSpace.INSTANCE).build();
     }
 
-    if (pl.getIpv6()) {
-      // do not handle Ipv6 for now, assume matching nothing
-      return HeaderSpace.builder().setSrcIps(EmptyIpSpace.INSTANCE).build();
-    }
-
-    RouteFilterList prefixList = c.getRouteFilterLists().get(_name);
-
+    IpSpace space = pl.toIpSpace();
     // if referenced prefix list is empty, it should not match anything
-    if (prefixList.getLines().isEmpty()) {
-      return HeaderSpace.builder().setSrcIps(EmptyIpSpace.INSTANCE).build();
+    if (space instanceof EmptyIpSpace && !pl.getHasIpv6()) {
+      w.redFlag(String.format("source-prefix-list \"%s\" is empty", _name));
     }
 
-    return HeaderSpace.builder()
-        .setSrcIps(
-            AclIpSpace.union(
-                prefixList.getMatchingIps().stream()
-                    .map(IpWildcard::toIpSpace)
-                    .collect(ImmutableList.toImmutableList())))
-        .build();
+    return HeaderSpace.builder().setSrcIps(space).build();
   }
 
   private TraceElement getTraceElement() {

diff --git a/...atfish/src/main/java/org/batfish/representation/juniper/FwFromSourcePrefixListExcept.java b/...atfish/src/main/java/org/batfish/representation/juniper/FwFromSourcePrefixListExcept.java
@@ -1,14 +1,11 @@
 package org.batfish.representation.juniper;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableList;
 import org.batfish.common.Warnings;
-import org.batfish.datamodel.AclIpSpace;
 import org.batfish.datamodel.Configuration;
 import org.batfish.datamodel.EmptyIpSpace;
 import org.batfish.datamodel.HeaderSpace;
-import org.batfish.datamodel.IpWildcard;
-import org.batfish.datamodel.RouteFilterList;
+import org.batfish.datamodel.IpSpace;
 import org.batfish.datamodel.TraceElement;
 import org.batfish.datamodel.acl.AclLineMatchExpr;
 import org.batfish.datamodel.acl.MatchHeaderSpace;
@@ -30,11 +27,11 @@ public Field getField() {
 
   @Override
   public AclLineMatchExpr toAclLineMatchExpr(JuniperConfiguration jc, Configuration c, Warnings w) {
-    return new MatchHeaderSpace(toHeaderspace(jc, c, w), getTraceElement());
+    return new MatchHeaderSpace(toHeaderSpace(jc, w), getTraceElement());
   }
 
   @VisibleForTesting
-  HeaderSpace toHeaderspace(JuniperConfiguration jc, Configuration c, Warnings w) {
+  HeaderSpace toHeaderSpace(JuniperConfiguration jc, Warnings w) {
     PrefixList pl = jc.getMasterLogicalSystem().getPrefixLists().get(_name);
 
     if (pl == null) {
@@ -43,25 +40,13 @@ HeaderSpace toHeaderspace(JuniperConfiguration jc, Configuration c, Warnings w)
       return HeaderSpace.builder().setNotSrcIps(EmptyIpSpace.INSTANCE).build();
     }
 
-    if (pl.getIpv6()) {
-      // do not handle Ipv6 for now, assume matching nothing
-      return HeaderSpace.builder().setNotSrcIps(EmptyIpSpace.INSTANCE).build();
-    }
-
-    RouteFilterList sourcePrefixList = c.getRouteFilterLists().get(_name);
-
+    IpSpace space = pl.toIpSpace();
     // if referenced prefix list is empty, it should not match anything
-    if (sourcePrefixList.getLines().isEmpty()) {
-      return HeaderSpace.builder().setNotSrcIps(EmptyIpSpace.INSTANCE).build();
+    if (space instanceof EmptyIpSpace && !pl.getHasIpv6()) {
+      w.redFlag(String.format("source-prefix-list \"%s\" is empty", _name));
     }
 
-    return HeaderSpace.builder()
-        .setNotSrcIps(
-            AclIpSpace.union(
-                sourcePrefixList.getMatchingIps().stream()
-                    .map(IpWildcard::toIpSpace)
-                    .collect(ImmutableList.toImmutableList())))
-        .build();
+    return HeaderSpace.builder().setNotSrcIps(space).build();
   }
 
   private TraceElement getTraceElement() {

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
@@ -4282,7 +4282,7 @@ private void warnEmptyPrefixLists() {
     for (Entry<String, PrefixList> e : _masterLogicalSystem.getPrefixLists().entrySet()) {
       String name = e.getKey();
       PrefixList prefixList = e.getValue();
-      if (!prefixList.getIpv6() && prefixList.getPrefixes().isEmpty()) {
+      if (!prefixList.getHasIpv6() && prefixList.getPrefixes().isEmpty()) {
         _w.redFlag("Empty prefix-list: '" + name + "'");
       }
     }