diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2017-01-17 17:57:26 +0100 |
|---|---|---|
| committer |   Jan Srnicek <jsrnicek@cisco.com> | 2017-01-18 12:51:19 +0000 |
| commit | 90d286c396eee2555b9a98b0af7fce292fce4879 (patch) | |
| tree | 9618fbfe800e4c98754c0659ed7401c588810476 /acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/acl/AclDataExtractor.java | |
| parent | 75f8aa0f9a1ff45f1be500304fb156a13fb6e6ef (diff) | |
HONEYCOMB-330: fix acl tag handling
Acl tag in vpp's acl plugin is an ascii tag, so it should not be handled as hex string.
Change-Id: I801d5b72a4c20f78246288ea63d914b0b9f3564b
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/acl/AclDataExtractor.java')
| -rw-r--r-- | acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/acl/AclDataExtractor.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/acl/AclDataExtractor.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/acl/AclDataExtractor.java index 8c6cdcfef..45e548ce7 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/acl/AclDataExtractor.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/acl/AclDataExtractor.java @@ -23,6 +23,7 @@ import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.Acl; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.Ace; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.Matches; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.VppAclAugmentation; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.access.lists.acl.access.list.entries.ace.matches.ace.type.VppAce; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.access.lists.acl.access.list.entries.ace.matches.ace.type.VppMacipAce; @@ -62,11 +63,13 @@ public interface AclDataExtractor { } /** - * Convert {@link Acl} name to byte array as UTF_8 + * Convert {@link Acl} tag to byte array in US_ASCII */ - default byte[] getAclNameAsBytes(@Nonnull final Acl acl) { - return Optional.ofNullable(acl.getAclName()) - .orElseThrow(() -> new IllegalArgumentException("Unable to extract bytes for null")) - .getBytes(StandardCharsets.UTF_8); + default byte[] getAclTag(@Nonnull final Acl acl) { + final VppAclAugmentation augmentation = acl.getAugmentation(VppAclAugmentation.class); + if (augmentation != null && augmentation.getTag() != null) { + return augmentation.getTag().getBytes(StandardCharsets.US_ASCII); + } + return new byte[0]; } } |