Merge pull request #91 from batfish/unstable

prepare for 0.13.0
batfish · Apr 5, 2017 · 32d946c · 32d946c
2 parents 4b3925d + 40c0fdd
commit 32d946c
Show file tree

Hide file tree

Showing 72 changed files with 6,989 additions and 5,537 deletions.
diff --git a/lib/commons/commons-collections4-4.1-sources.jar b/lib/commons/commons-collections4-4.1-sources.jar
diff --git a/lib/commons/commons-collections4-4.1.jar b/lib/commons/commons-collections4-4.1.jar
diff --git a/projects/batfish-common-protocol/src/org/batfish/common/Version.java b/projects/batfish-common-protocol/src/org/batfish/common/Version.java
@@ -8,7 +8,7 @@ public final class Version {
 
    private static final String UNKNOWN_VERSION = "0.0.0";
 
-   private static final String VERSION = "0.12.0";
+   private static final String VERSION = "0.13.0";
 
    public static void checkCompatibleVersion(String myName, String otherName,
          String otherVersion) {

diff --git a/projects/batfish-common-protocol/src/org/batfish/datamodel/BgpNeighbor.java b/projects/batfish-common-protocol/src/org/batfish/datamodel/BgpNeighbor.java
@@ -312,10 +312,6 @@ public boolean equals(Object o) {
       if (this._allowRemoteAsOut != other._allowRemoteAsOut) {
          return false;
       }
-      if (!CommonUtil.bothNullOrEqual(this._candidateRemoteBgpNeighbors,
-            other._candidateRemoteBgpNeighbors)) {
-         return false;
-      }
       if (_clusterId == null) {
          if (other._clusterId != null) {
             return false;
@@ -352,10 +348,6 @@ else if (!this._clusterId.equals(other._clusterId)) {
       if (!this._remoteAs.equals(other._remoteAs)) {
          return false;
       }
-      if (!CommonUtil.bothNullOrEqual(this._remoteBgpNeighbor,
-            other._remoteBgpNeighbor)) {
-         return false;
-      }
       if (this._routeReflectorClient != other._routeReflectorClient) {
          return false;
       }

diff --git a/projects/batfish/.classpath b/projects/batfish/.classpath
@@ -54,5 +54,6 @@
 	<classpathentry kind="lib" path="lib/jackson/jackson-core-2.9.0-SNAPSHOT.jar" sourcepath="lib/jackson/jackson-core-2.9.0-SNAPSHOT-sources.jar"/>
 	<classpathentry kind="lib" path="lib/jackson/jackson-databind-2.9.0-SNAPSHOT.jar" sourcepath="lib/jackson/jackson-databind-2.9.0-SNAPSHOT-sources.jar"/>
 	<classpathentry kind="lib" path="lib/guava/guava-21.0.jar" sourcepath="lib/guava/guava-21.0-sources.jar"/>
+	<classpathentry kind="lib" path="lib/commons/commons-collections4-4.1.jar" sourcepath="lib/commons/commons-collections4-4.1-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/projects/batfish/lib/commons/commons-collections4-4.1-sources.jar b/projects/batfish/lib/commons/commons-collections4-4.1-sources.jar
@@ -0,0 +1 @@
+../../../../lib/commons/commons-collections4-4.1-sources.jar
diff --git a/projects/batfish/lib/commons/commons-collections4-4.1.jar b/projects/batfish/lib/commons/commons-collections4-4.1.jar
@@ -0,0 +1 @@
+../../../../lib/commons/commons-collections4-4.1.jar
diff --git a/projects/batfish/src/org/batfish/bdp/BdpDataPlanePlugin.java b/projects/batfish/src/org/batfish/bdp/BdpDataPlanePlugin.java
@@ -321,7 +321,6 @@ private void computeFixedPoint(Map<String, Node> nodes, Topology topology,
             vr.initStaticRib();
             vr.importRib(vr._independentRib, vr._staticInterfaceRib);
             vr.importRib(vr._mainRib, vr._staticInterfaceRib);
-            vr.initOspfInterfaceCosts();
             vr.initBaseOspfRoutes();
             vr.initEbgpTopology(dp);
             vr.initBaseBgpRibs(externalAdverts);

diff --git a/projects/batfish/src/org/batfish/bdp/VirtualRouter.java b/projects/batfish/src/org/batfish/bdp/VirtualRouter.java
@@ -542,13 +542,6 @@ public void initOspfExports() {
       }
    }
 
-   public void initOspfInterfaceCosts() {
-      OspfProcess proc = _vrf.getOspfProcess();
-      if (proc != null) {
-         proc.initInterfaceCosts();
-      }
-   }
-
    public void initRibs() {
       _bgpRib = new BgpRib(this);
       _connectedRib = new ConnectedRib(this);

diff --git a/projects/batfish/src/org/batfish/grammar/cisco/CiscoControlPlaneExtractor.java b/projects/batfish/src/org/batfish/grammar/cisco/CiscoControlPlaneExtractor.java
@@ -331,7 +331,8 @@ private static SubRange toSubRange(SubrangeContext ctx) {
 
    private CiscoConfiguration _configuration;
 
-   private AaaAccountingCommands _currentAaaAccountingCommands;
+   @SuppressWarnings("unused")
+   private List<AaaAccountingCommands> _currentAaaAccountingCommands;
 
    private AaaAuthenticationLoginList _currentAaaAuthenticationLoginList;
 
@@ -478,19 +479,29 @@ public void enterAaa_accounting_commands(
          Aaa_accounting_commandsContext ctx) {
       Map<String, AaaAccountingCommands> commands = _configuration.getCf()
             .getAaa().getAccounting().getCommands();
-      String level;
-      if (ctx.level != null) {
-         level = ctx.level.getText();
+      Set<String> levels = new TreeSet<>();
+      if (ctx.levels != null) {
+         List<SubRange> range = toRange(ctx.levels);
+         for (SubRange subRange : range) {
+            for (int i = subRange.getStart(); i <= subRange.getEnd(); i++) {
+               String level = Integer.toString(i);
+               levels.add(level);
+            }
+         }
       }
       else {
-         level = AaaAccounting.DEFAULT_COMMANDS;
+         levels.add(AaaAccounting.DEFAULT_COMMANDS);
       }
-      AaaAccountingCommands c = commands.get(level);
-      if (c == null) {
-         c = new AaaAccountingCommands();
-         commands.put(level, _currentAaaAccountingCommands);
+      List<AaaAccountingCommands> currentAaaAccountingCommands = new ArrayList<>();
+      for (String level : levels) {
+         AaaAccountingCommands c = commands.get(level);
+         if (c == null) {
+            c = new AaaAccountingCommands();
+            commands.put(level, c);
+         }
+         currentAaaAccountingCommands.add(c);
       }
-      _currentAaaAccountingCommands = c;
+      _currentAaaAccountingCommands = currentAaaAccountingCommands;
    }
 
    @Override
@@ -600,6 +611,10 @@ public void enterExtended_access_list_stanza(
          name = ctx.name.getText();
          definitionLine = ctx.name.getStart().getLine();
       }
+      else if (ctx.shortname != null) {
+         name = ctx.shortname.getText();
+         definitionLine = ctx.shortname.getStart().getLine();
+      }
       else if (ctx.num != null) {
          name = ctx.num.getText();
          definitionLine = ctx.num.getLine();
@@ -4016,8 +4031,10 @@ public void exitS_ip_domain_name(S_ip_domain_nameContext ctx) {
    @Override
    public void exitS_ip_name_server(S_ip_name_serverContext ctx) {
       Set<String> dnsServers = _configuration.getDnsServers();
-      String domainName = ctx.hostname.getText();
-      dnsServers.add(domainName);
+      for (Ip_hostnameContext ipCtx : ctx.hostnames) {
+         String domainName = ipCtx.getText();
+         dnsServers.add(domainName);
+      }
    }
 
    @Override

diff --git a/projects/batfish/src/org/batfish/grammar/cisco/CiscoLexer.g4 b/projects/batfish/src/org/batfish/grammar/cisco/CiscoLexer.g4
@@ -69,6 +69,7 @@ tokens {
    RAW_TEXT,
    SELF_SIGNED,
    SLIP_PPP,
+   TEXT,
    VALUE
 } // Cisco Keywords
 
@@ -499,6 +500,11 @@ ALLOW_DEFAULT
    'allow-default'
 ;
 
+ALLOW_NOPASSWORD_REMOTE_LOGIN
+:
+   'allow-nopassword-remote-login'
+;
+
 ALLOW_SELF_PING
 :
    'allow-self-ping'
@@ -986,6 +992,11 @@ BIDIR_OFFER_LIMIT
    'bidir-offer-limit'
 ;
 
+BIDIR_RP_LIMIT
+:
+   'bidir-rp-limit'
+;
+
 BIFF
 :
    'biff'
@@ -5509,6 +5520,16 @@ ON
    'on'
 ;
 
+ON_FAILURE
+:
+   'on-failure'
+;
+
+ON_SUCCESS
+:
+   'on-success'
+;
+
 ONE
 :
    'one'
@@ -6354,6 +6375,11 @@ PROXY_SERVER
    'proxy-server'
 ;
 
+PSEUDO_INFORMATION
+:
+   'pseudo-information'
+;
+
 PSEUDOWIRE
 :
    'pseudowire'
@@ -7394,6 +7420,11 @@ SFTP
    'sftp'
 ;
 
+SG_EXPIRY_TIMER
+:
+   'sg-expiry-timer'
+;
+
 SGBP
 :
    'sgbp'
@@ -8641,6 +8672,11 @@ USE_ACL
    'use-acl'
 ;
 
+USE_BIA
+:
+   'use-bia'
+;
+
 USE_IPV4_ACL
 :
    'use-ipv4-acl'
@@ -9003,6 +9039,11 @@ WAVELENGTH
    'wavelength'
 ;
 
+WCCP
+:
+   'wccp'
+;
+
 WEBVPN
 :
    'webvpn'
@@ -9906,6 +9947,11 @@ M_Authentication_PASSWORD_PROMPT
    'password-prompt' -> type ( PASSWORD_PROMPT ) , popMode
 ;
 
+M_Authentication_POLICY
+:
+   'policy' -> type ( POLICY ) , popMode
+;
+
 M_Authentication_PPP
 :
    'ppp' -> type ( PPP ) , popMode
@@ -9941,9 +9987,15 @@ M_Authentication_TELNET
    'telnet' -> type ( TELNET ) , popMode
 ;
 
+M_Authentication_TEXT
+:
+   'text' -> type ( TEXT ) , popMode
+;
+
 M_Authentication_USERNAME_PROMPT
 :
-   'username-prompt' -> type ( USERNAME_PROMPT ) , popMode
+   'username-prompt' -> type ( USERNAME_PROMPT ) , mode (
+   M_AuthenticationUsernamePrompt )
 ;
 
 M_Authentication_VARIABLE
@@ -9956,6 +10008,30 @@ M_Authentication_WS
    F_Whitespace+ -> channel ( HIDDEN )
 ;
 
+mode M_AuthenticationUsernamePrompt;
+
+M_AuthenticationUsernamePrompt_DOUBLE_QUOTE
+:
+   '"' -> type ( DOUBLE_QUOTE ) , mode ( M_AuthenticationUsernamePromptText )
+;
+
+M_AuthenticationUsernamePrompt_WS
+:
+   F_Whitespace+ -> channel ( HIDDEN )
+;
+
+mode M_AuthenticationUsernamePromptText;
+
+M_AuthenticationUsernamePromptText_RAW_TEXT
+:
+   ~'"'+ -> type ( RAW_TEXT )
+;
+
+M_AuthenticationUsernamePromptText_DOUBLE_QUOTE
+:
+   '"' -> type ( DOUBLE_QUOTE ) , popMode
+;
+
 mode M_Banner;
 
 M_Banner_CONFIG_SAVE

diff --git a/projects/batfish/src/org/batfish/grammar/cisco/CiscoParser.g4 b/projects/batfish/src/org/batfish/grammar/cisco/CiscoParser.g4
@@ -619,6 +619,7 @@ ip_ssh_null
 :
    (
       AUTHENTICATION_RETRIES
+      | CLIENT
       | PORT
       | SOURCE_INTERFACE
       | TIME_OUT
@@ -1453,13 +1454,15 @@ pim_null
       | BIDIR_ENABLE
       | BIDIR_OFFER_INTERVAL
       | BIDIR_OFFER_LIMIT
+      | BIDIR_RP_LIMIT
       | BSR_CANDIDATE
       | DM_FALLBACK
       | LOG_NEIGHBOR_CHANGES
       | REGISTER_RATE_LIMIT
       | REGISTER_SOURCE
       | RPF_VECTOR
       | SEND_RP_DISCOVERY
+      | SG_EXPIRY_TIMER
       | SNOOPING
       | V1_RP_REACHABILITY
    ) ~NEWLINE* NEWLINE
@@ -1924,7 +1927,13 @@ s_ip_name_server
    IP NAME_SERVER
    (
       VRF vrf = variable
-   )? hostname = variable_hostname NEWLINE
+   )?
+   (
+      hostnames += ip_hostname
+   )+
+   (
+      USE_VRF vrf = variable
+   )? NEWLINE
 ;
 
 s_ip_nat
@@ -2218,6 +2227,7 @@ s_spanning_tree
    NO? SPANNING_TREE
    (
       spanning_tree_mst
+      | spanning_tree_pseudo_information
       | spanning_tree_null
    )
 ;
@@ -2310,7 +2320,7 @@ s_tunnel_group
 
 s_vlan
 :
-   VLAN
+   NO? VLAN
    (
       ACCESS_MAP
       | DEC
@@ -2436,6 +2446,14 @@ spanning_tree_mst_null
    ) ~NEWLINE* NEWLINE
 ;
 
+spanning_tree_pseudo_information
+:
+   PSEUDO_INFORMATION NEWLINE
+   (
+      spti_null
+   )*
+;
+
 spanning_tree_null
 :
    (
@@ -2459,6 +2477,14 @@ spanning_tree_null
    ) ~NEWLINE* NEWLINE
 ;
 
+spti_null
+:
+   NO?
+   (
+      MST
+   ) ~NEWLINE* NEWLINE
+;
+
 srlg_interface_numeric_stanza
 :
    DEC ~NEWLINE* NEWLINE
@@ -2650,6 +2676,7 @@ stanza
    | s_statistics
    | s_stcapp
    | s_switchport
+   | s_table_map
    | s_tacacs
    | s_tacacs_server
    | s_tap