Added support for Arista vlan to vni mapping new syntax

projects/batfish/src/main/antlr4/org/batfish/grammar/arista/Arista_common.g4

@@ -59,4 +59,54 @@ vrf_name
 word
 :
   WORD
+;
+
+vni_number
+:
+// 0-16777214
+  uint32
+;
+
+vlan_id
+:
+// 1-4094
+  uint16
+;
+
+
+vlan_range
+:
+   (
+      vlan_range_list += vlan_subrange
+      (
+         COMMA vlan_range_list += vlan_subrange
+      )*
+   )
+   | NONE
+;
+
+vlan_subrange
+:
+   low = vlan_id
+   (
+      DASH high = vlan_id
+   )?
+;
+
+vni_range
+:
+   (
+      vni_range_list += vni_subrange
+      (
+         COMMA vni_range_list += vni_subrange
+      )*
+   )
+;
+
+vni_subrange
+:
+   low = vni_number
+   (
+      DASH high = vni_number
+   )?
 ;

projects/batfish/src/main/antlr4/org/batfish/grammar/arista/Legacy_interface.g4

@@ -1,6 +1,6 @@
 parser grammar Legacy_interface;
 
-import Legacy_common, Arista_interface;
+import Legacy_common, Arista_interface, Arista_common;
 
 options {
    tokenVocab = AristaLexer;
@@ -42,6 +42,7 @@ eos_vxif_vxlan
      | eos_vxif_vxlan_source_interface
      | eos_vxif_vxlan_udp_port
      | eos_vxif_vxlan_virtual_router
+     | eos_vxif_vxlan_vlan_vni_range
      | eos_vxif_vxlan_vlan
      | eos_vxif_vxlan_vrf
   )
@@ -74,6 +75,11 @@ eos_vxif_vxlan_virtual_router
    (ENCAPSULATION MAC_ADDRESS MLAG_SYSTEM_ID) NEWLINE
 ;
 
+eos_vxif_vxlan_vlan_vni_range
+:
+   VLAN vlans = vlan_range VNI vnis = vni_range NEWLINE
+;
+
 eos_vxif_vxlan_vlan
 :
    VLAN num = dec

projects/batfish/src/main/java/org/batfish/grammar/arista/AristaControlPlaneExtractor.java

@@ -575,6 +575,7 @@
 import org.batfish.grammar.arista.AristaParser.Eos_vxif_vxlan_udp_portContext;
 import org.batfish.grammar.arista.AristaParser.Eos_vxif_vxlan_vlanContext;
 import org.batfish.grammar.arista.AristaParser.Eos_vxif_vxlan_vlan_vniContext;
+import org.batfish.grammar.arista.AristaParser.Eos_vxif_vxlan_vlan_vni_rangeContext;
 import org.batfish.grammar.arista.AristaParser.Eos_vxif_vxlan_vrfContext;
 import org.batfish.grammar.arista.AristaParser.Extended_access_list_additional_featureContext;
 import org.batfish.grammar.arista.AristaParser.Extended_access_list_tailContext;
@@ -847,12 +848,18 @@
 import org.batfish.grammar.arista.AristaParser.Vlan_d_nameContext;
 import org.batfish.grammar.arista.AristaParser.Vlan_d_stateContext;
 import org.batfish.grammar.arista.AristaParser.Vlan_d_trunkContext;
+import org.batfish.grammar.arista.AristaParser.Vlan_idContext;
 import org.batfish.grammar.arista.AristaParser.Vlan_nameContext;
 import org.batfish.grammar.arista.AristaParser.Vlan_no_nameContext;
 import org.batfish.grammar.arista.AristaParser.Vlan_no_stateContext;
 import org.batfish.grammar.arista.AristaParser.Vlan_no_trunkContext;
+import org.batfish.grammar.arista.AristaParser.Vlan_rangeContext;
 import org.batfish.grammar.arista.AristaParser.Vlan_stateContext;
+import org.batfish.grammar.arista.AristaParser.Vlan_subrangeContext;
 import org.batfish.grammar.arista.AristaParser.Vlan_trunkContext;
+import org.batfish.grammar.arista.AristaParser.Vni_numberContext;
+import org.batfish.grammar.arista.AristaParser.Vni_rangeContext;
+import org.batfish.grammar.arista.AristaParser.Vni_subrangeContext;
 import org.batfish.grammar.arista.AristaParser.Vrf_nameContext;
 import org.batfish.grammar.arista.AristaParser.Vrfd_descriptionContext;
 import org.batfish.grammar.arista.AristaParser.Wccp_idContext;
@@ -1032,6 +1039,14 @@ private static int toInteger(Token t) {
     return Integer.parseInt(t.getText());
   }
 
