Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IOS-XR: fix and test v6 and v4 acls fighting on interfaces #7827

Merged
merged 2 commits into from
Dec 17, 2021
Merged

IOS-XR: fix and test v6 and v4 acls fighting on interfaces #7827

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c4791f
IOS-XR: fix and test v6 and v4 acls fighting on interfaces
dhalperi Dec 16, 2021
0f79505
pmd
dhalperi Dec 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions ...ects/batfish/src/main/java/org/batfish/grammar/cisco_xr/CiscoXrControlPlaneExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4139,13 +4139,11 @@ public void exitIf_ipv6_access_group(If_ipv6_access_groupContext ctx) {
CiscoXrStructureUsage usage = null;
if (ctx.INGRESS() != null) {
for (Interface currentInterface : _currentInterfaces) {
currentInterface.setIncomingFilter(name);
usage = INTERFACE_IPV6_ACCESS_GROUP_INGRESS;
}
} else {
assert ctx.EGRESS() != null;
for (Interface currentInterface : _currentInterfaces) {
currentInterface.setOutgoingFilter(name);
usage = INTERFACE_IPV6_ACCESS_GROUP_EGRESS;
}
}
Expand Down
10 changes: 10 additions & 0 deletions projects/batfish/src/test/java/org/batfish/grammar/cisco_xr/XrGrammarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,16 @@ private static void assertRoutingPolicyPermitsRoute(
return builder.build();
}

@Test
public void testInterfaceAclExtraction() {
CiscoXrConfiguration c = parseVendorConfig("interface-acl");

assertThat(c.getInterfaces(), hasKey("Bundle-Ether1"));
org.batfish.representation.cisco_xr.Interface be1 = c.getInterfaces().get("Bundle-Ether1");
assertThat(be1.getIncomingFilter(), equalTo("acl-in"));
assertThat(be1.getOutgoingFilter(), equalTo("acl-out"));
}

@Test
public void testAclExtraction() {
CiscoXrConfiguration c = parseVendorConfig("acl");
Expand Down
16 changes: 16 additions & 0 deletions projects/batfish/src/test/resources/org/batfish/grammar/cisco_xr/testconfigs/interface-acl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
!RANCID-CONTENT-TYPE: cisco-xr
!
hostname interface-acl
!
ipv4 access-list acl-in
ipv4 access-list acl-out
!
ipv6 access-list acl6-in
ipv6 access-list acl6-out
!
interface Bundle-Ether1
ipv4 access-group acl-in ingress
ipv4 access-group acl-out egress
ipv6 access-group acl6-in ingress
ipv6 access-group acl6-out egress
!