InterfaceProperties: return incoming filter name (#3413)

Return the name of the ACL/filter and not the contents
batfish · Mar 18, 2019 · f9a81d5 · f9a81d5
1 parent efb05f4
commit f9a81d5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/...on-protocol/src/main/java/org/batfish/datamodel/questions/InterfacePropertySpecifier.java b/...on-protocol/src/main/java/org/batfish/datamodel/questions/InterfacePropertySpecifier.java
@@ -98,10 +98,10 @@ public class InterfacePropertySpecifier extends PropertySpecifier {
               HSRP_GROUPS,
               new PropertyDescriptor<>(Interface::getHsrpGroups, Schema.set(Schema.STRING)))
           .put(HSRP_VERSION, new PropertyDescriptor<>(Interface::getHsrpVersion, Schema.STRING))
-          // skip incoming filter
+          // use incomingFilterName instead of incomingFilter
           .put(
               INCOMING_FILTER_NAME,
-              new PropertyDescriptor<>(Interface::getIncomingFilter, Schema.STRING))
+              new PropertyDescriptor<>(Interface::getIncomingFilterName, Schema.STRING))
           .put(INTERFACE_TYPE, new PropertyDescriptor<>(Interface::getInterfaceType, Schema.STRING))
           .put(MLAG_ID, new PropertyDescriptor<>(Interface::getMlagId, Schema.INTEGER))
           .put(MTU, new PropertyDescriptor<>(Interface::getMtu, Schema.INTEGER))

diff --git a/...rotocol/src/test/java/org/batfish/datamodel/questions/InterfacePropertySpecifierTest.java b/...rotocol/src/test/java/org/batfish/datamodel/questions/InterfacePropertySpecifierTest.java
@@ -1,5 +1,6 @@
 package org.batfish.datamodel.questions;
 
+import static org.batfish.datamodel.questions.InterfacePropertySpecifier.INCOMING_FILTER_NAME;
 import static org.hamcrest.Matchers.emptyIterable;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
@@ -9,6 +10,9 @@
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;
 import java.util.Iterator;
+import org.batfish.datamodel.Interface;
+import org.batfish.datamodel.IpAccessList;
+import org.batfish.datamodel.IpAccessListLine;
 import org.junit.Test;
 
 public class InterfacePropertySpecifierTest {
@@ -48,4 +52,18 @@ public void testMatchingPropertiesSet() {
     // should not match shorter
     assertThat(new InterfacePropertySpecifier(shorter).getMatchingProperties(), emptyIterable());
   }
+
+  @Test
+  public void testIncomingFilterReturnsName() {
+    IpAccessList acl =
+        IpAccessList.builder()
+            .setName("MY_ACL")
+            .setLines(ImmutableList.of(IpAccessListLine.ACCEPT_ALL))
+            .build();
+    Interface i1 = Interface.builder().setName("i1").setIncomingFilter(acl).build();
+    i1.setInboundFilterName(acl.getName());
+    assertThat(
+        InterfacePropertySpecifier.JAVA_MAP.get(INCOMING_FILTER_NAME).getGetter().apply(i1),
+        equalTo(acl.getName()));
+  }
 }