+  private static int toInteger(Vlan_idContext ctx) {
+    return Integer.parseInt(ctx.getText());
+  }
+
+  private static int toInteger(Vni_numberContext ctx) {
+    return Integer.parseInt(ctx.getText());
+  }
+
   private static String toInterfaceName(Interface_nameContext ctx) {
     StringBuilder name =
         new StringBuilder(
@@ -1081,6 +1096,22 @@ private static IntegerSpace toIntegerSpace(Eos_vlan_idContext ctx) {
         .get();
   }
 
+  @Nonnull
+  private static IntegerSpace toIntegerSpace(Vlan_rangeContext ctx) {
+    return ctx.vlan_range_list.stream()
+        .map(innerctx -> IntegerSpace.of(toSubRange(innerctx)))
+        .reduce(IntegerSpace::union)
+        .get();
+  }
+
+  @Nonnull
+  private static IntegerSpace toIntegerSpace(Vni_rangeContext ctx) {
+    return ctx.vni_range_list.stream()
+        .map(innerctx -> IntegerSpace.of(toSubRange(innerctx)))
+        .reduce(IntegerSpace::union)
+        .get();
+  }
+
   private static Ip toIp(TerminalNode t) {
     return Ip.parse(t.getText());
   }
@@ -1126,6 +1157,26 @@ private static SubRange toSubRange(SubrangeContext ctx) {
     }
   }
 
+  private static SubRange toSubRange(Vlan_subrangeContext ctx) {
+    int low = toInteger(ctx.low);
+    if (ctx.DASH() != null) {
+      int high = toInteger(ctx.high);
+      return new SubRange(low, high);
+    } else {
+      return SubRange.singleton(low);
+    }
+  }
+
+  private static SubRange toSubRange(Vni_subrangeContext ctx) {
+    int low = toInteger(ctx.low);
+    if (ctx.DASH() != null) {
+      int high = toInteger(ctx.high);
+      return new SubRange(low, high);
+    } else {
+      return SubRange.singleton(low);
+    }
+  }
+
   private static String unquote(String text) {
     if (text.length() == 0) {
       return text;
@@ -3509,6 +3560,33 @@ public void exitEos_vxif_vxlan_udp_port(Eos_vxif_vxlan_udp_portContext ctx) {
     _eosVxlan.setUdpPort(toInteger(ctx.num));
   }
 
+  @Override
+  public void enterEos_vxif_vxlan_vlan_vni_range(Eos_vxif_vxlan_vlan_vni_rangeContext ctx) {
+    List<Integer> vnis = new ArrayList<>();
+    List<Integer> vlans = new ArrayList<>();
+
+    if (ctx.vlans != null) {
+      IntegerSpace vlanRange = toIntegerSpace(ctx.vlans);
+      for (SubRange subRange : vlanRange.getSubRanges()) {
+        for (int i = subRange.getStart(); i <= subRange.getEnd(); i++) {
+          vlans.add(i);
+        }
+      }
+      if (ctx.vnis != null) {
+        IntegerSpace vniRange = toIntegerSpace(ctx.vnis);
+        for (SubRange subRange : vniRange.getSubRanges()) {
+          for (int i = subRange.getStart(); i <= subRange.getEnd(); i++) {
+            vnis.add(i);
+          }
+        }
+        for (int i = 0; i < vnis.size(); i++) {
+          int idx = i;
+          _eosVxlan.getVlanVnis().computeIfAbsent(vlans.get(idx), n -> vnis.get(idx));
+        }
+      }
+    }
+  }
+
   @Override
   public void enterEos_vxif_vxlan_vlan(Eos_vxif_vxlan_vlanContext ctx) {
     _currentVxlanVlanNum = toInteger(ctx.num);

projects/batfish/src/test/java/org/batfish/grammar/arista/AristaGrammarTest.java

@@ -371,6 +371,14 @@ public void testOspfNetworkExtraction() {
             new OspfNetwork(Prefix.strict("10.0.1.1/32"), 90L)));
   }
 
+  @Test
+  public void testVxlanVniNewSyntax() {
+    AristaConfiguration config = parseVendorConfig("arista_vxlan_new_syntax");
+    assertThat(config.getEosVxlan().getVlanVnis(), hasEntry(1, 111));
+    assertThat(config.getEosVxlan().getVlanVnis(), hasEntry(6, 556));
+    assertThat(config.getEosVxlan().getVlanVnis(), hasEntry(10, 560));
+  }
+
   @Test
   public void testOspfNetworkConversion() {
     String hostname = "arista_ospf_network";

projects/batfish/src/test/resources/org/batfish/grammar/arista/testconfigs/arista_vxlan_new_syntax

@@ -0,0 +1,9 @@
+!RANCID-CONTENT-TYPE: arista
+!
+hostname arista_vxlan_new_syntax
+!
+interface Vxlan1
+   vxlan udp-port 4789
+   vxlan vlan 1,2,5-10 vni 111,222,555-560
+!
+no ip routing