FRR: Adding max-metric router-lsa administrative support (#6577)

batfish · Jan 20, 2021 · f5664d8 · f5664d8
1 parent 5f3a9b4
commit f5664d8
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 0 deletions.
diff --git a/projects/batfish/src/main/antlr4/org/batfish/grammar/cumulus_frr/CumulusFrrLexer.g4 b/projects/batfish/src/main/antlr4/org/batfish/grammar/cumulus_frr/CumulusFrrLexer.g4
@@ -474,6 +474,11 @@ MAX_MED
   'max-med'
 ;
 
+MAX_METRIC
+:
+  'max-metric'
+;
+
 MESSAGE_DIGEST
 :
   'message-digest'
@@ -734,6 +739,11 @@ ROUTE_REFLECTOR_CLIENT
   'route-reflector-client'
 ;
 
+ROUTER_LSA
+:
+  'router-lsa'
+;
+
 SUBNET_MASK
 :
   F_SubnetMask

diff --git a/projects/batfish/src/main/antlr4/org/batfish/grammar/cumulus_frr/CumulusFrr_ospf.g4 b/projects/batfish/src/main/antlr4/org/batfish/grammar/cumulus_frr/CumulusFrr_ospf.g4
@@ -11,6 +11,7 @@ s_router_ospf
   ROUTER OSPF NEWLINE
   (
     ro_log_adj_changes
+    | ro_max_metric_router_lsa_administrative
     | ro_no
     | ro_passive_interface
     | ro_router_id
@@ -23,6 +24,11 @@ ro_log_adj_changes
   LOG_ADJACENCY_CHANGES DETAIL? NEWLINE
 ;
 
+ro_max_metric_router_lsa_administrative
+:
+  MAX_METRIC ROUTER_LSA ADMINISTRATIVE NEWLINE
+;
+
 ro_no
 :
   NO
@@ -40,6 +46,8 @@ rono_passive_interface
   )
 ;
 
+
+
 ro_redistribute
 :
   REDISTRIBUTE ospf_redist_type (ROUTE_MAP route_map_name)? NEWLINE

diff --git a/...batfish/src/main/java/org/batfish/grammar/cumulus_frr/CumulusFrrConfigurationBuilder.java b/...batfish/src/main/java/org/batfish/grammar/cumulus_frr/CumulusFrrConfigurationBuilder.java
@@ -86,6 +86,7 @@
 import org.batfish.grammar.cumulus_frr.CumulusFrrParser.Rms_tagContext;
 import org.batfish.grammar.cumulus_frr.CumulusFrrParser.Rms_weightContext;
 import org.batfish.grammar.cumulus_frr.CumulusFrrParser.Rmsipnh_literalContext;
+import org.batfish.grammar.cumulus_frr.CumulusFrrParser.Ro_max_metric_router_lsa_administrativeContext;
 import org.batfish.grammar.cumulus_frr.CumulusFrrParser.Ro_redistributeContext;
 import org.batfish.grammar.cumulus_frr.CumulusFrrParser.Ro_router_idContext;
 import org.batfish.grammar.cumulus_frr.CumulusFrrParser.Ronopi_defaultContext;
@@ -677,6 +678,12 @@ public void enterS_router_ospf(S_router_ospfContext ctx) {
     }
   }
 
