summaryrefslogtreecommitdiffstats
path: root/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractor.java
diff options
context:
space:
mode:
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.java90
1 files changed, 66 insertions, 24 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 b98daa5ce..503ff47dc 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,76 +16,116 @@
package io.fd.hc2vpp.acl.util.ace.extractor;
+
import io.fd.hc2vpp.common.translate.util.MacTranslator;
import io.fd.vpp.jvpp.acl.types.MacipAclRule;
+import java.util.Optional;
import javax.annotation.Nonnull;
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.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.PacketHandling;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.Deny;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.Permit;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.VppMacipAceEthHeaderFields;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.VppMacipAceIpv4HeaderFields;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.VppMacipAceIpv6HeaderFields;
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;
-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.ace.vpp.ace.nodes.ace.ip.version.AceIpv6;
+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.VppMacipAceNodes;
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.AceIpVersion;
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.AceIpv6;
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 AddressExtractor, MacTranslator {
+ String DEFAULT_MAC = "00:00:00:00:00:00";
+ String DEFAULT_MAC_MASK = "00:00:00:00:00:00";
+ byte[] DEFAULT_MAC_BYTES = {0, 0, 0, 0, 0, 0};
+ byte[] DEFAULT_MAC_MASK_BYTES = {0, 0, 0, 0, 0, 0};
+
default VppMacipAce fromMacIpAce(@Nonnull final Ace ace) {
- return VppMacipAce.class.cast(ace.getMatches().getAceType());
+ return Optional.ofNullable(ace.getMatches())
+ .map(Matches::getAceType)
+ .map(VppMacipAce.class::cast)
+ .orElseThrow(
+ () -> new IllegalArgumentException(String.format("Unable to create VppMacipAce from %s", ace)));
}
default boolean macIpIsIpv6(@Nonnull final VppMacipAce ace) {
- return ace.getVppMacipAceNodes().getAceIpVersion() instanceof AceIpv6;
+ return Optional.ofNullable(ace.getVppMacipAceNodes())
+ .map(VppMacipAceNodes::getAceIpVersion)
+ .map(aceIpVersion -> aceIpVersion instanceof AceIpv6)
+ .orElse(false);
}
default byte[] sourceMacAsBytes(@Nonnull final VppMacipAce ace) {
- return macToByteArray(ace.getVppMacipAceNodes().getSourceMacAddress().getValue());
+ return macToByteArray(Optional.ofNullable(ace.getVppMacipAceNodes())
+ .map(VppMacipAceEthHeaderFields::getSourceMacAddress)
+ .map(MacAddress::getValue)
+ .orElse(DEFAULT_MAC));
}
default byte[] sourceMacMaskAsBytes(@Nonnull final VppMacipAce ace) {
- return macToByteArray(ace.getVppMacipAceNodes().getSourceMacAddressMask().getValue());
+ return macToByteArray(Optional.ofNullable(ace.getVppMacipAceNodes())
+ .map(VppMacipAceEthHeaderFields::getSourceMacAddressMask)
+ .map(MacAddress::getValue)
+ .orElse(DEFAULT_MAC_MASK));
}
default byte[] ipv4Address(@Nonnull final VppMacipAce ace) {
- return extractIp4Address(
- VppMacipAceIpv4HeaderFields.class.cast(ace.getVppMacipAceNodes().getAceIpVersion()).getSourceIpv4Network());
+ return extractIp4Address(extractV4NetworkAddressOrNull(ace));
}
default byte ipv4AddressPrefix(@Nonnull final VppMacipAce ace) {
- return extractIp4AddressPrefix(
- VppMacipAceIpv4HeaderFields.class.cast(ace.getVppMacipAceNodes().getAceIpVersion()).getSourceIpv4Network());
+ return extractIp4AddressPrefix(extractV4NetworkAddressOrNull(ace));
+ }
+
+ static Ipv4Prefix extractV4NetworkAddressOrNull(final @Nonnull VppMacipAce ace) {
+ return Optional.ofNullable(ace.getVppMacipAceNodes())
+ .map(VppMacipAceNodes::getAceIpVersion)
+ .map(VppMacipAceIpv4HeaderFields.class::cast)
+ .map(VppMacipAceIpv4HeaderFields::getSourceIpv4Network)
+ .orElse(null);
}
default byte[] ipv6Address(@Nonnull final VppMacipAce ace) {
- return extractIp6Address(
- VppMacipAceIpv6HeaderFields.class.cast(ace.getVppMacipAceNodes().getAceIpVersion()).getSourceIpv6Network());
+ return extractIp6Address(extractV6NetworkAddressOrNull(ace));
}
default byte ipv6AddressPrefix(@Nonnull final VppMacipAce ace) {
- return extractIp6AddressPrefix(
- VppMacipAceIpv6HeaderFields.class.cast(ace.getVppMacipAceNodes().getAceIpVersion()).getSourceIpv6Network());
+ return extractIp6AddressPrefix(extractV6NetworkAddressOrNull(ace));
+ }
+
+ default Ipv6Prefix extractV6NetworkAddressOrNull(@Nonnull final VppMacipAce ace) {
+ return Optional.ofNullable(ace.getVppMacipAceNodes())
+ .map(VppMacipAceNodes::getAceIpVersion)
+ .map(VppMacipAceIpv6HeaderFields.class::cast)
+ .map(VppMacipAceIpv6HeaderFields::getSourceIpv6Network)
+ .orElse(null);
}
/**
* Only 0 and 1 are allowed for mac-ip
*/
default byte macIpAction(@Nonnull final Ace ace) {
- final PacketHandling action = ace.getActions().getPacketHandling();
+ // action choice itself has default, but nothing stops us from not defining actions container itself
+ final PacketHandling action = Optional.ofNullable(ace.getActions()).orElseThrow(
+ () -> new IllegalArgumentException(String.format("Unable to extract Action from %s", ace)))
+ .getPacketHandling();
if (action instanceof Permit) {
return 1;
} else if (action instanceof Deny) {
return 0;
} else {
throw new IllegalArgumentException(
- String.format("Unsupported packet-handling action %s for ACE %s", action, ace));
+ String.format("Unsupported packet-handling action %s for ACE %s", action, ace));
}
}
- default AceIpVersion ipVersion(final MacipAclRule rule) {
+ default AceIpVersion ipVersion(@Nonnull final MacipAclRule rule) {
if (rule.isIpv6 == 0) {
return ip4Ace(rule);
} else {
@@ -93,7 +133,7 @@ public interface MacIpAceDataExtractor extends AddressExtractor, MacTranslator {
}
}
- default AceIpVersion ip4Ace(MacipAclRule rule) {
+ default AceIpVersion ip4Ace(@Nonnull final MacipAclRule rule) {
final AceIpv4Builder ipVersion = new AceIpv4Builder();
if (rule.srcIpAddr != null && rule.srcIpAddr.length != 0) {
ipVersion.setSourceIpv4Network(toIpv4Prefix(truncateIp4Array(rule.srcIpAddr), rule.srcIpPrefixLen));
@@ -101,7 +141,7 @@ public interface MacIpAceDataExtractor extends AddressExtractor, MacTranslator {
return ipVersion.build();
}
- default AceIpVersion ip6Ace(MacipAclRule rule) {
+ default AceIpVersion ip6Ace(@Nonnull final MacipAclRule rule) {
final AceIpv6Builder ipVersion = new AceIpv6Builder();
if (rule.srcIpAddr != null && rule.srcIpAddr.length != 0) {
ipVersion.setSourceIpv6Network(toIpv6Prefix(rule.srcIpAddr, rule.srcIpPrefixLen));
@@ -109,13 +149,15 @@ public interface MacIpAceDataExtractor extends AddressExtractor, MacTranslator {
return ipVersion.build();
}
- default MacAddress sourceMac(final MacipAclRule rule) {
- return new MacAddress(byteArrayToMacSeparated(rule.srcMac));
+ default MacAddress sourceMac(@Nonnull final MacipAclRule rule) {
+ return new MacAddress(byteArrayToMacSeparated(rule.srcMac != null
+ ? rule.srcMac
+ : DEFAULT_MAC_BYTES));
}
- default MacAddress sourceMacMask(final MacipAclRule rule) {
- return new MacAddress(byteArrayToMacSeparated(rule.srcMacMask));
+ default MacAddress sourceMacMask(@Nonnull final MacipAclRule rule) {
+ return new MacAddress(byteArrayToMacSeparated(rule.srcMacMask != null
+ ? rule.srcMacMask
+ : DEFAULT_MAC_MASK_BYTES));
}
-
-
}