1 files changed, 0 insertions, 129 deletions
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIpAndEthWriter.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIpAndEthWriter.java
deleted file mode 100644
index ca12cbe19..000000000
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIpAndEthWriter.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import java.util.ArrayList;
-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;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.InterfaceMode;
-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.AceIpAndEth;
-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.ace.ip.and.eth.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.ace.ip.and.eth.ace.ip.version.AceIpv4;
-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.ace.ip.and.eth.ace.ip.version.AceIpv6;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public final class AceIpAndEthWriter
-    implements AceWriter<AceIpAndEth>, AclTranslator, L2AclTranslator, Ip4AclTranslator, Ip6AclTranslator {
-
-    private static final Logger LOG = LoggerFactory.getLogger(AceIpAndEthWriter.class);
-
-    private static int maskLength(@Nonnull final AceIpAndEth ace, final int vlanTags) {
-        if (ace.getAceIpVersion() != null) {
-            if (ace.getAceIpVersion() instanceof AceIpv4) {
-                return 48;
-            } else {
-                return vlanTags == 2
-                    ? 80
-                    : 64;
-            }
-        }
-        return 16;
-    }
-
-    @Override
-    public ClassifyAddDelTable createTable(@Nonnull final AceIpAndEth ace, @Nullable final InterfaceMode mode,
-                                           final int nextTableIndex, final int vlanTags) {
-        final int numberOfSessions = PortPair.fromRange(ace.getSourcePortRange(), ace.getDestinationPortRange()).size();
-        final ClassifyAddDelTable request = createTable(nextTableIndex, numberOfSessions);
-        final int maskLength = maskLength(ace, vlanTags);
-        request.mask = new byte[maskLength];
-        request.skipNVectors = 0;
-        request.matchNVectors = maskLength / 16;
-
-        boolean aceIsEmpty =
-            destinationMacAddressMask(ace.getDestinationMacAddressMask(), ace.getDestinationMacAddress(), request);
-        aceIsEmpty &= sourceMacAddressMask(ace.getSourceMacAddressMask(), ace.getSourceMacAddress(), request);
-
-        // if we use classifier API, we need to know ip version (fields common for ip4 and ip6 have different offsets):
-        final AceIpVersion aceIpVersion = ace.getAceIpVersion();
-        checkArgument(aceIpVersion != null, "AceIpAndEth have to define IpVersion");
-
-        final int baseOffset = getVlanTagsLen(vlanTags);
-        if (aceIpVersion instanceof AceIpv4) {
-            final AceIpv4 ipVersion = (AceIpv4) aceIpVersion;
-            aceIsEmpty &= ip4Mask(baseOffset, mode, ace, ipVersion, request);
-        } else if (aceIpVersion instanceof AceIpv6) {
-            final AceIpv6 ipVersion = (AceIpv6) aceIpVersion;
-            aceIsEmpty &= ip6Mask(baseOffset, mode, ace, ipVersion, request);
-        } else {
-            throw new IllegalArgumentException(String.format("Unsupported IP version %s", aceIpVersion));
-        }
-
-        if (aceIsEmpty) {
-            throw new IllegalArgumentException(
-                String.format("Ace %s does not define packet field match values", ace.toString()));
-        }
-
-        LOG.debug("ACE rule={} translated to table={}.", ace, request);
-        return request;
-    }
-
-    @Override
-    public List<ClassifyAddDelSession> createSession(@Nonnull final PacketHandling action,
-                                                     @Nonnull final AceIpAndEth ace,
-                                                     @Nullable final InterfaceMode mode, final int tableIndex,
-                                                     final int vlanTags) {
-        final List<PortPair> portPairs = PortPair.fromRange(ace.getSourcePortRange(), ace.getDestinationPortRange());
-        final List<ClassifyAddDelSession> requests = new ArrayList<>(portPairs.size());
-        for (final PortPair pair : portPairs) {
-            final ClassifyAddDelSession request = createSession(action, tableIndex);
-            request.match = new byte[maskLength(ace, vlanTags)];
-
-            boolean noMatch = destinationMacAddressMatch(ace.getDestinationMacAddress(), request);
-            noMatch &= sourceMacAddressMatch(ace.getSourceMacAddress(), request);
-
-            final AceIpVersion aceIpVersion = ace.getAceIpVersion();
-            checkArgument(aceIpVersion != null, "AceIpAndEth have to define IpVersion");
-
-            final int baseOffset = getVlanTagsLen(vlanTags);
-            if (aceIpVersion instanceof AceIpv4) {
-                final AceIpv4 ipVersion = (AceIpv4) aceIpVersion;
-                noMatch &= ip4Match(baseOffset, mode, ace, ipVersion, pair.getSrc(), pair.getDst(), request);
-            } else if (aceIpVersion instanceof AceIpv6) {
-                final AceIpv6 ipVersion = (AceIpv6) aceIpVersion;
-                noMatch &= ip6Match(baseOffset, mode, ace, ipVersion, pair.getSrc(), pair.getDst(), request);
-            } else {
-                throw new IllegalArgumentException(String.format("Unsupported IP version %s", aceIpVersion));
-            }
-
-            if (noMatch) {
-                throw new IllegalArgumentException(
-                    String.format("Ace %s does not define packet field match values", ace.toString()));
-            }
-            LOG.debug("ACE action={}, rule={} translated to session={}.", action, ace, request);
-            requests.add(request);
-        }
-        return requests;
-    }
-}