Span model update reflecting api changes

Allows use of Rx/Tx/Both Span states
Allows setting state per src-interface

Change-Id: I07346bf3976be34aa85336bdeedff94f83a3173c
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>

2 files changed, 119 insertions, 126 deletions

diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/span/MirroredInterfaceCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/span/MirroredInterfaceCustomizer.java
new file mode 100644
index 000000000..1d6c5ec92
--- /dev/null
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/span/MirroredInterfaceCustomizer.java
@@ -0,0 +1,119 @@
+/*
+ * 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.hc2vpp.v3po.interfaces.span;
+
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
+import io.fd.honeycomb.translate.write.WriteContext;
+import io.fd.honeycomb.translate.write.WriteFailedException;
+import io.fd.vpp.jvpp.core.dto.SwInterfaceSpanEnableDisable;
+import io.fd.vpp.jvpp.core.future.FutureJVppCore;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.SpanState;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.span.attributes.mirrored.interfaces.MirroredInterface;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.span.attributes.mirrored.interfaces.MirroredInterfaceKey;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public final class MirroredInterfaceCustomizer
+        extends FutureJVppCustomizer
+        implements ListWriterCustomizer<MirroredInterface, MirroredInterfaceKey>, JvppReplyConsumer {
+
+    private static final Logger LOG = LoggerFactory.getLogger(MirroredInterfaceCustomizer.class);
+
+    private final NamingContext ifcContext;
+
+    public MirroredInterfaceCustomizer(@Nonnull final FutureJVppCore futureJVppCore, final NamingContext ifcContext) {
+        super(futureJVppCore);
+        this.ifcContext = ifcContext;
+    }
+
+    private SwInterfaceSpanEnableDisable getSpanAddDelRequest(final int dstId, final Integer srcId, final boolean isAdd,
+                                                              @Nullable final SpanState state) {
+        final SwInterfaceSpanEnableDisable spanAddDel = new SwInterfaceSpanEnableDisable();
+        spanAddDel.state = (byte) (isAdd
+                ? state != null
+                ? state.getIntValue()
+                : 0
+                : 0);// either one of 1(rx),2(tx),3(both) or 0 for disable/delete
+        spanAddDel.swIfIndexFrom = srcId;
+        spanAddDel.swIfIndexTo = dstId;
+        return spanAddDel;
+    }
+
+    @Override
+    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<MirroredInterface> instanceIdentifier,
+                                       @Nonnull final MirroredInterface mirroredInterface,
+                                       @Nonnull final WriteContext writeContext)
+            throws WriteFailedException {
+        final String destinationInterfaceName = instanceIdentifier.firstKeyOf(Interface.class).getName();
+        final String sourceInterfaceName = mirroredInterface.getIfaceRef();
+        final SpanState spanState = mirroredInterface.getState();
+
+        LOG.debug("Enabling span for source interface {} | destination interface {} | state {}", sourceInterfaceName,
+                destinationInterfaceName, spanState);
+
+        getReplyForWrite(getFutureJVpp().swInterfaceSpanEnableDisable(
+                getSpanAddDelRequest(
+                        interfaceId(writeContext, ifcContext, destinationInterfaceName),
+                        interfaceId(writeContext, ifcContext, sourceInterfaceName),
+                        true,
+                        spanState))
+                .toCompletableFuture(), instanceIdentifier);
+        LOG.debug("Span for source interface {} | destination interface {} | state {} successfully enabled",
+                sourceInterfaceName, destinationInterfaceName, spanState);
+    }
+
+
+    @Override
+    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<MirroredInterface> instanceIdentifier,
+                                        @Nonnull final MirroredInterface mirroredInterfaceBefore,
+                                        @Nonnull final MirroredInterface mirroredInterfaceAfter,
+                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
+        deleteCurrentAttributes(instanceIdentifier, mirroredInterfaceBefore, writeContext);
+        writeCurrentAttributes(instanceIdentifier, mirroredInterfaceAfter, writeContext);
+    }
+
+    @Override
+    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<MirroredInterface> instanceIdentifier,
+                                        @Nonnull final MirroredInterface mirroredInterface,
+                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
+        final String destinationInterfaceName = instanceIdentifier.firstKeyOf(Interface.class).getName();
+        final String sourceInterfaceName = mirroredInterface.getIfaceRef();
+        LOG.debug("Disabling span for source interface {} | destination interface {} ", sourceInterfaceName,
+                destinationInterfaceName);
+
+        getReplyForWrite(getFutureJVpp().swInterfaceSpanEnableDisable(
+                getSpanAddDelRequest(
+                        interfaceId(writeContext, ifcContext, destinationInterfaceName),
+                        interfaceId(writeContext, ifcContext, sourceInterfaceName),
+                        false,
+                        null))
+                .toCompletableFuture(), instanceIdentifier);
+        LOG.debug("Span for source interface {} | destination interface {} successfully disabled",
+                sourceInterfaceName, destinationInterfaceName);
+    }
+
+    private static int interfaceId(final WriteContext writeContext, final NamingContext ifcContext, final String name) {
+        return ifcContext.getIndex(name, writeContext.getMappingContext());
+    }
+}
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/span/MirroredInterfacesCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/span/MirroredInterfacesCustomizer.java
deleted file mode 100644
index b7376332d..000000000
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/span/MirroredInterfacesCustomizer.java
+++ /dev/null
@@ -1,126 +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.hc2vpp.v3po.interfaces.span;
-
-import com.google.common.base.Preconditions;
-import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
-import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.write.WriteContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceSpanEnableDisable;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceSpanEnableDisableReply;
-import io.fd.vpp.jvpp.core.future.FutureJVppCore;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.span.attributes.MirroredInterfaces;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public final class MirroredInterfacesCustomizer
-        extends FutureJVppCustomizer
-        implements WriterCustomizer<MirroredInterfaces>, JvppReplyConsumer {
-
-    private static final Logger LOG = LoggerFactory.getLogger(MirroredInterfacesCustomizer.class);
-
-    private final NamingContext ifcContext;
-
-    public MirroredInterfacesCustomizer(@Nonnull final FutureJVppCore futureJVppCore, final NamingContext ifcContext) {
-        super(futureJVppCore);
-        this.ifcContext = ifcContext;
-    }
-
-    @Override
-    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<MirroredInterfaces> id,
-                                       @Nonnull final MirroredInterfaces dataAfter,
-                                       @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        LOG.trace("Writing mirrored interfaces for: {} as: {}", id, dataAfter);
-
-        final int dstId =
-                ifcContext.getIndex(id.firstKeyOf(Interface.class).getName(), writeContext.getMappingContext());
-
-        // Collect source IDs
-        final List<Integer> srcIds = dataAfter.getMirroredInterface().stream()
-                .map(ifcName -> ifcContext.getIndex(ifcName, writeContext.getMappingContext()))
-                // Collecting before executing to verify we have all the IDs first, failing fast...
-                .collect(Collectors.toList());
-
-        Preconditions.checkArgument(!srcIds.contains(dstId),
-                "Source and Destination interface for port mirroring detected: %s at %s", dstId, id);
-
-        // Invoke addition for each source ID
-        final List<CompletableFuture<SwInterfaceSpanEnableDisableReply>> futures = srcIds.stream()
-                .map(srcId -> getSpanAddDelRequest(dstId, srcId, true))
-                .map(request -> getFutureJVpp().swInterfaceSpanEnableDisable(request).toCompletableFuture())
-                .collect(Collectors.toList());
-
-        // Wait for success/exception
-        for (final CompletableFuture<SwInterfaceSpanEnableDisableReply> future : futures) {
-            getReplyForWrite(future, id);
-        }
-
-        LOG.trace("Mirrored interfaces for: {} written successfully", id);
-    }
-
-    private SwInterfaceSpanEnableDisable getSpanAddDelRequest(final int dstId, final Integer srcId, final boolean isAdd) {
-        final SwInterfaceSpanEnableDisable spanAddDel = new SwInterfaceSpanEnableDisable();
-        spanAddDel.state = (byte) (isAdd ? 3 : 0); // 3 - enable rx & tx : 0 - disabled
-        spanAddDel.swIfIndexFrom = srcId;
-        spanAddDel.swIfIndexTo = dstId;
-        return spanAddDel;
-    }
-
-    @Override
-    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<MirroredInterfaces> id,
-                                        @Nonnull final MirroredInterfaces dataBefore,
-                                        @Nonnull final MirroredInterfaces dataAfter,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        deleteCurrentAttributes(id, dataBefore, writeContext);
-        writeCurrentAttributes(id, dataAfter, writeContext);
-    }
-
-    @Override
-    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<MirroredInterfaces> id,
-                                        @Nonnull final MirroredInterfaces dataBefore,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        LOG.trace("Removing mirrored interfaces for: {} as: {}", id, dataBefore);
-
-        final int dstId =
-                ifcContext.getIndex(id.firstKeyOf(Interface.class).getName(), writeContext.getMappingContext());
-
-        final List<Integer> srcIds = dataBefore.getMirroredInterface().stream()
-                .map(ifcName -> ifcContext.getIndex(ifcName, writeContext.getMappingContext()))
-                // Collecting before executing to verify we have all the IDs first, failing fast...
-                .collect(Collectors.toList());
-
-        final List<CompletableFuture<SwInterfaceSpanEnableDisableReply>> futures = srcIds.stream()
-                .map(srcId -> getSpanAddDelRequest(dstId, srcId, false))
-                .map(request -> getFutureJVpp().swInterfaceSpanEnableDisable(request).toCompletableFuture())
-                .collect(Collectors.toList());
-
-        for (final CompletableFuture<SwInterfaceSpanEnableDisableReply> future : futures) {
-            getReplyForWrite(future, id);
-        }
-
-        LOG.trace("Mirrored interfaces for: {} removed successfully", id);
-    }
-}