diff options
Diffstat (limited to 'acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read')
| -rw-r--r-- | acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/AclReaderFactory.java | 11 | ||||
| -rw-r--r-- | acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/InterfaceAclReaderFactory.java | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/AclReaderFactory.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/AclReaderFactory.java index 90c4afe83..34352e8f3 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/AclReaderFactory.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/AclReaderFactory.java @@ -56,15 +56,8 @@ public class AclReaderFactory implements ReaderFactory, AclFactory { public void init(@Nonnull final ModifiableReaderRegistryBuilder registry) { registry.addStructuralReader(ACLS_ID, AccessListsBuilder.class); - // TODO(HONEYCOMB-331): initializer is not registered correctly when subtreeAddBefore is used, - // enable after fixing infra issue: - -// registry.subtreeAddBefore(vppAclChildren(InstanceIdentifier.create(Acl.class)), -// new GenericInitListReader<>(ACL_ID, -// new AclCustomizer(futureAclFacade, standardAclContext, macIpAClContext)), -// ImmutableSet.of(ACL_INGRESS_IID, ACL_EGRESS_IID)); - - registry.addBefore(new GenericInitListReader<>(ACL_ID, + registry.subtreeAddBefore(vppAclChildren(InstanceIdentifier.create(Acl.class)), + new GenericInitListReader<>(ACL_ID, new AclCustomizer(futureAclFacade, standardAclContext, macIpAClContext)), ImmutableSet.of(ACL_INGRESS_IID, ACL_EGRESS_IID)); } diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/InterfaceAclReaderFactory.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/InterfaceAclReaderFactory.java index 5b2c45088..173223648 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/InterfaceAclReaderFactory.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/InterfaceAclReaderFactory.java @@ -65,7 +65,7 @@ public class InterfaceAclReaderFactory implements ReaderFactory { IFC_ID = InstanceIdentifier.create(InterfacesState.class).child(Interface.class); private static final InstanceIdentifier<VppAclInterfaceStateAugmentation> VPP_ACL_AUG_IID = IFC_ID.augmentation(VppAclInterfaceStateAugmentation.class); - private static final InstanceIdentifier<Acl> ACL_IID = VPP_ACL_AUG_IID.child(Acl.class); + static final InstanceIdentifier<Acl> ACL_IID = VPP_ACL_AUG_IID.child(Acl.class); static final InstanceIdentifier<Ingress> ACL_INGRESS_IID = ACL_IID.child(Ingress.class); static final InstanceIdentifier<Egress> ACL_EGRESS_IID = ACL_IID.child(Egress.class); |