+  @Override
+  public void exitRo_max_metric_router_lsa_administrative(
+      Ro_max_metric_router_lsa_administrativeContext ctx) {
+    _frr.getOspfProcess().setMaxMetricRouterLsa(true);
+  }
+
   @Override
   public void exitRo_router_id(Ro_router_idContext ctx) {
     if (_frr.getOspfProcess() == null) {

diff --git a/projects/batfish/src/main/java/org/batfish/representation/cumulus/CumulusConversions.java b/projects/batfish/src/main/java/org/batfish/representation/cumulus/CumulusConversions.java
@@ -144,6 +144,7 @@ public final class CumulusConversions {
   public static final Ip CLAG_LINK_LOCAL_IP = Ip.parse("169.254.40.94");
 
   public static final long DEFAULT_MAX_MED = 4294967294L;
+  public static final long DEFAULT_OSPF_MAX_METRIC = 0xFFFF;
 
   @VisibleForTesting
   static GeneratedRoute GENERATED_DEFAULT_ROUTE =
@@ -1245,6 +1246,11 @@ static org.batfish.datamodel.ospf.OspfProcess toOspfProcess(
     addOspfInterfaces(vsConfig, vrfInterfaces, proc.getProcessId(), w);
     proc.setAreas(computeOspfAreas(vsConfig, vrfInterfaces.keySet()));
 
+    // Handle Max Metric Router LSA
+    if (firstNonNull(vsConfig.getOspfProcess().getMaxMetricRouterLsa(), Boolean.FALSE)) {
+      proc.setMaxMetricTransitLinks(DEFAULT_OSPF_MAX_METRIC);
+    }
+
     // Handle Redistribution
     String ospfExportPolicyName = computeOspfExportPolicyName(ospfVrf.getVrfName());
     RoutingPolicy ospfExportPolicy = new RoutingPolicy(ospfExportPolicyName, c);

diff --git a/projects/batfish/src/main/java/org/batfish/representation/cumulus/OspfProcess.java b/projects/batfish/src/main/java/org/batfish/representation/cumulus/OspfProcess.java
@@ -5,6 +5,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.batfish.datamodel.Configuration;
 
 /** Class for ospf process */
@@ -18,6 +19,7 @@ public class OspfProcess implements Serializable {
   public static String DEFAULT_OSPF_PROCESS_NAME = "default";
 
   private Map<CumulusRoutingProtocol, RedistributionPolicy> _redistributionPolicies;
+  private @Nullable Boolean _maxMetricRouterLsa;
 
   public OspfProcess() {
     _defaultVrf = new OspfVrf(Configuration.DEFAULT_VRF_NAME);
@@ -46,4 +48,12 @@ public void setDefaultPassiveInterface(boolean defaultPassiveInterface) {
   public Map<CumulusRoutingProtocol, RedistributionPolicy> getRedistributionPolicies() {
     return _redistributionPolicies;
   }
+
+  public Boolean getMaxMetricRouterLsa() {
+    return _maxMetricRouterLsa;
+  }
+
+  public void setMaxMetricRouterLsa(Boolean maxMetricRouterLsa) {
+    _maxMetricRouterLsa = maxMetricRouterLsa;
+  }
 }
diff --git a/projects/batfish/src/test/java/org/batfish/grammar/cumulus_frr/CumulusFrrGrammarTest.java b/projects/batfish/src/test/java/org/batfish/grammar/cumulus_frr/CumulusFrrGrammarTest.java
@@ -1682,6 +1682,18 @@ public void testOspfRedistributeBgpRouteMap() {
     assertThat(policy.getRouteMap(), equalTo("foo"));
   }
 
+  @Test
+  public void testOspfMaxMetricRouterLsaAdministrativeDefault() {
+    parseLines("router ospf");
+    assertThat(_frr.getOspfProcess().getMaxMetricRouterLsa(), equalTo(null));
+  }
+
+  @Test
+  public void testOspfMaxMetricRouterLsaAdministrative() {
+    parseLines("router ospf", "max-metric router-lsa administrative");
+    assertThat(_frr.getOspfProcess().getMaxMetricRouterLsa(), equalTo(true));
+  }
+
   @Test
   public void testOspfRedistributeBgpSetMetric_behavior() throws IOException {
     /*

diff --git a/...ects/batfish/src/test/java/org/batfish/representation/cumulus/CumulusConversionsTest.java b/...ects/batfish/src/test/java/org/batfish/representation/cumulus/CumulusConversionsTest.java
@@ -1238,6 +1238,26 @@ public void testToOspfProcess_RedistributionPolicy() {
             new SetOspfMetricType(OspfMetricType.E2), new SetMetric(new LiteralLong(20L))));
   }
 
+  @Test
+  public void testToOspfProcess_MaxMetricRouterLsa() {
+    OspfVrf ospfVrf = new OspfVrf(DEFAULT_VRF_NAME);
+    CumulusNcluConfiguration vsConfig = new CumulusNcluConfiguration();
+    OspfProcess vsOspf = new OspfProcess();
+    vsOspf.setMaxMetricRouterLsa(true);
+    vsConfig.setOspfProcess(vsOspf);
+
+    org.batfish.datamodel.ospf.OspfProcess ospfProcess =
+        toOspfProcess(
+            new Configuration("dummy", ConfigurationFormat.CUMULUS_NCLU),
+            vsConfig,
+            ospfVrf,
+            ImmutableMap.of(),
+            new Warnings());
+    assertThat(
+        ospfProcess.getMaxMetricTransitLinks(),
+        equalTo(CumulusConversions.DEFAULT_OSPF_MAX_METRIC));
+  }
+
   @Test
   public void testConvertOspfRedistributionPolicy() {
     // setup VI model