Skip to content

Commit

Permalink
Revert the next-hop part of #7392 (#7395)
Browse files Browse the repository at this point in the history 
Needs further validation; these devices may propagate next-hops
for redistributed routes in some cases.
  • Loading branch information
@dhalperi
dhalperi committed Sep 15, 2021
1 parent 252d21c commit 194f9b7
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 241 deletions.
5 changes: 0 additions & 5 deletions projects/batfish/src/main/java/org/batfish/representation/cisco/CiscoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@
import org.batfish.datamodel.routing_policy.expr.Conjunction;
import org.batfish.datamodel.routing_policy.expr.DestinationNetwork;
import org.batfish.datamodel.routing_policy.expr.DestinationNetwork6;
import org.batfish.datamodel.routing_policy.expr.DiscardNextHop;
import org.batfish.datamodel.routing_policy.expr.Disjunction;
import org.batfish.datamodel.routing_policy.expr.ExplicitPrefix6Set;
import org.batfish.datamodel.routing_policy.expr.ExplicitPrefixSet;
Expand All @@ -192,7 +191,6 @@
import org.batfish.datamodel.routing_policy.statement.CallStatement;
import org.batfish.datamodel.routing_policy.statement.If;
import org.batfish.datamodel.routing_policy.statement.SetMetric;
import org.batfish.datamodel.routing_policy.statement.SetNextHop;
import org.batfish.datamodel.routing_policy.statement.SetOrigin;
import org.batfish.datamodel.routing_policy.statement.SetOspfMetricType;
import org.batfish.datamodel.routing_policy.statement.SetWeight;
Expand Down Expand Up @@ -1018,9 +1016,6 @@ private org.batfish.datamodel.BgpProcess toBgpProcess(
RoutingPolicy.Builder redistributionPolicy =
RoutingPolicy.builder().setOwner(c).setName(redistPolicyName);

// For IOS, next-hop is cleared on routes redistributed into BGP (though it may be rewritten
// later in the policy).
redistributionPolicy.addStatement(new SetNextHop(DiscardNextHop.INSTANCE));
// For IOS, local routes have a default weight of 32768.
redistributionPolicy.addStatement(new SetWeight(new LiteralInt(DEFAULT_LOCAL_BGP_WEIGHT)));

Expand Down
5 changes: 0 additions & 5 deletions projects/batfish/src/main/java/org/batfish/representation/cisco_xr/CiscoXrConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@
import org.batfish.datamodel.routing_policy.expr.CallExpr;
import org.batfish.datamodel.routing_policy.expr.Conjunction;
import org.batfish.datamodel.routing_policy.expr.DestinationNetwork;
import org.batfish.datamodel.routing_policy.expr.DiscardNextHop;
import org.batfish.datamodel.routing_policy.expr.ExplicitPrefixSet;
import org.batfish.datamodel.routing_policy.expr.LiteralInt;
import org.batfish.datamodel.routing_policy.expr.LiteralLong;
Expand All @@ -153,7 +152,6 @@
import org.batfish.datamodel.routing_policy.expr.Not;
import org.batfish.datamodel.routing_policy.statement.If;
import org.batfish.datamodel.routing_policy.statement.SetMetric;
import org.batfish.datamodel.routing_policy.statement.SetNextHop;
import org.batfish.datamodel.routing_policy.statement.SetOrigin;
import org.batfish.datamodel.routing_policy.statement.SetOspfMetricType;
import org.batfish.datamodel.routing_policy.statement.SetWeight;
Expand Down Expand Up @@ -820,9 +818,6 @@ private org.batfish.datamodel.BgpProcess toBgpProcess(
RoutingPolicy.Builder redistributionPolicy =
RoutingPolicy.builder().setOwner(c).setName(redistPolicyName);

// For IOS-XR, next-hop is cleared on routes redistributed into BGP (though it may be rewritten
// later in the policy).
redistributionPolicy.addStatement(new SetNextHop(DiscardNextHop.INSTANCE));
// For IOS-XR, local routes have a default weight of 32768.
redistributionPolicy.addStatement(new SetWeight(new LiteralInt(DEFAULT_LOCAL_BGP_WEIGHT)));

Expand Down
6 changes: 3 additions & 3 deletions projects/batfish/src/test/java/org/batfish/grammar/cisco/CiscoGrammarTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3598,7 +3598,7 @@ public void testIosXeEigrpToBgpRedistConversion() throws IOException {
.setAdmin(ebgpAdmin)
.setLocalPreference(DEFAULT_LOCAL_PREFERENCE)
.setMetric(matchEigrp.getMetric())
.setNextHop(NextHopDiscard.instance())
.setNextHop(NextHopIp.of(nextHopIp))
.setReceivedFromIp(Ip.ZERO)
.setOriginatorIp(bgpRouterId)
.setOriginType(OriginType.INCOMPLETE)
Expand Down Expand Up @@ -3630,7 +3630,7 @@ public void testIosXeEigrpToBgpRedistConversion() throws IOException {
.setAdmin(ibgpAdmin)
.setLocalPreference(DEFAULT_LOCAL_PREFERENCE)
.setMetric(matchEigrp.getMetric())
.setNextHop(NextHopDiscard.instance())
.setNextHop(NextHopIp.of(nextHopIp))
.setReceivedFromIp(Ip.ZERO)
.setOriginatorIp(bgpRouterId)
.setOriginType(OriginType.INCOMPLETE)
Expand Down Expand Up @@ -3673,7 +3673,7 @@ public void testIosXeEigrpToBgpRedistConversion() throws IOException {
.setAdmin(ebgpAdmin)
.setLocalPreference(DEFAULT_LOCAL_PREFERENCE)
.setMetric(matchEigrpEx.getMetric())
.setNextHop(NextHopDiscard.instance())
.setNextHop(NextHopIp.of(nextHopIp))
.setReceivedFromIp(Ip.ZERO)
.setOriginatorIp(bgpRouterId)
.setOriginType(OriginType.INCOMPLETE)
Expand Down
6 changes: 0 additions & 6 deletions tests/aws/vimodel-example-aws.ref
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61572,12 +61572,6 @@
"~BGP_REDISTRIBUTION_POLICY:default~" : {
"name" : "~BGP_REDISTRIBUTION_POLICY:default~",
"statements" : [
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetNextHop",
"expr" : {
"class" : "org.batfish.datamodel.routing_policy.expr.DiscardNextHop"
}
},
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetWeight",
"weight" : {
Expand Down
78 changes: 0 additions & 78 deletions tests/basic/viModel.ref
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1213,12 +1213,6 @@
"~BGP_REDISTRIBUTION_POLICY:default~" : {
"name" : "~BGP_REDISTRIBUTION_POLICY:default~",
"statements" : [
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetNextHop",
"expr" : {
"class" : "org.batfish.datamodel.routing_policy.expr.DiscardNextHop"
}
},
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetWeight",
"weight" : {
Expand Down Expand Up @@ -2936,12 +2930,6 @@
"~BGP_REDISTRIBUTION_POLICY:default~" : {
"name" : "~BGP_REDISTRIBUTION_POLICY:default~",
"statements" : [
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetNextHop",
"expr" : {
"class" : "org.batfish.datamodel.routing_policy.expr.DiscardNextHop"
}
},
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetWeight",
"weight" : {
Expand Down Expand Up @@ -3595,12 +3583,6 @@
"~BGP_REDISTRIBUTION_POLICY:default~" : {
"name" : "~BGP_REDISTRIBUTION_POLICY:default~",
"statements" : [
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetNextHop",
"expr" : {
"class" : "org.batfish.datamodel.routing_policy.expr.DiscardNextHop"
}
},
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetWeight",
"weight" : {
Expand Down Expand Up @@ -5230,12 +5212,6 @@
"~BGP_REDISTRIBUTION_POLICY:default~" : {
"name" : "~BGP_REDISTRIBUTION_POLICY:default~",
"statements" : [
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetNextHop",
"expr" : {
"class" : "org.batfish.datamodel.routing_policy.expr.DiscardNextHop"
}
},
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetWeight",
"weight" : {
Expand Down Expand Up @@ -6959,12 +6935,6 @@
"~BGP_REDISTRIBUTION_POLICY:default~" : {
"name" : "~BGP_REDISTRIBUTION_POLICY:default~",
"statements" : [
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetNextHop",
"expr" : {
"class" : "org.batfish.datamodel.routing_policy.expr.DiscardNextHop"
}
},
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetWeight",
"weight" : {
Expand Down Expand Up @@ -7761,12 +7731,6 @@
"~BGP_REDISTRIBUTION_POLICY:default~" : {
"name" : "~BGP_REDISTRIBUTION_POLICY:default~",
"statements" : [
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetNextHop",
"expr" : {
"class" : "org.batfish.datamodel.routing_policy.expr.DiscardNextHop"
}
},
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetWeight",
"weight" : {
Expand Down Expand Up @@ -8422,12 +8386,6 @@
"~BGP_REDISTRIBUTION_POLICY:default~" : {
"name" : "~BGP_REDISTRIBUTION_POLICY:default~",
"statements" : [
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetNextHop",
"expr" : {
"class" : "org.batfish.datamodel.routing_policy.expr.DiscardNextHop"
}
},
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetWeight",
"weight" : {
Expand Down Expand Up @@ -9715,12 +9673,6 @@
"~BGP_REDISTRIBUTION_POLICY:default~" : {
"name" : "~BGP_REDISTRIBUTION_POLICY:default~",
"statements" : [
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetNextHop",
"expr" : {
"class" : "org.batfish.datamodel.routing_policy.expr.DiscardNextHop"
}
},
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetWeight",
"weight" : {
Expand Down Expand Up @@ -10740,12 +10692,6 @@
"~BGP_REDISTRIBUTION_POLICY:default~" : {
"name" : "~BGP_REDISTRIBUTION_POLICY:default~",
"statements" : [
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetNextHop",
"expr" : {
"class" : "org.batfish.datamodel.routing_policy.expr.DiscardNextHop"
}
},
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetWeight",
"weight" : {
Expand Down Expand Up @@ -11778,12 +11724,6 @@
"~BGP_REDISTRIBUTION_POLICY:default~" : {
"name" : "~BGP_REDISTRIBUTION_POLICY:default~",
"statements" : [
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetNextHop",
"expr" : {
"class" : "org.batfish.datamodel.routing_policy.expr.DiscardNextHop"
}
},
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetWeight",
"weight" : {
Expand Down Expand Up @@ -13276,12 +13216,6 @@
"~BGP_REDISTRIBUTION_POLICY:default~" : {
"name" : "~BGP_REDISTRIBUTION_POLICY:default~",
"statements" : [
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetNextHop",
"expr" : {
"class" : "org.batfish.datamodel.routing_policy.expr.DiscardNextHop"
}
},
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetWeight",
"weight" : {
Expand Down Expand Up @@ -14763,12 +14697,6 @@
"~BGP_REDISTRIBUTION_POLICY:default~" : {
"name" : "~BGP_REDISTRIBUTION_POLICY:default~",
"statements" : [
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetNextHop",
"expr" : {
"class" : "org.batfish.datamodel.routing_policy.expr.DiscardNextHop"
}
},
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetWeight",
"weight" : {
Expand Down Expand Up @@ -15444,12 +15372,6 @@
"~BGP_REDISTRIBUTION_POLICY:default~" : {
"name" : "~BGP_REDISTRIBUTION_POLICY:default~",
"statements" : [
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetNextHop",
"expr" : {
"class" : "org.batfish.datamodel.routing_policy.expr.DiscardNextHop"
}
},
{
"class" : "org.batfish.datamodel.routing_policy.statement.SetWeight",
"weight" : {
Expand Down

0 comments on commit 194f9b7

Please sign in to comment.