1 files changed, 22 insertions, 94 deletions

diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/AceEthWriter.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/AceEthWriter.java
index 939e4eb98..91ab927fb 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/AceEthWriter.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/AceEthWriter.java
@@ -16,15 +16,9 @@
 
 package io.fd.honeycomb.translate.v3po.interfaces.acl.ingress;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 import com.google.common.annotations.VisibleForTesting;
-import io.fd.honeycomb.translate.vpp.util.MacTranslator;
 import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
 import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
-import io.fd.vpp.jvpp.core.future.FutureJVppCore;
-import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 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;
@@ -33,69 +27,29 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-final class AceEthWriter extends AbstractAceWriter<AceEth> implements MacTranslator {
+final class AceEthWriter implements AceWriter<AceEth>, AclTranslator, L2AclTranslator {
 
     @VisibleForTesting
     static final int MATCH_N_VECTORS = 1;
     private static final Logger LOG = LoggerFactory.getLogger(AceEthWriter.class);
 
-    public AceEthWriter(@Nonnull final FutureJVppCore futureJVppCore) {
-        super(futureJVppCore);
-    }
-
-    private static void checkInterfaceMode(@Nullable final InterfaceMode mode) {
-        checkArgument(InterfaceMode.L2.equals(mode), "L2 rules are not allowed for interface in L3 mode");
-    }
-
     @Override
-    public ClassifyAddDelTable createClassifyTable(@Nonnull final AceEth aceEth,
-                                                   @Nullable final InterfaceMode mode,
-                                                   final int nextTableIndex,
-                                                   final int vlanTags) {
-        checkInterfaceMode(mode);
-
-        final ClassifyAddDelTable request = createClassifyTable(nextTableIndex);
+    public ClassifyAddDelTable createTable(@Nonnull final AceEth aceEth,
+                                           @Nullable final InterfaceMode mode,
+                                           final int nextTableIndex,
+                                           final int vlanTags) {
+        final ClassifyAddDelTable request = createTable(nextTableIndex);
 
         request.mask = new byte[16];
-        boolean aceIsEmpty = true;
-
-        // destination-mac-address or destination-mac-address-mask is present =>
-        // ff:ff:ff:ff:ff:ff:00:00:00:00:00:00:00:00:00:00
-        if (aceEth.getDestinationMacAddressMask() != null) {
-            aceIsEmpty = false;
-            final String macAddress = aceEth.getDestinationMacAddressMask().getValue();
-            final List<String> parts = COLON_SPLITTER.splitToList(macAddress);
-            int i = 0;
-            for (String part : parts) {
-                request.mask[i++] = parseHexByte(part);
-            }
-        } else if (aceEth.getDestinationMacAddress() != null) {
-            aceIsEmpty = false;
-            for (int i = 0; i < 6; ++i) {
-                request.mask[i] = (byte) 0xff;
-            }
-        }
-
-        // source-mac-address or source-mac-address-mask =>
-        // 00:00:00:00:00:00:ff:ff:ff:ff:ff:ff:00:00:00:00
-        if (aceEth.getSourceMacAddressMask() != null) {
-            aceIsEmpty = false;
-            final String macAddress = aceEth.getSourceMacAddressMask().getValue();
-            final List<String> parts = COLON_SPLITTER.splitToList(macAddress);
-            int i = 6;
-            for (String part : parts) {
-                request.mask[i++] = parseHexByte(part);
-            }
-        } else if (aceEth.getSourceMacAddress() != null) {
-            aceIsEmpty = false;
-            for (int i = 6; i < 12; ++i) {
-                request.mask[i] = (byte) 0xff;
-            }
-        }
+        boolean aceIsEmpty =
+            destinationMacAddressMask(aceEth.getDestinationMacAddressMask(), aceEth.getDestinationMacAddress(),
+                request);
+        aceIsEmpty &=
+            sourceMacAddressMask(aceEth.getSourceMacAddressMask(), aceEth.getSourceMacAddress(), request);
 
         if (aceIsEmpty) {
             throw new IllegalArgumentException(
-                    String.format("Ace %s does not define packet field match values", aceEth.toString()));
+                String.format("Ace %s does not define packet field match values", aceEth.toString()));
         }
 
         request.skipNVectors = 0;
@@ -106,50 +60,24 @@ final class AceEthWriter extends AbstractAceWriter<AceEth> implements MacTransla
     }
 
     @Override
-    public ClassifyAddDelSession createClassifySession(@Nonnull final PacketHandling action,
-                                                       @Nonnull final AceEth aceEth,
-                                                       @Nullable final InterfaceMode mode,
-                                                       final int tableIndex,
-                                                       final int vlanTags) {
-        checkInterfaceMode(mode);
-
-        final ClassifyAddDelSession request = createClassifySession(action, tableIndex);
+    public ClassifyAddDelSession createSession(@Nonnull final PacketHandling action,
+                                               @Nonnull final AceEth aceEth,
+                                               @Nullable final InterfaceMode mode,
+                                               final int tableIndex,
+                                               final int vlanTags) {
+        final ClassifyAddDelSession request = createSession(action, tableIndex);
 
         request.match = new byte[16];
-        boolean noMatch = true;
-
-        if (aceEth.getDestinationMacAddress() != null) {
-            noMatch = false;
-            final String macAddress = aceEth.getDestinationMacAddress().getValue();
-            final List<String> parts = COLON_SPLITTER.splitToList(macAddress);
-            int i = 0;
-            for (String part : parts) {
-                request.match[i++] = parseHexByte(part);
-            }
-        }
-
-        if (aceEth.getSourceMacAddress() != null) {
-            noMatch = false;
-            final String macAddress = aceEth.getSourceMacAddress().getValue();
-            final List<String> parts = COLON_SPLITTER.splitToList(macAddress);
-            int i = 6;
-            for (String part : parts) {
-                request.match[i++] = parseHexByte(part);
-            }
-        }
+        boolean noMatch = destinationMacAddressMatch(aceEth.getDestinationMacAddress(), request);
+        noMatch &= sourceMacAddressMatch(aceEth.getSourceMacAddress(), request);
 
         if (noMatch) {
             throw new IllegalArgumentException(
-                    String.format("Ace %s does not define neither source nor destination MAC address",
-                            aceEth.toString()));
+                String.format("Ace %s does not define neither source nor destination MAC address",
+                    aceEth.toString()));
         }
 
         LOG.debug("ACE action={}, rule={} translated to session={}.", action, aceEth, request);
         return request;
     }
-
-    @Override
-    protected void setClassifyTable(@Nonnull final InputAclSetInterface request, final int tableIndex) {
-        request.l2TableIndex = tableIndex;
-    }
 }