Merge pull request #147 from batfish/unstable

Unstable

demos/java/commands

@@ -97,7 +97,7 @@ echo #############
 echo # fault-tolerance can be ensured in a similar manner by studying the impact of failures
 
 echo # this command creates a network view after an interface failure
-get environmentcreation interfaceBlacklist=[{hostname=as2border2,interface="FastEthernet0/0"}]
+get environmentcreation interfaceBlacklist=[{hostname=as2border2,interface="GigabitEthernet0/0"}]
 
 echo # we can see if reachability changes at all after this failure
 get reachability type=reduced

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.25.0";
+   private static final String VERSION = "0.26.0";
 
    public static void checkCompatibleVersion(String myName, String otherName,
          String otherVersion) {

projects/batfish-common-protocol/src/org/batfish/datamodel/BgpNeighbor.java

@@ -146,6 +146,12 @@ public String getVrf() {
 
    }
 
+   private static final String ADDITIONAL_PATHS_RECEIVE_VAR = "additionalPathsReceive";
+
+   private static final String ADDITIONAL_PATHS_SELECT_ALL_VAR = "additionalPathsSelectAll";
+
+   private static final String ADDITIONAL_PATHS_SEND_VAR = "additionalPathsSend";
+
    private static final String ADDRESS_VAR = "address";
 
    private static final String ADVERTISE_EXTERNAL_VAR = "advertiseExternal";
@@ -189,6 +195,12 @@ public String getVrf() {
     */
    private static final long serialVersionUID = 1L;
 
+   private boolean _additionalPathsReceive;
+
+   private boolean _additionalPathsSelectAll;
+
+   private boolean _additionalPathsSend;
+
    private boolean _advertiseExternal;
 
    private boolean _advertiseInactive;
@@ -357,6 +369,21 @@ else if (!this._clusterId.equals(other._clusterId)) {
       return true;
    }
 
+   @JsonProperty(ADDITIONAL_PATHS_RECEIVE_VAR)
+   public boolean getAdditionalPathsReceive() {
+      return _additionalPathsReceive;
+   }
+
+   @JsonProperty(ADDITIONAL_PATHS_SELECT_ALL_VAR)
+   public boolean getAdditionalPathsSelectAll() {
+      return _additionalPathsSelectAll;
+   }
+
+   @JsonProperty(ADDITIONAL_PATHS_SEND_VAR)
+   public boolean getAdditionalPathsSend() {
+      return _additionalPathsSend;
+   }
+
    /**
     * @return {@link #_address}
     */
@@ -537,6 +564,21 @@ public void resolveReferences(Configuration owner) {
       _owner = owner;
    }
 
+   @JsonProperty(ADDITIONAL_PATHS_RECEIVE_VAR)
+   public void setAdditionalPathsReceive(boolean additionalPathsReceive) {
+      _additionalPathsReceive = additionalPathsReceive;
+   }
+
+   @JsonProperty(ADDITIONAL_PATHS_SELECT_ALL_VAR)
+   public void setAdditionalPathsSelectAll(boolean additionalPathsSelectAll) {
+      _additionalPathsSelectAll = additionalPathsSelectAll;
+   }
+
+   @JsonProperty(ADDITIONAL_PATHS_SEND_VAR)
+   public void setAdditionalPathsSend(boolean additionalPathsSend) {
+      _additionalPathsSend = additionalPathsSend;
+   }
+
    @JsonProperty(ADDRESS_VAR)
    public void setAddress(Ip address) {
       // Intentionally empty

projects/batfish-common-protocol/src/org/batfish/datamodel/Configuration.java

@@ -38,6 +38,8 @@ public final class Configuration extends ComparableStructure<String> {
 
    public static final String DEFAULT_VRF_NAME = "default";
 
+   private static final String DNS_SOURCE_INTERFACE_VAR = "dnsSourceInterface";
+
    private static final String IKE_GATEWAYS_VAR = "ikeGateways";
 
    private static final String IKE_POLICIES_VAR = "ikePolicies";
@@ -52,8 +54,12 @@ public final class Configuration extends ComparableStructure<String> {
 
    private static final String IPSEC_VPNS_VAR = "ipsecVpns";
 
+   private static final String LOGGING_SOURCE_INTERFACE_VAR = "loggingSourceInterface";
+
    public static final String NODE_NONE_NAME = "(none)";
 
+   private static final String NTP_SOURCE_INTERFACE_VAR = "ntpSourceInterface";
+
    private static final String ROLES_VAR = "roles";
 
    private static final String ROUTE_FILTER_LISTS_VAR = "routeFilterLists";
@@ -62,6 +68,10 @@ public final class Configuration extends ComparableStructure<String> {
 
    private static final long serialVersionUID = 1L;
 
+   private static final String SNMP_SOURCE_INTERFACE_VAR = "snmpSourceInterface";
+
+   private static final String TACACS_SOURCE_INTERFACE_VAR = "tacacsSourceInterface";
+
    private static final String ZONES_VAR = "zones";
 
    private NavigableMap<String, AsPathAccessList> _asPathAccessLists;
@@ -78,6 +88,8 @@ public final class Configuration extends ComparableStructure<String> {
 
    private NavigableSet<String> _dnsServers;
 
+   private String _dnsSourceInterface;
+
    private String _domainName;
 
    private NavigableMap<String, IkeGateway> _ikeGateways;
@@ -100,8 +112,12 @@ public final class Configuration extends ComparableStructure<String> {
 
    private NavigableSet<String> _loggingServers;
 
+   private String _loggingSourceInterface;
+
    private NavigableSet<String> _ntpServers;
 
+   private String _ntpSourceInterface;
+
    private transient NavigableSet<BgpAdvertisement> _originatedAdvertisements;
 
    private transient NavigableSet<BgpAdvertisement> _originatedEbgpAdvertisements;
@@ -132,10 +148,14 @@ public final class Configuration extends ComparableStructure<String> {
 
    private transient NavigableSet<BgpAdvertisement> _sentIbgpAdvertisements;
 
+   private String _snmpSourceInterface;
+
    private NavigableSet<String> _snmpTrapServers;
 
    private NavigableSet<String> _tacacsServers;
 
+   private String _tacacsSourceInterface;
+
    private VendorFamily _vendorFamily;
 
    private Map<String, Vrf> _vrfs;
@@ -214,6 +234,11 @@ public NavigableSet<String> getDnsServers() {
       return _dnsServers;
    }
 
+   @JsonProperty(DNS_SOURCE_INTERFACE_VAR)
+   public String getDnsSourceInterface() {
+      return _dnsSourceInterface;
+   }
+
    @JsonPropertyDescription("Domain name of this node.")
    public String getDomainName() {
       return _domainName;
@@ -281,10 +306,20 @@ public NavigableSet<String> getLoggingServers() {
       return _loggingServers;
    }
 
+   @JsonProperty(LOGGING_SOURCE_INTERFACE_VAR)
+   public String getLoggingSourceInterface() {
+      return _loggingSourceInterface;
+   }
+
    public NavigableSet<String> getNtpServers() {
       return _ntpServers;
    }
 
+   @JsonProperty(NTP_SOURCE_INTERFACE_VAR)
+   public String getNtpSourceInterface() {
+      return _ntpSourceInterface;
+   }
+
    @JsonIgnore
    public NavigableSet<BgpAdvertisement> getOriginatedAdvertisements() {
       return _originatedAdvertisements;
@@ -358,6 +393,11 @@ public NavigableSet<BgpAdvertisement> getSentIbgpAdvertisements() {
       return _sentIbgpAdvertisements;
    }
 
+   @JsonProperty(SNMP_SOURCE_INTERFACE_VAR)
+   public String getSnmpSourceInterface() {
+      return _snmpSourceInterface;
+   }
+
    public NavigableSet<String> getSnmpTrapServers() {
       return _snmpTrapServers;
    }
@@ -366,6 +406,11 @@ public NavigableSet<String> getTacacsServers() {
       return _tacacsServers;
    }
 
+   @JsonProperty(TACACS_SOURCE_INTERFACE_VAR)
+   public String getTacacsSourceInterface() {
+      return _tacacsSourceInterface;
+   }
+
    @JsonPropertyDescription("Object containing vendor-specific information for this node.")
    public VendorFamily getVendorFamily() {
       return _vendorFamily;
@@ -470,6 +515,11 @@ public void setDnsServers(NavigableSet<String> dnsServers) {
       _dnsServers = dnsServers;
    }
 
+   @JsonProperty(DNS_SOURCE_INTERFACE_VAR)
+   public void setDnsSourceInterface(String dnsSourceInterface) {
+      _dnsSourceInterface = dnsSourceInterface;
+   }
+
    public void setDomainName(String domainName) {
       _domainName = domainName;
    }
@@ -525,10 +575,20 @@ public void setLoggingServers(NavigableSet<String> loggingServers) {
       _loggingServers = loggingServers;
    }
 
+   @JsonProperty(LOGGING_SOURCE_INTERFACE_VAR)
+   public void setLoggingSourceInterface(String loggingSourceInterface) {
+      _loggingSourceInterface = loggingSourceInterface;
+   }
+
    public void setNtpServers(NavigableSet<String> ntpServers) {
       _ntpServers = ntpServers;
    }
 
+   @JsonProperty(NTP_SOURCE_INTERFACE_VAR)
+   public void setNtpSourceInterface(String ntpSourceInterface) {
+      _ntpSourceInterface = ntpSourceInterface;
+   }
+
    public void setRoles(RoleSet roles) {
       _roles = roles;
    }
@@ -550,6 +610,11 @@ public void setRoutingPolicies(
       _routingPolicies = routingPolicies;
    }
 
+   @JsonProperty(SNMP_SOURCE_INTERFACE_VAR)
+   public void setSnmpSourceInterface(String snmpSourceInterface) {
+      _snmpSourceInterface = snmpSourceInterface;
+   }
+
    public void setSnmpTrapServers(NavigableSet<String> snmpTrapServers) {
       _snmpTrapServers = snmpTrapServers;
    }
@@ -558,6 +623,11 @@ public void setTacacsServers(NavigableSet<String> tacacsServers) {
       _tacacsServers = tacacsServers;
    }
 
+   @JsonProperty(TACACS_SOURCE_INTERFACE_VAR)
+   public void setTacacsSourceInterface(String tacacsSourceInterface) {
+      _tacacsSourceInterface = tacacsSourceInterface;
+   }
+
    public void setVendorFamily(VendorFamily vendorFamily) {
       _vendorFamily = vendorFamily;
    }

projects/batfish-common-protocol/src/org/batfish/datamodel/Interface.java

@@ -76,10 +76,14 @@ public final class Interface extends ComparableStructure<String> {
 
    private static final String SOURCE_NAT_VAR = "sourceNat";
 
+   private static final String SPANNING_TREE_PORTFAST_VAR = "spanningTreePortfast";
+
    private static final String SWITCHPORT_MODE_VAR = "switchportMode";
 
    private static final String SWITCHPORT_TRUNK_ENCAPSULATION_VAR = "switchportTrunkEncapsulation";
 
+   private static final String SWITCHPORT_VAR = "switchport";
+
    private static final String VRF_VAR = "vrf";
 
    private static final String VRRP_GROUPS_VAR = "vrrpGroups";
@@ -322,6 +326,10 @@ else if (name.startsWith("lo")) {
 
    private SourceNat _sourceNat;
 
+   private boolean _spanningTreePortfast;
+
+   private Boolean _switchport;
+
    private SwitchportMode _switchportMode;
 
    private SwitchportEncapsulationType _switchportTrunkEncapsulation;
@@ -640,6 +648,18 @@ public SourceNat getSourceNat() {
       return _sourceNat;
    }
 
+   @JsonProperty(SPANNING_TREE_PORTFAST_VAR)
+   @JsonPropertyDescription("Whether or not spanning-tree portfast feature is enabled")
+   public boolean getSpanningTreePortfast() {
+      return _spanningTreePortfast;
+   }
+
+   @JsonProperty(SWITCHPORT_VAR)
+   @JsonPropertyDescription("Whether this interface is explicitly set as a switchport. Nothing may be inferred from absence of this field.")
+   public Boolean getSwitchport() {
+      return _switchport;
+   }
+
    @JsonProperty(SWITCHPORT_MODE_VAR)
    @JsonPropertyDescription("The switchport mode (if any) of this interface")
    public SwitchportMode getSwitchportMode() {
@@ -877,6 +897,16 @@ public void setSourceNat(SourceNat sourceNat) {
       _sourceNat = sourceNat;
    }
 
+   @JsonProperty(SPANNING_TREE_PORTFAST_VAR)
+   public void setSpanningTreePortfast(boolean spanningTreePortfast) {
+      _spanningTreePortfast = spanningTreePortfast;
+   }
+
+   @JsonProperty(SWITCHPORT_VAR)
+   public void setSwitchport(Boolean switchport) {
+      _switchport = switchport;
+   }
+
    @JsonProperty(SWITCHPORT_MODE_VAR)
    public void setSwitchportMode(SwitchportMode switchportMode) {
       _switchportMode = switchportMode;

projects/batfish-common-protocol/src/org/batfish/datamodel/VerboseEdge.java

@@ -13,10 +13,10 @@ public class VerboseEdge
 
    private static final String NODE1_INTERFACE_VAR = "node1Interface";
 
-   private static final String NODE2_INTERFACE_VAR = "node2Interface";
-
    private static final String NODE1_VAR = "node1";
 
+   private static final String NODE2_INTERFACE_VAR = "node2Interface";
+
    private static final String NODE2_VAR = "node2";
 
    private static final long serialVersionUID = 1L;

projects/batfish-common-protocol/src/org/batfish/datamodel/collections/NodeBgpSessionPair.java

@@ -8,16 +8,16 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class NodeBgpSessionPair extends Pair<Configuration, BgpNeighbor> {
-
-   private static final long serialVersionUID = 1L;
-
+
    private static final String NODE_VAR = "node";
 
-   private static final String SESSION_VAR = "session";   
+   private static final long serialVersionUID = 1L;
+
+   private static final String SESSION_VAR = "session";
 
    @JsonCreator
-   public NodeBgpSessionPair(@JsonProperty(NODE_VAR) Configuration t1, 
-                            @JsonProperty(SESSION_VAR) BgpNeighbor t2) {
+   public NodeBgpSessionPair(@JsonProperty(NODE_VAR) Configuration t1,
+         @JsonProperty(SESSION_VAR) BgpNeighbor t2) {
       super(t1, t2);
    }
 

projects/batfish-common-protocol/src/org/batfish/datamodel/collections/NodeOspfSessionPair.java

@@ -8,16 +8,16 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class NodeOspfSessionPair extends Pair<Configuration, OspfNeighbor> {
-
-   private static final long serialVersionUID = 1L;
-
+
    private static final String NODE_VAR = "node";
 
-   private static final String SESSION_VAR = "session";   
+   private static final long serialVersionUID = 1L;
+
+   private static final String SESSION_VAR = "session";
 
    @JsonCreator
-   public NodeOspfSessionPair(@JsonProperty(NODE_VAR) Configuration t1, 
-                              @JsonProperty(SESSION_VAR) OspfNeighbor t2) {
+   public NodeOspfSessionPair(@JsonProperty(NODE_VAR) Configuration t1,
+         @JsonProperty(SESSION_VAR) OspfNeighbor t2) {
       super(t1, t2);
    }