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.

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

juniper parse and partially convert condition #6658

Merged
merged 3 commits into from
Feb 25, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault;
import org.batfish.common.BatfishException;
import org.batfish.datamodel.routing_policy.Environment;
import org.batfish.datamodel.routing_policy.Result;

Expand All @@ -35,7 +34,8 @@ public <T, U> T accept(BooleanExprVisitor<T, U> visitor, U arg) {

@Override
public Result evaluate(Environment environment) {
throw new BatfishException("No implementation for HasRoute.evaluate()");
// TODO: implement
return new Result(false);
}

@JsonProperty(PROP_EXPR)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ COMPRESS_CONFIGURATION_FILES

CONDITION
:
'condition'
'condition' -> pushMode(M_Name)
;

CONFEDERATION
Expand Down Expand Up @@ -1824,6 +1824,8 @@ IDS_OPTION
'ids-option'
;

IF_ROUTE_EXISTS: 'if-route-exists';

IGMP
:
'igmp'
Expand Down Expand Up @@ -5610,6 +5612,8 @@ SYSTEM_SERVICES
'system-services'
;

TABLE: 'table';

TACACS
:
'tacacs'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ ip_option
| TIMESTAMP
;

ip_prefix: IP_PREFIX;

ip_protocol
:
AH
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,24 @@ po_community

po_condition
:
CONDITION null_filler
CONDITION name = junos_name (
apply
| pocond_if_route_exists
)
;

pocond_if_route_exists
:
IF_ROUTE_EXISTS (
pocondi_prefix
| pocondi_table
)
;

pocondi_prefix: prefix=ip_prefix;

pocondi_table: TABLE name=variable;

po_policy_statement
:
POLICY_STATEMENT name = variable
Expand Down Expand Up @@ -124,6 +139,7 @@ pops_from
| popsf_as_path_group
| popsf_color
| popsf_community
| popsf_condition
| popsf_family
| popsf_instance
| popsf_interface
Expand Down Expand Up @@ -191,6 +207,8 @@ popsf_community
COMMUNITY name = variable
;

popsf_condition: CONDITION name = junos_name;

popsf_family
:
FAMILY
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import static org.batfish.representation.juniper.JuniperStructureType.AUTHENTICATION_KEY_CHAIN;
import static org.batfish.representation.juniper.JuniperStructureType.BGP_GROUP;
import static org.batfish.representation.juniper.JuniperStructureType.COMMUNITY;
import static org.batfish.representation.juniper.JuniperStructureType.CONDITION;
import static org.batfish.representation.juniper.JuniperStructureType.DHCP_RELAY_SERVER_GROUP;
import static org.batfish.representation.juniper.JuniperStructureType.FIREWALL_FILTER;
import static org.batfish.representation.juniper.JuniperStructureType.FIREWALL_FILTER_TERM;
Expand Down Expand Up @@ -77,6 +78,7 @@
import static org.batfish.representation.juniper.JuniperStructureUsage.POLICY_STATEMENT_FROM_AS_PATH;
import static org.batfish.representation.juniper.JuniperStructureUsage.POLICY_STATEMENT_FROM_AS_PATH_GROUP;
import static org.batfish.representation.juniper.JuniperStructureUsage.POLICY_STATEMENT_FROM_COMMUNITY;
import static org.batfish.representation.juniper.JuniperStructureUsage.POLICY_STATEMENT_FROM_CONDITION;
import static org.batfish.representation.juniper.JuniperStructureUsage.POLICY_STATEMENT_FROM_INSTANCE;
import static org.batfish.representation.juniper.JuniperStructureUsage.POLICY_STATEMENT_FROM_INTERFACE;
import static org.batfish.representation.juniper.JuniperStructureUsage.POLICY_STATEMENT_POLICY;
Expand Down Expand Up @@ -299,6 +301,7 @@
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Intir_memberContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Intir_member_rangeContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Ip_optionContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Ip_prefixContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Ip_protocolContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Ipsec_authentication_algorithmContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Ipsec_protocolContext;
Expand Down Expand Up @@ -362,12 +365,16 @@
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Po_as_pathContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Po_as_path_groupContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Po_communityContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Po_conditionContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Po_policy_statementContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Po_prefix_listContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Poapg_as_pathContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Poc_invert_matchContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Poc_membersContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Poc_members_memberContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Pocond_if_route_existsContext;
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;
Expand All @@ -378,6 +385,7 @@
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Popsf_as_path_groupContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Popsf_colorContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Popsf_communityContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Popsf_conditionContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Popsf_familyContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Popsf_instanceContext;
import org.batfish.grammar.flatjuniper.FlatJuniperParser.Popsf_interfaceContext;
Expand Down Expand Up @@ -629,6 +637,7 @@
import org.batfish.representation.juniper.BgpGroup.BgpGroupType;
import org.batfish.representation.juniper.CommunityMember;
import org.batfish.representation.juniper.ConcreteFirewallFilter;
import org.batfish.representation.juniper.Condition;
import org.batfish.representation.juniper.DhcpRelayGroup;
import org.batfish.representation.juniper.DhcpRelayServerGroup;
import org.batfish.representation.juniper.Family;
Expand Down Expand Up @@ -730,6 +739,7 @@
import org.batfish.representation.juniper.PsFromAsPath;
import org.batfish.representation.juniper.PsFromColor;
import org.batfish.representation.juniper.PsFromCommunity;
import org.batfish.representation.juniper.PsFromCondition;
import org.batfish.representation.juniper.PsFromFamily;
import org.batfish.representation.juniper.PsFromInstance;
import org.batfish.representation.juniper.PsFromInterface;
Expand Down Expand Up @@ -2009,6 +2019,8 @@ static String unquote(String text) {

private NatRuleSet _currentNatRuleSet;

private Condition _currentCondition;

private PolicyStatement _currentPolicyStatement;

private PrefixList _currentPrefixList;
Expand Down Expand Up @@ -6134,6 +6146,46 @@ public void exitVlt_l3_interface(Vlt_l3_interfaceContext ctx) {
_currentNamedVlan.setL3Interface(name);
}

@Override
public void enterPo_condition(Po_conditionContext ctx) {
String name = toString(ctx.name);
_currentCondition = _currentLogicalSystem.getConditions().computeIfAbsent(name, Condition::new);
_configuration.defineFlattenedStructure(CONDITION, name, ctx, _parser);
}

@Override
public void exitPo_condition(Po_conditionContext ctx) {
_currentCondition = null;
}

@Override
public void enterPocond_if_route_exists(Pocond_if_route_existsContext ctx) {
_currentCondition.getOrCreateIfRouteExists();
}

@Override
public void exitPocondi_prefix(Pocondi_prefixContext ctx) {
_currentCondition.getIfRouteExists().setPrefix(toPrefix(ctx.prefix));
}

@Override
public void exitPocondi_table(Pocondi_tableContext ctx) {
_currentCondition.getIfRouteExists().setTable(unquote(ctx.name.getText()));
}

private static @Nonnull Prefix toPrefix(Ip_prefixContext ctx) {
return Prefix.parse(ctx.getText());
}

@Override
public void exitPopsf_condition(Popsf_conditionContext ctx) {
todo(ctx);
String name = toString(ctx.name);
_configuration.referenceStructure(
CONDITION, name, POLICY_STATEMENT_FROM_CONDITION, getLine(ctx.getStart()));
_currentPsTerm.getFroms().addFromCondition(new PsFromCondition(name));
}

@Nullable
private IpWildcard formIpWildCard(Fftfa_address_mask_prefixContext ctx) {
IpWildcard ipWildcard = null;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package org.batfish.representation.juniper;

import java.io.Serializable;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault;

@ParametersAreNonnullByDefault
public final class Condition implements Serializable {

public Condition(String name) {
_name = name;
}

public @Nonnull IfRouteExists getOrCreateIfRouteExists() {
if (_ifRouteExists == null) {
_ifRouteExists = new IfRouteExists();
}
return _ifRouteExists;
}

public @Nullable IfRouteExists getIfRouteExists() {
return _ifRouteExists;
}

public @Nonnull String getName() {
return _name;
}

private final String _name;
private @Nullable IfRouteExists _ifRouteExists;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package org.batfish.representation.juniper;

import java.io.Serializable;
import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault;
import org.batfish.datamodel.Prefix;

/** Subcondition checking existence of a route in a table */
@ParametersAreNonnullByDefault
public final class IfRouteExists implements Serializable {

@Nullable
public Prefix getPrefix() {
return _prefix;
}

public void setPrefix(@Nullable Prefix prefix) {
_prefix = prefix;
}

@Nullable
public String getTable() {
return _table;
}

public void setTable(@Nullable String table) {
_table = table;
}

private @Nullable Prefix _prefix;
private @Nullable String _table;
}