diff options
author | Marek Gradzki <mgradzki@cisco.com> | 2017-01-11 10:11:20 +0100 |
---|---|---|
committer | Marek Gradzki <mgradzki@cisco.com> | 2017-01-11 11:53:34 +0000 |
commit | 2d92edf65ee34329d9226e2efe90a5d10265cd72 (patch) | |
tree | 3903582031f568e4499abaf6b42c4943cd34a9a5 /acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractor.java | |
parent | a013f06756f8906355688baf67bf2b1af9da959a (diff) |
Fix NPE in L3 rules
Patch introduces proper handling for IP adresses,
which are optional.
Change-Id: Ib009207b4b241d3e2b8c665a35bb1ff87b4a12ac
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
(cherry picked from commit e0b4359b39acfe8a583089117a0c2485b85ff7e4)
Diffstat (limited to 'acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractor.java')
-rw-r--r-- | acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractor.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractor.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractor.java index 4a29949ec..b98daa5ce 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractor.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractor.java @@ -16,7 +16,6 @@ package io.fd.hc2vpp.acl.util.ace.extractor; -import io.fd.hc2vpp.common.translate.util.AddressTranslator; import io.fd.hc2vpp.common.translate.util.MacTranslator; import io.fd.vpp.jvpp.acl.types.MacipAclRule; import javax.annotation.Nonnull; @@ -33,7 +32,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl. 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.vpp.macip.ace.vpp.macip.ace.nodes.ace.ip.version.AceIpv4Builder; 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.vpp.macip.ace.vpp.macip.ace.nodes.ace.ip.version.AceIpv6Builder; -public interface MacIpAceDataExtractor extends AddressTranslator, MacTranslator { +public interface MacIpAceDataExtractor extends AddressExtractor, MacTranslator { default VppMacipAce fromMacIpAce(@Nonnull final Ace ace) { return VppMacipAce.class.cast(ace.getMatches().getAceType()); @@ -52,22 +51,22 @@ public interface MacIpAceDataExtractor extends AddressTranslator, MacTranslator } default byte[] ipv4Address(@Nonnull final VppMacipAce ace) { - return ipv4AddressPrefixToArray( + return extractIp4Address( VppMacipAceIpv4HeaderFields.class.cast(ace.getVppMacipAceNodes().getAceIpVersion()).getSourceIpv4Network()); } default byte ipv4AddressPrefix(@Nonnull final VppMacipAce ace) { - return extractPrefix( + return extractIp4AddressPrefix( VppMacipAceIpv4HeaderFields.class.cast(ace.getVppMacipAceNodes().getAceIpVersion()).getSourceIpv4Network()); } default byte[] ipv6Address(@Nonnull final VppMacipAce ace) { - return ipv6AddressPrefixToArray( + return extractIp6Address( VppMacipAceIpv6HeaderFields.class.cast(ace.getVppMacipAceNodes().getAceIpVersion()).getSourceIpv6Network()); } default byte ipv6AddressPrefix(@Nonnull final VppMacipAce ace) { - return extractPrefix( + return extractIp6AddressPrefix( VppMacipAceIpv6HeaderFields.class.cast(ace.getVppMacipAceNodes().getAceIpVersion()).getSourceIpv6Network()); } |