Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

JunOS: clean-up prefix-list to IpSpace conversion #8060

Merged
merged 3 commits into from
Feb 18, 2022
Merged

JunOS: clean-up prefix-list to IpSpace conversion #8060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3da63cd
JunOS: clean-up prefix-list to IpSpace conversion
dhalperi Feb 18, 2022
9f530d6
cleanup existing tests
dhalperi Feb 18, 2022
4ba7198
also fix PsFromPrefixList
dhalperi Feb 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions ...cts/batfish/src/main/antlr4/org/batfish/grammar/flatjuniper/FlatJuniper_policy_options.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,6 @@ poplt_apply_path
APPLY_PATH path = DOUBLE_QUOTED_STRING
;

poplt_ip6
:
ip6 = IPV6_ADDRESS
;

poplt_network
:
network = ip_prefix
Expand Down
8 changes: 1 addition & 7 deletions projects/batfish/src/main/java/org/batfish/grammar/flatjuniper/ConfigurationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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
Expand Down
29 changes: 7 additions & 22 deletions ...batfish/src/main/java/org/batfish/representation/juniper/FwFromDestinationPrefixList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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) {
Expand All @@ -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() {
Expand Down
29 changes: 7 additions & 22 deletions ...h/src/main/java/org/batfish/representation/juniper/FwFromDestinationPrefixListExcept.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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) {
Expand All @@ -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() {
Expand Down
29 changes: 7 additions & 22 deletions projects/batfish/src/main/java/org/batfish/representation/juniper/FwFromPrefixList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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) {
Expand All @@ -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() {
Expand Down
29 changes: 7 additions & 22 deletions ...ects/batfish/src/main/java/org/batfish/representation/juniper/FwFromSourcePrefixList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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) {
Expand All @@ -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() {
Expand Down
29 changes: 7 additions & 22 deletions ...atfish/src/main/java/org/batfish/representation/juniper/FwFromSourcePrefixListExcept.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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) {
Expand All @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion projects/batfish/src/main/java/org/batfish/representation/juniper/JuniperConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 + "'");
}
}
Expand Down